Merge branch 'sj-dev-v6' of git.server:wangxuelai/wechatapp.shangjiadao.com into course_lvtz

business/pages/datacenter/index.js

@@ -34,8 +34,10 @@ Page({
     windowWidth:320,
     total:0,
     ringChart:{
-
-    }
+      1:'',
+      2:'',
+      3:''
+    },
   },
 
   /**
@@ -307,7 +309,7 @@ Page({
           classCours:data.list
         })
         data.list.forEach((ele,index) => {
-          this.initRingChart(ele,index+1)
+          this.initRingChart(index+1,ele)
         });
       }
     }).catch((res)=>{

business/pages/datacenter/index.wxss

@@ -96,7 +96,7 @@
     left: -18rpx;
 }
 .ring-chart-box .chart-box .chart-item{
-    flex: 1;
+    width: 33%;
 }
 .ring-chart-box .chart-box .chart-item .name{
     font-size:24rpx;

business/pages/studentmgt/list.js

@@ -240,7 +240,7 @@ Page({
       let prevPage = pages[pages.length - 2];
       prevPage.setData({
         consumer_id: this.data.checkedIdStr,
-        consumer_names: this.data.checkedNames.join(",")
+        consumer_names: this.data.checkedNames.join(","),
       })
       wx.navigateBack({
         delta: 1,