Переглянути джерело

Merge branch 'develop_yh44' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh44

lilei 11 місяців тому
батько
коміт
907b4bdb2a

+ 2 - 10
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -32,7 +32,7 @@
               v-for="(con,i) in imageSet"
               style="margin-right:10px;object-fit: cover;"
               :key="i"/>
-            <div class="upload-desc">说明:单张大小小于10Mb,最多10张;建议尺寸:宽(420px)*高(230px)</div>
+            <div class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</div>
           </a-form-model-item>
           <a-form-model-item label="内容类型" prop="contentType">
             {{ form.contentType==='IMAGE_CONTENT'?'图文展示':form.contentType==='VIDEO'?'视频展示':'跳转链接' }}
@@ -41,9 +41,6 @@
             <a-form-model-item label="内容" prop="content" >
               <div class="box" v-html="form.content"></div>
             </a-form-model-item>
-            <a-form-model-item label="是否发布" prop="publishFlag" >
-              {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
-            </a-form-model-item>
           </div>
           <div v-if="form.contentType==='VIDEO'">
             <a-form-model-item label="内容" prop="content" >
@@ -57,9 +54,6 @@
                 <source :src="form.content" type="video/mp4">
               </video>
             </a-form-model-item>
-            <a-form-model-item label="是否发布" prop="publishFlag" >
-              {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
-            </a-form-model-item>
           </div>
           <div v-if="form.contentType==='LINK'">
             <a-form-model-item label="内容" prop="ruleType">
@@ -93,10 +87,9 @@
               {{ form.promoRule&&form.promoRule.ruleExplain?form.promoRule.ruleExplain:'--' }}
             </a-form-model-item>
             <a-form-model-item label="产品范围" prop="productRangeList" >
-              <div v-if="productRangeList&&productRangeList.length>0">
+              <div v-if="productRangeList&&productRangeList.length>0" style="margin-bottom:10px;">
                 <a-tree-select
                   v-model="productRangeList"
-                  :maxTagCount="12"
                   :tree-data="productTypeList"
                   tree-checkable
                   :disabled="true"
@@ -205,7 +198,6 @@ export default {
         contentType: [{ required: true, message: '请选择内容类型', trigger: 'change' }],
         content: [{ required: true, message: '请输入对应内容', trigger: ['blur', 'change'] }],
         contentLink: [{ required: true, message: '请输入对应内容', trigger: 'blur' }],
-        publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }],
         range: [{ required: true, message: '请选择券适用范围', trigger: 'change' }],
         ruleType: [{ required: true, message: '请选择基本规则', trigger: 'change' }],
         ruleName: [{ required: true, message: '请输入券名称', trigger: ['change', 'blur'] }],

+ 4 - 4
src/views/promotionManagement/promotionInfo/edit.vue

@@ -52,7 +52,7 @@
                   v-model="form.imageSet"
                   ref="imageSet"
                   :fileSize="10"
-                  :maxNums="10"
+                  :maxNums="1"
                   @change="changeImage"
                   listType="picture-card"></Upload>
                 <div v-else>
@@ -65,7 +65,7 @@
                     style="margin-right:10px;object-fit: cover;"
                     :key="i" />
                 </div>
-                <span class="upload-desc">说明:单张大小小于10Mb,最多10张;建议尺寸:宽(420px)*高(230px)</span>
+                <span class="upload-desc">说明:单张大小小于10Mb;建议尺寸:宽(420px)*高(230px)</span>
               </a-form-model-item>
             </a-col>
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
@@ -140,9 +140,9 @@
                     其他
                   </a-select-option>
                 </a-select>
-                <span class="tip upload-desc">
+                <!-- <span class="tip upload-desc">
                   选择【货架促销】,促销内容会同步显示在促销模块内
-                </span>
+                </span> -->
               </a-form-model-item>
             </a-col>
           </a-row>

+ 1 - 1
src/views/promotionManagement/promotionInfo/list.vue

@@ -114,7 +114,7 @@
             size="small"
             type="link"
             class="button-success"
-            v-if="record.dealerPublishState!='END'&&$hasPermissions('B_promoActiveSeeBtn')"
+            v-if="$hasPermissions('B_promoActiveSeeBtn')"
             @click="handleSee(record)">查看</a-button>
         </template>
       </s-table>