Merge remote-tracking branch 'origin/master'

src/api/hisStore/collection.js

@@ -64,7 +64,7 @@ export function exportCollection(query) {
 
 export function getWxaCodeCollectionUnLimit(collectionId) {
   return request({
-    url: 'hisStore/collection/getWxaCodeCollectionUnLimit/'+collectionId,
+    url: '/hisStore/collection/getWxaCodeCollectionUnLimit/'+collectionId,
     method: 'get',
   })
 }

src/views/course/courseWatchLog/index.vue

@@ -116,7 +116,7 @@
           :show.sync="showScheduleCalendar"
           @change="handleScheduleTimeChange"
           :key="scheduleCalendarKey"
-        /> 
+        />
       </el-form-item>-->
       <el-form-item label="营期时间" prop="scheduleTime">
         <el-date-picker
@@ -305,6 +305,7 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="营期名称" align="center" prop="periodIdName" v-if="this.queryParams.sendType==1" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />
       <el-table-column label="记录类型" align="center" prop="logType">

src/views/qw/externalContact/collection.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="app-container">
         <el-form ref="form" :model="form" label-width="140px">
-            <el-button size="mini" type="text" @click="handleShare" icon="el-icon-coin"
-                v-hasPermi="['store:inquiryOrder:wxaCodeInquiryOrder']">分享
+            <el-button v-if="form.id" size="mini" type="text" @click="handleShare" icon="el-icon-coin"
+                v-hasPermi="['hisStore:collection:WxaCodeCollectionUnLimit']">分享
             </el-button>
             <el-form-item label="信息模板" prop="questionId">
                 <el-select @change="selectQuestion" v-model="form.questionId" placeholder="请选择问答">