Merge branch 'feature/act-code' into dev

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>`;
     }
   },
   {

src/views/salesleads/actCodeManage/staffActCode/actCodeRecord.vue

@@ -11,12 +11,23 @@
             <div class="flex">
               <img v-if="scope.row.memberImage" class="image-40" :src="scope.row.memberImage" />
               <img v-if="!scope.row.memberImage" class="image-40" src="@/assets/user-default.svg" />
-              <div class="p-l-10 line-20" style="width: calc(100% - 50px);">
+
+              <div v-if="!scope.row.memberName && !scope.row.memberNick && !scope.row.memberPhone" class="p-l-10" style="width: calc(100% - 50px);line-height: 40px;">--</div>
+              <div v-if="(scope.row.memberName || scope.row.memberNick) && scope.row.memberPhone" class="p-l-10 line-20" style="width: calc(100% - 50px);">
                 <div class="flex text-ellipsis">
-                  <span class="text-ellipsis">{{ scope.row.memberName || '--' }}</span>
-                  <span class="color-909399 text-ellipsis"> （{{ scope.row.memberNick || '--' }}）</span>
+                  <span class="text-ellipsis">{{ scope.row.memberName }}</span>
+                  <span :class="scope.row.memberName ? 'color-909399 text-ellipsis' : 'text-ellipsis'" v-if="scope.row.memberNick"> {{ !scope.row.memberName ? scope.row.memberNick : '（' + scope.row.memberNick + ')' }}</span>
+                </div>
+                <p class="font-12">{{ scope.row.memberPhone }}</p>
+              </div>
+              <div v-else>
+                <div v-if="scope.row.memberName && scope.row.memberNick && !scope.row.memberPhone" class="p-l-10" style="line-height: 40px;">
+                  <div class="flex text-ellipsis">
+                    <span class="text-ellipsis">{{ scope.row.memberName }}</span>
+                    <span class="color-909399 text-ellipsis"> （{{ scope.row.memberNick }})</span>
+                  </div>
                 </div>
-                <p class="font-12">{{ scope.row.memberPhone || '--' }}</p>
+                <div v-else class="p-l-10" style="width: calc(100% - 50px);line-height: 40px;">{{ scope.row.memberName || scope.row.memberNick || scope.row.memberPhone }}</div>
               </div>
             </div>
           </template>
@@ -86,9 +97,9 @@ export default {
   data() {
     return {
       loading: false,
+      tableData: [],
       // searchInputStore: '',
       // searchInputGuide: '',
-      tableData: [{ addChannel: 2, hmName: '好多好多活码呢', linkName: '没什么的链接', storeName: '实话实说mendian', storeCode: '0928338', staffName: '是共商国是', memberLabelName: '和大哥大哥大哥的话打电话', clerkCode: '99000', clerkName: '常常常常', createTime: 1891282736363, memberImage: '@/assets/user-default.svg', memberName: '溜溜里', memberNick: 'kiu今生', memberPhone: '15757906438', memberCardNo: '92838383838', memberGradeName: '高级卡' }],
       // 分页参数
       currentPage: 1,
       pageSize: 20,
@@ -154,6 +165,7 @@ export default {
         clerkId,
         startTime,
         endTime,
+        // addChannel: 1,
         addChannel: linkId ? 1 : hmId ? 2 : 0, // 不具备传0
         createTimeOrder: that.sortType || ''
       };
@@ -163,6 +175,9 @@ export default {
           that.loading = false;
           if (resData.code == 0) {
             that.tableData = resData.result.result || [];
+            // that.tableData[0].memberPhone = '';
+            // that.tableData[0].memberNick = '';
+            // that.tableData[0].memberName = '';
             that.total = resData.result.totalCount || 0;
             return;
           }