Merge branch 'feature/act-code' into dev

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

@@ -198,18 +198,17 @@ export default {
         this.charData = result || [];
         // this.charData = [
         //   { addNum: 1, bizDate: '2021-07', clickNum: 3, clickTimes: 0 },
-        //   { addNum: 2, bizDate: '2021-08', clickNum: 30, clickTimes: 10 },
-        //   { addNum: 3, bizDate: '2021-09', clickNum: 40, clickTimes: 0 },
+        //   { addNum: 2, bizDate: '2021-08', clickNum: 2, clickTimes: 10 },
+        //   { addNum: 3, bizDate: '2021-09', clickNum: 4, clickTimes: 0 },
         //   { addNum: 4, bizDate: '2021-10', clickNum: 3, clickTimes: 40 },
         //   { addNum: 5, bizDate: '2021-11', clickNum: 3, clickTimes: 0 },
         //   { addNum: 6, bizDate: '2021-12', clickNum: 3, clickTimes: 20 },
-        //   { addNum: 0, bizDate: '2022-01', clickNum: 30, clickTimes: 20 },
-        //   { addNum: 6, bizDate: '2022-02', clickNum: 30, clickTimes: 0 },
+        //   { addNum: 0, bizDate: '2022-01', clickNum: 2, clickTimes: 20 },
+        //   { addNum: 6, bizDate: '2022-02', clickNum: 5, clickTimes: 0 },
         //   { addNum: 4, bizDate: '2022-03', clickNum: 20, clickTimes: 30 },
-        //   { addNum: 4, bizDate: '2022-04', clickNum: 203, clickTimes: 0 },
-        //   { addNum: 4, bizDate: '2022-05', clickNum: 20, clickTimes: 10 },
-        //   { addNum: 4, bizDate: '2022-06', clickNum: 20, clickTimes: 0 },
-        //   { addNum: 4, bizDate: '2022-07', clickNum: 10, clickTimes: 10 }
+        //   { addNum: 4, bizDate: '2022-04', clickNum: 1, clickTimes: 0 },
+        //   { addNum: 4, bizDate: '2022-05', clickNum: 3, clickTimes: 10 },
+        //   { addNum: 4, bizDate: '2022-06', clickNum: 3, clickTimes: 10 }
         // ];
       });
     },

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

@@ -71,7 +71,8 @@ export default {
           type: 'cat'
         },
         clickTimes: {
-          min: 0
+          min: 0,
+          nice: true
         },
         clickNum: {
           min: 0
@@ -107,7 +108,7 @@ export default {
           }
         }
       });
-      this.chart.axis('addNum', {
+      this.chart.axis('clickNum', {
         grid: {
           line: {
             type: 'line',
@@ -124,7 +125,7 @@ export default {
           }
         }
       });
-      this.chart.axis('clickNum', false);
+      this.chart.axis('addNum', false);
 
       this.chart.tooltip({
         showCrosshairs: true,
@@ -134,7 +135,13 @@ export default {
             {name}: {value}
             </div>`
       });
-
+      this.chart
+        .line()
+        .position('bizDate*clickNum')
+        .tooltip('clickNum', clickNum => {
+          return { name: '今日点击人数', value: clickNum };
+        })
+        .color('#14C9C9');
       this.chart
         .line()
         .position('bizDate*addNum')
@@ -153,13 +160,6 @@ export default {
           return { name: '今日点击人次', value: clickTimes };
         })
         .color('#D6B38C');
-      this.chart
-        .line()
-        .position('bizDate*clickNum')
-        .tooltip('clickNum', clickNum => {
-          return { name: '今日点击人数', value: clickNum };
-        })
-        .color('#14C9C9');
 
       this.chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互
       //图表绘制的最后一步，用于将图表渲染至画布

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

@@ -94,13 +94,13 @@
       <el-table-column label="关联导购" width="130" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p>{{ row.clerkName ? row.clerkName : '--' }}</p>
-          <p class="ft-12 phone overflow-ellipsis">{{ row.clerkCode ? row.clerkCode : '--' }}</p>
+          <p class="ft-12 phone overflow-ellipsis">code：{{ row.clerkCode ? row.clerkCode : '--' }}</p>
           <p v-if="row.clerkList && row.clerkList.length > 0">
             <el-popover width="200" trigger="click">
               <ul class="userMember-ul">
                 <li v-for="item in row.clerkList" :key="item.clerkId" class="userMemberLi">
                   <p class="ulName">{{ item.clerkName }}</p>
-                  <p class="ft-12 phone">code:{{ item.clerkCode }}</p>
+                  <p class="ft-12 phone">code：{{ item.clerkCode }}</p>
                 </li>
               </ul>
               <el-button class="ft-12" type="text" slot="reference">查看更多</el-button>
@@ -111,13 +111,13 @@
       <el-table-column label="成员所属门店" width="120" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p>{{ row.storeName ? row.storeName : '--' }}</p>
-          <p class="ft-12 phone">code:{{ row.storeCode ? row.storeCode : '--' }}</p>
+          <p class="ft-12 phone">code：{{ row.storeCode ? row.storeCode : '--' }}</p>
           <p v-if="row.storeList && row.storeList.length > 0">
             <el-popover width="200" trigger="click">
               <ul class="userMember-ul">
                 <li v-for="item in row.storeList" :key="item.storeId" class="userMemberLi">
                   <p class="ulName">{{ item.storeName }}</p>
-                  <p class="ft-12 phone">code:{{ item.storeCode }}</p>
+                  <p class="ft-12 phone">code：{{ item.storeCode }}</p>
                 </li>
               </ul>
               <el-button class="ft-12" type="text" slot="reference">查看更多</el-button>