Merge branch 'feature/12月迭代' into dev

# Conflicts:
#	src/components/libs/imgTextTemp/index.vue

src/components/libs/imgTextTemp/index.vue

@@ -13,7 +13,7 @@
       </div>
       <div>
         <el-button type="primary" v-if="$getButtonLimit($buttonCode.marketingAddImgText) && !isPublish" :limit-code="$buttonCode.marketingAddImgText" @click="add">新建图文</el-button>
-        <el-button v-if="$getButtonLimit($buttonCode.marketingCheckSync) && auto" :limit-code="$buttonCode.marketingCheckSync" @click="check">检查同步</el-button>
+        <el-button v-if="$getButtonLimit(isPublish ? $buttonCode.marketingPublishSync : $buttonCode.marketingCheckSync) && auto" :limit-code="isPublish ? $buttonCode.marketingPublishSync : $buttonCode.marketingCheckSync" @click="check">检查同步</el-button>
       </div>
     </div>
     <el-radio-group class="dm-imgtext-list" v-model="selectedData.imageTextId" :style="scrollStyle">
@@ -73,18 +73,18 @@
                 <el-button type="text" v-if="scope.row.canEdit !== false" @click="editData(scope.row)">转为草稿</el-button>
               </template>
               <template v-if="!scope.row.oldImageTextFlag && !isPublish">
-                <el-button type="text" v-if="$getButtonLimit($buttonCode.marketingEditImgText) && scope.row.canEdit !== false" :limi-code="$buttonCode.marketingEditImgText" @click="editData(scope.row)">编辑</el-button>
+                <el-button type="text" v-if="$getButtonLimit($buttonCode.marketingEditImgText) && scope.row.canEdit !== false" :limit-code="$buttonCode.marketingEditImgText" @click="editData(scope.row)">编辑</el-button>
                 <el-button type="text" v-if="$getButtonLimit($buttonCode.marketingUseImgText) && scope.row.canEdit !== false" :limit-code="$buttonCode.marketingUseImgText" @click="$router.push('/wechat/record/add/' + scope.row.imageTextId)">使用</el-button>
-                <el-button :loading="scope.row.loading" :disabled="scope.row.loading" @click="onPublic(scope.row)" type="text">发布</el-button>
+                <el-button v-if="$getButtonLimit($buttonCode.marketingPublishImgText)" :limit-code="$buttonCode.marketingPublishImgText" :loading="scope.row.loading" :disabled="scope.row.loading" @click="onPublic(scope.row)" type="text">发布</el-button>
               </template>
-              <dm-delete v-if="$getButtonLimit($buttonCode.marketingDelImgText) && scope.row.canEdit !== false" width="300" @confirm="delData(scope.row)">
+              <dm-delete v-if="$getButtonLimit(isPublish ? $buttonCode.marketingPublishDelImg : $buttonCode.marketingDelImgText) && scope.row.canEdit" width="300" @confirm="delData(scope.row)">
                 <div slot="tips" v-if="isPublish">
                   <p class="tips-content"><i class="tipos-icon el-icon-warning"></i>删除后，用户将无法访问此图文页面。请检查当前是否有其他地方正在使用此图文内容，否则将导致发送失败。</p>
                 </div>
                 <div slot="tips" v-if="!isPublish && !isGroupSend">
                   <p class="tips-content"><i class="tipos-icon el-icon-warning"></i>删除后，用户将无法访问此草稿内容。</p>
                 </div>
-                <el-button :limit-code="$buttonCode.marketingDelImgText" type="text">删除</el-button>
+                <el-button :limit-code="isPublish ? $buttonCode.marketingPublishDelImg : $buttonCode.marketingDelImgText" type="text">删除</el-button>
               </dm-delete>
             </template>
           </template>