Merge branch 'feature/act-code' into dev

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/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,