chenrui 11 kuukautta sitten
vanhempi
commit
58c83e3202

+ 5 - 0
src/views/promotionManagement/promotionInfo/detailModal.vue

@@ -58,6 +58,11 @@
               </video>
             </a-form-model-item>
           </div>
+          <div v-if="form.contentType==='LINK'">
+            <a-form-model-item label="内容" prop="ruleType">
+              {{ form.content }}
+            </a-form-model-item>
+          </div>
           <div v-show="form.contentType==='LINK'&&form.content === '/pagesB/promoDetail'">
             <a-form-model-item label="基本规则" prop="ruleType">
               {{ form.promoRule&&form.promoRule.ruleType?form.promoRule.ruleType==='ticket'?'指定产品返代金券':'--':'--' }}

+ 1 - 7
src/views/promotionManagement/promotionInfo/edit.vue

@@ -315,7 +315,7 @@
     <promotion-show-modal ref="showModal" :openModal="openShowModal" @close="openShowModal = false"></promotion-show-modal>
     <!-- 添加产品 -->
     <chooseProduct
-      ref="chooseProduct"
+      ref="chooseProductList"
       :chooseType="chooseTypeList"
       :openModal="showProModal"
       @ok="addProductSuccess"
@@ -547,9 +547,6 @@ export default {
       }
       this.isShowNextStep = false
       this.isDisabled = false
-      if (this.$refs.setContent) {
-        this.$refs.setContent.clearContent()
-      }
       if (this.$refs.ruleForm) {
         this.$refs.ruleForm.resetFields()
       }
@@ -622,11 +619,8 @@ export default {
           this.$refs.chooseProduct.pageInit()
         }
       })
-
-      this.$refs.setContent.setProductSn(productArr)
     },
     onChangeTree (e) {
-      s
       deleteByProductType({ promoActiveSn: this.$route.params.sn, productTypeSnList: this.sellForm.productRangeList || [] }).then(res => {
         if (res.status == 200) {
           this.$refs.chooseProduct.pageInit()