Merge branch 'feature/act-code' into dev

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

@@ -60,27 +60,7 @@ export default {
           { name: '今日点击人数', value: 'clickNum', marker: { symbol: 'line', style: { stroke: '#14C9C9', lineWidth: 12, lineHeight: 8 } } }
         ]
       });
-      //坐标轴配置(法一配置)
-      this.chart.axis('bizDate', {
-        line: {
-          style: {
-            stroke: '#606266',
-            lineDash: [3, 3]
-          }
-        },
-        tickLine: {
-          style: {
-            fill: '#E4E7ED',
-            lineDash: [3, 3]
-          }
-        },
-        label: {
-          style: {
-            fill: '#606266'
-          }
-        }
-      });
-      this.chart.axis('addNum', {
+      const lineConfig = {
         grid: {
           line: {
             type: 'line',
@@ -99,47 +79,12 @@ export default {
             return val;
           }
         }
-      });
-      this.chart.axis('clickTimes', {
-        grid: {
-          line: {
-            type: 'line',
-            style: {
-              stroke: '#E4E7ED',
-              lineDash: [3, 3]
-            }
-          }
-        },
-        label: {
-          style: {
-            fill: '#606266'
-          },
-          formatter: val => {
-            // 格式化参数值
-            return val;
-          }
-        }
-      });
-      this.chart.axis('clickNum', {
-        grid: {
-          line: {
-            type: 'line',
-            style: {
-              stroke: '#E4E7ED',
-              lineDash: [3, 3]
-            }
-          }
-        },
-        label: {
-          style: {
-            fill: '#606266'
-          },
-          formatter: val => {
-            // 格式化参数值
-            return val;
-          }
-        }
-      });
+      };
+      //坐标轴配置(法一配置)
+      this.chart.axis('bizDate', lineConfig);
+      this.chart.axis('addNum', lineConfig);
+      this.chart.axis('clickTimes', lineConfig);
+      this.chart.axis('clickNum', lineConfig);
       this.chart.tooltip({
         showCrosshairs: true,
         shared: true,

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

@@ -33,7 +33,7 @@
             <!-- <el-tag size="small" type="info">{{ codeInfo.memberLabelName || '--' }}</el-tag> -->
           </div>
         </div>
-        <div v-if="codeInfo.statusFlag != 2" class="flex" style="padding-top:20px;">
+        <div v-if="codeInfo.statusFlag != 2 && codeInfo.statusFlag" class="flex" style="padding-top:20px;">
           <el-button v-if="codeInfo.hmType == 2 && codeInfo.statusFlag == 1" icon="el-icon-download" type="primary" style="width:120px;margin-right: 12px;" @click="downloadQR">下载二维码</el-button>
           <el-button type="primary" plain style="width:98px;" @click="modifyCode">编辑</el-button>
           <el-button class="button-discard" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode" :disabled="codeInfo.hmType == 2 && useMemberList.length > 0">作废</el-button>
@@ -77,7 +77,7 @@ export default {
   },
   data() {
     return {
-      fixedHeight: 280,
+      fixedHeight: 237,
       codeInfo: {},
       loading: false,
       activeName: 'first',

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

@@ -71,12 +71,12 @@
       </el-table-column>
       <el-table-column label="添加好友人数" prop="addNum" sortable="custom" width="150">
         <template slot-scope="{ row }">
-          <p>{{ row.addNum == null ? row.addNum : '--' }}</p>
+          <p>{{ row.addNum ? row.addNum : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column label="今日新增人数" prop="addNumT" sortable="custom" width="150">
         <template slot-scope="{ row }">
-          <p>{{ row.addNumT == null ? row.addNumT : '--' }}</p>
+          <p>{{ row.addNumT ? row.addNumT : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column label="关联导购" width="120" show-overflow-tooltip>
@@ -113,11 +113,11 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column label="所属分组" width="100" show-overflow-tooltip>
+      <!-- <el-table-column label="所属分组" width="100" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <p>{{ row.hmGroupId ? row.hmGroupId : '--' }}</p>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="创建人" width="100">
         <template slot-scope="{ row }">
           <p>{{ row.creatorName ? row.creatorName : '--' }}</p>
@@ -525,11 +525,11 @@ export default {
   watch: {
     currentGroupId: {
       handler: function(val) {
-        if (val) {
-          this.currentGroupId = val;
-          this.pageParam.pageNo = 1;
-          this.getTableList();
-        }
+        // if (val) {
+        this.currentGroupId = val;
+        this.pageParam.pageNo = 1;
+        this.getTableList();
+        // }
       },
       immediate: true
     }

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

@@ -64,7 +64,9 @@ export default {
     },
     onChange(data) {
       this.data = data;
-      this.form.clerkIdList = data;
+      this.form.clerkIdList = data.map(item => {
+        return item.clerkId;
+      });
       this.form.hmUserNum = data.length;
     },
     async onSubmit(event) {

src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue

@@ -99,6 +99,16 @@ export default {
     };
   },
   created() {
+    // this.searchGroup();
+  },
+  activated() {
+    if (this.$route.meta.refresh) {
+      this.pageP = {
+        groupName: '',
+        pageNum: 1,
+        pageSize: 20
+      };
+    }
     this.searchGroup();
   },
   methods: {
@@ -115,9 +125,7 @@ export default {
       }
     },
     clickGroupListItem(listItem) {
-      console.log(listItem, 'uuuuu');
       this.currentListItemUuid = listItem.groupId;
-      console.log(this.currentListItemUuid, 'this.currentListItemUuid');
       this.$emit('updateList', this.currentListItemUuid);
     },
     isShowGroupListItemMore(listItem) {
@@ -241,7 +249,6 @@ export default {
           if (this.pageP.groupName == '') {
             this.searchTip = false;
           } else if (this.pageP.groupName != '') {
-            // this.groupList.splice(0, 1);
             if (this.groupList.length <= 0) {
               this.searchTip = true;
             }