lilei 1 year ago
parent
commit
7edbaf9a16

+ 1 - 0
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -442,6 +442,7 @@
       showDesc(descDetail){
         this.showDescBox = !this.showDescBox
         this.descDetail = descDetail
+        this.$emit("showDesc",this.showDescBox)
       },
       openCpModal(){
         this.$emit('openCpModal', 1, this.id)

+ 8 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -53,7 +53,7 @@
         <div slot="title" style="display: inline-block;width:100%;">
           <strong style="margin-right:10px;font-size:14px;">{{item.promotion.title}}</strong> ({{item.promotionRule.description}})
           <span style="margin-left:20px;color:#00aaff;cursor: pointer;"  @click="(event) => {showDesc(event, item)}">
-            <a-icon title="查看活动详情" type="eye"/> 活动详情
+            <a-icon :type="item.showDesc ? 'eye-invisible' : 'eye'"/> 活动详情
           </span>
           <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item)}">
             <a-icon title="禁用规则" type="disconnect"/> {{item.disabled ? '启用规则' : '禁用规则'}}
@@ -66,6 +66,7 @@
           :id="item.promoRuleSn" 
           @openCpModal="openProductModal" 
           @insterOk="insterActiveOk"
+          @showDesc="v => showDescOk(v,item)"
           @upActive="upActive"
           :promo="item"
           :detailData="detailData" 
@@ -247,6 +248,7 @@ export default {
       this.activeList = await salesPromoQueryList({ salesBillSn: this.$route.params.sn }).then(res => res.data || [])
       this.activeList.map(item => {
         item.isActive = true
+        item.showDesc = false
         item.disabled = item.enabledFlag == 0
         this.activeDesKey['search-'+item.promoRuleSn] = false
       })
@@ -422,6 +424,10 @@ export default {
       const row = this.$refs['productList-'+item.promoRuleSn][0]
       row&&row.showDesc(item.promotionRule)
     },
+    showDescOk(v,item){
+      item.showDesc = v
+      this.activeList.splice()
+    },
     // 禁用活动
     disabledActive(e,item){
       const _this = this
@@ -458,6 +464,7 @@ export default {
                 _this.$refs['productList-'+item.promoRuleSn][0].disableActive(true)
                 _this.disabledActiveOption = null
                 item.disabled = true
+                _this.activeList.splice()
               }
             })
           }else{

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.111/ocs-admin',
+        // target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {