update: dist

src/api/api.js

@@ -91,14 +91,14 @@ Vue.axios.interceptors.response.use(
     return data;
   },
   err => {
-    // if (err.response.status == 502) {
-    //   window.location.href = gicHost + '/gic-web/#/login?ishb=1';
-    //   Message.error({ message: '服务异常⊙﹏⊙∥' });
-    // }
-    // if (err.response.status != 403) {
-    //   window.location.href = gicHost + '/gic-web/#/login?ishb=1';
-    //   Message.error({ message: '登录失效!' });
-    // }
+    if (err.response.status == 502) {
+      window.location.href = gicHost + '/gic-web/#/login?ishb=1';
+      Message.error({ message: '服务异常⊙﹏⊙∥' });
+    }
+    if (err.response.status != 403) {
+      window.location.href = gicHost + '/gic-web/#/login?ishb=1';
+      Message.error({ message: '登录失效!' });
+    }
     return Promise.resolve(err);
   }
 );

src/views/salesleads/actCodeManage/attractFlowLink/detail.vue

@@ -102,7 +102,7 @@
       </div>
       <dm-sub-title type="line">欢迎语设置</dm-sub-title>
       <div class="section">
-        <welcomeItem @getWelcomeId="getWelcomeId" :welcomeIdP="form.welcomeId" ref="welcomeItem" :welcomeType="link"></welcomeItem>
+        <welcomeItem :welcomeId.sync="form.welcomeId" :welcomeType.sync="welcomeType" ref="welcomeItem" welcomeName="link"></welcomeItem>
       </div>
       <dm-sub-title type="line">落地页配置</dm-sub-title>
       <div class="section flex" style="margin-bottom: 40px;">
@@ -162,7 +162,7 @@ export default {
         pageNum: 1,
         pageSize: 20
       },
-      link: 'link',
+      welcomeType: 1,
       landingLoading: false,
       loading: false,
       landingData: [],
@@ -178,10 +178,10 @@ export default {
       storeData: [],
       form: {
         linkType: 1,
-        memberLabelName: '',
-        memberLabelId: '',
-        // memberLabelName: '测试标签值名称重复- 温州青童时代店',
-        // memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
+        // memberLabelName: '',
+        // memberLabelId: '',
+        memberLabelName: '测试标签值名称重复- 温州青童时代店',
+        memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
         storeList: [],
         name: '',
         pageId: '',
@@ -275,10 +275,12 @@ export default {
             link.storeRuleJson = JSON.parse(link.storeRuleJson);
             link.storeList = link.storeList ? link.storeList : [];
             this.form = link;
+            if (!this.form.welcomeId) {
+              this.welcomeType = 2;
+            }
             this.landingForm = page;
             this.getStoreList();
           }
-          console.log(result);
         })
         .finally(_ => {
           this.loading = false;
@@ -300,9 +302,7 @@ export default {
       this.form.storeList = val;
       this.$refs.form.validateField('storeList');
     },
-    getWelcomeId(e) {
-      this.form.welcomeId = e;
-    },
+
     getList() {
       this.landingLoading = true;
       guidePageList(this.landingPage)
@@ -360,6 +360,9 @@ export default {
       data.storeRuleJson = JSON.stringify(data.storeRuleJson);
       data.customRuleJson = JSON.stringify(data.customRuleJson);
       data.wxEnterpriseId = this.wxEnterpriseId;
+      if (this.welcomeType == 2) {
+        data.welcomeId = '';
+      }
       delete data.memberLabelStatus;
       this.$refs.form.validate(val => {
         if (!val) {

src/views/salesleads/actCodeManage/attractFlowLink/index.vue

@@ -92,11 +92,11 @@ const tableHead = [
   },
   {
     label: '今日点击人次',
-    prop: 'clickNum',
+    prop: 'clickTimes',
     width: '130',
     sortable: 'custom',
     formatter: function(row) {
-      return `<span>${row.clickNum ? row.clickNum : '- -'}</span>`;
+      return `<span>${row.clickTimes ? row.clickTimes : '- -'}</span>`;
     }
   },
   {