chenrui 8 mēneši atpakaļ
vecāks
revīzija
46ddb6e00f

+ 2 - 2
src/views/easyPassManagement/homepageCarouselImg/detailModal.vue

@@ -44,9 +44,9 @@
             <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'?'视频展示':'跳转链接' }}
+            {{ form.contentType==='IMAGE_CONTENT'?'图文展示':form.contentType==='VIDEO'?'视频展示':form.contentType==='LINK'?'跳转链接':'促销活动' }}
           </a-form-model-item>
-          <a-form-model-item label="内容" prop="content">
+          <a-form-model-item label="内容" prop="content" v-if="form.contentType!='PROMO_LINK'">
             <div style="border:1px solid #efefef;border-radius:8px;padding:10px 20px;" v-if="form.contentType==='IMAGE_CONTENT'" v-html="form.content"></div>
             <div v-else-if="form.contentType==='VIDEO'">
               <video

+ 1 - 1
src/views/easyPassManagement/homepageCarouselImg/edit.vue

@@ -280,7 +280,7 @@ export default {
           _this.$refs.imageSet.setFileList(res.data.imageUrl)
           _this.form = res.data
           _this.form.time = [res.data.bannerStartDate, res.data.bannerEndDate]
-          _this.notShowSel = _this.form.bizType ? _this.form.bizType != 'SHOP_PROMO' ? ['PROMO_LINK'] : [] : []
+          _this.notShowSel = _this.form.bizType ? _this.form.bizType != 'SHOP_PROMO' ? [] : ['PROMO_LINK'] : ['PROMO_LINK']
         }
       })
     },

+ 2 - 2
src/views/easyPassManagement/promotionalActivities/list.vue

@@ -201,7 +201,7 @@ export default {
         beginDate: undefined, // 促销开始时间
         endDate: undefined, // 促销结束时间
         promoName: '', // 促销名称
-        promoType: '', // 促销类型
+        promoType: undefined, // 促销类型
         promoState: undefined// 是否发布
       },
       itemId: '', // 当前活动sn
@@ -310,7 +310,7 @@ export default {
       this.queryParam.beginDate = undefined
       this.queryParam.endDate = undefined
       this.queryParam.promoName = ''
-      this.queryParam.promoType = ''
+      this.queryParam.promoType = undefined
       this.queryParam.promoState = undefined
       this.$refs.table.refresh(true)
     },