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

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

@@ -22,7 +22,7 @@
             </div>
           </div>
         </li>
-        <li class="data-total-cell ">
+        <li class="data-total-cell">
           <div class="flex p-20">
             <div class="icon-background" style="background: #d9f3fd;">
               <i class="iconfont-hb3 iconxinzengyonghu color-35C4FC font-28"></i>

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

@@ -73,6 +73,7 @@ export default {
     .list-right {
       position: relative;
       height: 500px;
+      width: 100%;
       min-width: calc(100% - 300px);
       min-height: calc(100vh - 94px);
       border-left: 1px solid #e4e7ed;

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

@@ -51,8 +51,12 @@ export default {
         return b.新增人数 - a.新增人数;
       });
       let maxNum = list[0]['新增人数'];
-      // console.log(list);
       this.chart.data(this.charData); // 载入数据源
+      this.chart.tooltip({
+        showMarkers: false,
+        shared: true,
+        showCrosshairs: true
+      });
       this.chart.scale({
         新增人数: {
           // tickInterval: 1,

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

@@ -164,8 +164,8 @@ export default {
       })
         .then(() => {
           // 删除操作
-          // const listItemIndex = this.groupList.findIndex(item => item.groupId === listItem.groupId);
-          // if (listItemIndex < 0) return;
+          const listItemIndex = this.groupList.findIndex(item => item.groupId === listItem.groupId);
+          if (listItemIndex < 0) return;
           let params = {
             groupId: listItem.groupId
           };
@@ -175,10 +175,12 @@ export default {
                 type: 'success',
                 message: '删除成功!'
               });
-              // this.groupList.splice(listItemIndex, 1);
-              this.pageP.pageNum = 1;
-              this.currentListItemUuid = -1;
-              this.$emit('updateList', this.currentListItemUuid);
+              this.groupList.splice(listItemIndex, 1);
+              if (this.currentListItemUuid == listItem.groupId) {
+                this.pageP.pageNum = 1;
+                this.currentListItemUuid = -1;
+                this.$emit('updateList', this.currentListItemUuid);
+              }
               this.searchGroup();
             }
           });

static/css/public.css

@@ -287,6 +287,7 @@ body {
     /* background-color: #f0f2f5; */
 }
 body {
+    overflow-y: hidden;
     -webkit-text-size-adjust: none;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }