Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/components/common/links.vue

@@ -63,7 +63,6 @@ export default {
 
     downloadImg() {
       const qrcode = document.getElementById('qrImg');
-      console.log(qrcode);
       let img = qrcode.getElementsByTagName('img')[0];
       let link = document.createElement('a');
       let url = img.getAttribute('src');

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

@@ -4,7 +4,7 @@
       <dm-sub-title type="line">基础信息</dm-sub-title>
       <div class="section">
         <el-form-item label="链接类型" required>
-          <el-radio-group v-model="form.linkType">
+          <el-radio-group v-model="form.linkType" :disabled="isEdit">
             <el-radio :label="1">专用链接</el-radio>
             <el-radio :label="2">通用链接</el-radio>
           </el-radio-group>
@@ -20,8 +20,8 @@
         <el-form-item label="链接标签" required prop="memberLabelId">
           <el-button plain v-if="!form.memberLabelId" @click="tagsDialogVisible = true"><i class="iconfont-components3 icon-cp-PlusOutlined addPic"></i>添加标签</el-button>
           <el-tag v-else closable @close="handleTagCloseTag">{{ form.memberLabelName }}</el-tag>
-          <dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
         </el-form-item>
+        <dm-memberTag-group :visiable.sync="tagsDialogVisible" projectName="haobao-3" @save="saveTagPop"></dm-memberTag-group>
       </div>
       <dm-sub-title type="line">分配规则</dm-sub-title>
       <p class="tips-info">
@@ -150,9 +150,6 @@ export default {
       if (this.form.customRuleJson.open == 1 && !this.form.storeList.length) {
         return cb(new Error('请选择门店'));
       }
-      if (this.form.customRuleJson.open == 1 && !this.form.storeList.length) {
-        return cb(new Error('请选择门店'));
-      }
       cb();
     };
     return {
@@ -173,13 +170,13 @@ export default {
       rules: {
         name: { required: true, message: '请输入链接名称' },
         memberLabelId: { required: true, message: '请选择链接标签' },
-        storeList: { validator: validateStoreList }
+        storeList: { required: true, validator: validateStoreList }
       },
       storeData: [],
       form: {
         linkType: 1,
-        memberLabelName: '',
-        memberLabelId: '',
+        memberLabelName: '测试标签值名称重复- 温州青童时代店',
+        memberLabelId: 'edd3901afd1e418d93fdc3b50bb24784',
         storeList: [],
         name: '',
         pageId: '',
@@ -232,6 +229,11 @@ export default {
     console.log(this.form);
     document.addEventListener('visibilitychange', () => {
       if (document.visibilityState == 'visible') {
+        this.landingPage = {
+          pageSearchText: '',
+          pageNum: 1,
+          pageSize: 20
+        };
         this.getList();
       }
     });
@@ -338,17 +340,23 @@ export default {
         if (this.isAdd) {
           linkAdd(data)
             .then(res => {
+              setTimeout(() => {
+                this.btnLoading = false;
                 this.$router.go(-1);
+              }, 1000);
             })
-            .finally(_ => {
+            .catch(_ => {
               this.btnLoading = false;
             });
         } else {
           linkUpdate(data)
             .then(res => {
+              setTimeout(() => {
+                this.btnLoading = false;
                 this.$router.go(-1);
+              }, 1000);
             })
-            .finally(_ => {
+            .catch(_ => {
               this.btnLoading = false;
             });
         }

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

@@ -17,9 +17,9 @@
           <el-descriptions-item label="链接描述">{{ link.remark }}</el-descriptions-item>
         </el-descriptions>
         <div class="m-t-10">
-          <el-button icon="el-icon-download" plain @click="downloadQR">下载二维码</el-button>
+          <el-button v-if="link.linkType == 2" icon="el-icon-download" plain @click="downloadQR">下载二维码</el-button>
           <el-button v-if="link.linkType == 2" v-clipboard:text="link.linkUrl" plain>复制链接</el-button>
-          <el-button v-if="link.linkType == 2" plain @click="goEdit">修改</el-button>
+          <el-button plain @click="goEdit">修改</el-button>
         </div>
       </div>
     </div>

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -12,10 +12,10 @@
           <el-option label="使用成员" :value="2"></el-option>
         </el-select>
         <el-select v-model="inFields.storeSelect" v-if="storeSelect == 1" filterable remote placeholder="请输入门店名称/code" :remote-method="remoteMethods" :loading="selectLoading" v-loadmore="onLoadmoreStore" @change="searchList" style="margin-left: -4px; width:196px;">
-          <el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeCode"> </el-option>
+          <el-option v-for="item in shopList" :key="item.storeId" :label="item.storeName" :value="item.storeId"> </el-option>
         </el-select>
         <el-select v-model="inFields.clerkSelect" v-if="storeSelect == 2" filterable remote placeholder="请输入成员名称/code" :loading="selectLoading" @change="searchList" style="margin-left: -4px; width:196px;">
-          <el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkCode"> </el-option>
+          <el-option v-for="item in memberList" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>

src/views/salesleads/components/welcomesItem.vue

@@ -105,15 +105,21 @@ export default {
   activated() {
     this.onSearch();
   },
-  // mounted() {
-  //   this.getWelcomeTable();
-  //   document.addEventListener('visibilitychange', () => {
-  //     console.log(document.visibilityState, 99999);
-  //     if (document.visibilityState == 'visible') {
-  //       this.getWelcomeTable();
-  //     }
-  //   });
-  // },
+  mounted() {
+    this.getWelcomeTable();
+    document.addEventListener('visibilitychange', () => {
+      if (document.visibilityState == 'visible') {
+        this.welcomePage = {
+          wxEnterpriseId: sessionStorage.getItem('userInfos') ? JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId : '',
+          title: '',
+          type: 2,
+          pageNum: 1,
+          pageSize: 20
+        };
+        this.getWelcomeTable();
+      }
+    });
+  },
   methods: {
     onSearch() {
       this.welcomePage.pageNum = 1;