update: dist

src/api/api.js

@@ -86,7 +86,6 @@ Vue.axios.interceptors.response.use(
       if (data.data.errorCode == 10 || data.data.errorCode == 7) {
         window.location.href = gicHost + '/haoban-3/#/index';
       }
-      Message.error({ message: data.data.message });
       return data;
     }
     return data;

src/components/common/selectShop.vue

 <template>
   <el-popover placement="bottom" v-model="departmentVisible">
-    <dm-simple-transfer v-model="selected" :busy="busy" :canSelectAll="canSelectAll" :props="props" :max="max" :data="data" :bodyH="62" :item-size="66" :titles="['选择门店', '已选门店']" filterable filter-placeholder="请输入门店名称/code" @change="change" @loadMore="loadMore">
+    <dm-simple-transfer :key="key" v-model="selected" :busy="busy" :canSelectAll="canSelectAll" :props="props" :max="max" :data="data" :bodyH="62" :item-size="66" :titles="['选择门店', '已选门店']" filterable filter-placeholder="请输入门店名称/code" @change="change" @loadMore="loadMore">
       <div slot-scope="{ option }">
         <el-tooltip :content="option.storeName" :disabled="option.storeName.length < 10">
           <p class="storeName">{{ option.storeName }}</p>
@@ -41,11 +41,16 @@ export default {
     canSelectAll: {
       type: Boolean,
       default: false
+    },
+    key: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
       departmentVisible: false,
+
       props: {
         key: 'storeId',
         label: 'storeName',

src/components/utils/directives.js

@@ -25,8 +25,12 @@ const clipboard = {
   }
 };
 const linkMap = {
-  code: 'https://www.yuque.com/exnmlu/oo64hg/thm172#w4sOg',
-  link: 'https://www.yuque.com/exnmlu/oo64hg/lggf7q#eV2NM'
+  codeList: 'https://www.yuque.com/exnmlu/oo64hg/thm172#WRdju',
+  codeGl: 'https://www.yuque.com/exnmlu/oo64hg/thm172#ADEzt',
+  codeCkmx: 'https://www.yuque.com/exnmlu/oo64hg/thm172#mDlza',
+  linkList: 'https://www.yuque.com/exnmlu/oo64hg/lggf7q#WRdju',
+  linkGl: 'https://www.yuque.com/exnmlu/oo64hg/lggf7q#ADEzt',
+  linkCkmx: 'https://www.yuque.com/exnmlu/oo64hg/lggf7q#mDlza'
 };
 const jumpLink = {
   bind(el, binding) {

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

@@ -73,7 +73,7 @@
             <div class="level3-2" v-if="form.customRuleJson.open">
               <div class="level3-2-content" v-if="form.customRuleJson.store_type == 1">
                 <el-form-item label="选择门店" label-width="92px" prop="storeList">
-                  <selectShop @change="handleTransferChange" :data="storeData" :max="20" :selected="form.storeList" :canSelectAll="false" />
+                  <selectShop @change="handleTransferChange" :data="storeData" :max="20" :key="shopKey" :selected="form.storeList" :canSelectAll="false" />
                 </el-form-item>
                 <el-checkbox v-model="form.customRuleJson.store.dz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dz">店长</el-checkbox>
                 <el-checkbox v-model="form.customRuleJson.store.dy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.dz, form.customRuleJson.store.dy) && form.customRuleJson.store.dy">导购</el-checkbox>
@@ -86,7 +86,7 @@
                 </div>
                 <p class="content-tips m-b-10">客户拒绝授权当前定位信息，可在下方指定的门店范围中（最多20家）自主选择要添加的门店好友</p>
                 <el-form-item label="选择门店" label-width="92px" prop="storeList">
-                  <selectShop @change="handleTransferChange" :data="storeData" :max="20" :selected="form.storeList" :canSelectAll="false" />
+                  <selectShop @change="handleTransferChange" :data="storeData" :max="20" :key="shopKey" :selected="form.storeList" :canSelectAll="false" />
                 </el-form-item>
                 <el-checkbox v-model="form.customRuleJson.store.ndz" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.ndz, form.customRuleJson.store.ndy) && form.customRuleJson.store.ndz">店长</el-checkbox>
                 <el-checkbox v-model="form.customRuleJson.store.ndy" :true-label="1" :false-label="0" :disabled="disabledProperty(form.customRuleJson.store.ndz, form.customRuleJson.store.ndy) && form.customRuleJson.store.ndy">导购</el-checkbox>
@@ -225,8 +225,7 @@ export default {
       btnLoading: false,
       storePageNum: 0,
       totalCount: 1,
-      busy: false,
-      busy2: false
+      shopKey: false
     };
   },
   components: {
@@ -260,15 +259,14 @@ export default {
       storeListApi({ pageSize: 999999 })
         .then(res => {
           const { result, totalCount } = res.data.result;
-          this.storeData = this.storeData.concat(result || []);
+          this.storeData = result;
           this.totalCount = totalCount;
-          this.busy = false;
-          // if (this.form.storeList && this.form.storeList.length) {
-          //   this.storeData.map(el => {
-          //     el.checked = this.form.storeList.some(item => item.storeId == el.storeId);
-          //     return el;
-          //   });
-          // }
+          if (this.form.storeList && this.form.storeList.length) {
+            this.storeData.map(el => {
+              el.checked = this.form.storeList.some(item => item.storeId == el.storeId);
+              return el;
+            });
+          }
         })
         .finally(_ => {
           this.busy = false;
@@ -313,14 +311,10 @@ export default {
     handleTransferChange(val) {
       this.form.storeList = val;
       this.$refs.form.validateField('storeList');
+      if (val && !val.length) {
+        this.storeData = this.storeData.splice(0);
+      }
     },
-    // loadMore() {
-    //   if (this.storeData.length < this.totalCount) {
-    //     this.busy = false;
-    //     this.storePageNum++;
-    //     this.getStoreList();
-    //   }
-    // },
     getList() {
       this.landingLoading = true;
       guidePageList(this.landingPage)

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

@@ -3,7 +3,7 @@
     <dm-sub-title class="m-b-10">
       <div class="title">
         <span>引流加入</span>
-        <el-button type="text" v-jumpLink:link><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
+        <el-button type="text" v-jumpLink:linkList><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
       </div>
     </dm-sub-title>
     <!-- <el-tabs v-model="activeName" @tab-click="handleClick">

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

@@ -63,7 +63,7 @@
           <dm-sub-title>
             <div class="title">
               <span>概览</span>
-              <el-button type="text" v-jumpLink:link><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
+              <el-button type="text" v-jumpLink:linkGl><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
             </div>
           </dm-sub-title>
           <el-row :gutter="20">
@@ -83,7 +83,7 @@
           <dm-sub-title>
             <div class="title">
               <span>查看明细</span>
-              <el-button type="text" v-jumpLink:link><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
+              <el-button type="text" v-jumpLink:linkCkmx><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
             </div>
           </dm-sub-title>
           <data-detail :id="linkId" typeT="link" :api="statisticsClerk" class="m-t-15"></data-detail>

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

@@ -7,7 +7,7 @@
           <span class="font-w-500 color-303133">概览</span>
         </div>
         <div class="flex">
-          <el-button type="text" v-jumpLink:code><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
+          <el-button type="text" v-jumpLink:codeGl><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
         </div>
       </div>
       <ul class="flex">
@@ -51,7 +51,7 @@
           <span class="font-w-500 color-303133">查看明细</span>
         </div>
         <div class="flex">
-          <el-button type="text" v-jumpLink:code><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
+          <el-button type="text" v-jumpLink:codeCkmx><i class="iconfont-hb3 iconzhibiaoshuoming m-r-6"></i>指标说明</el-button>
         </div>
       </div>
       <data-detail :id="hmId"></data-detail>

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

@@ -9,7 +9,7 @@
           <dm-sub-title text="配置标签" class="m-b-10">
             <div class="title">
               <span>员工活码</span>
-              <el-button type="text" v-jumpLink:code><i class="iconfont-hb3 iconzhibiaoshuoming  m-r-6"></i>指标说明</el-button>
+              <el-button type="text" v-jumpLink:codeList><i class="iconfont-hb3 iconzhibiaoshuoming  m-r-6"></i>指标说明</el-button>
             </div>
           </dm-sub-title>
           <act-code-table :currentGroupId="currentGroupId"></act-code-table>