Merge branch 'develop'

src/main.js

@@ -26,8 +26,8 @@ Vue.use(Vant);
 
 
 // echarts图标
-// var echarts = require('echarts')
-// Vue.prototype.$echarts = echarts
+var echarts = require('echarts')
+Vue.prototype.$echarts = echarts
 // console.log(echarts);
 
 // 微信JSSDK

src/pages.json

@@ -6,13 +6,22 @@
 				"navigationBarTitleText": "校智付电子校园卡",
 				"navigationStyle": "custom",
 				"usingComponents": {
-
+		
 				},
 				"h5": {
 					"titleNView": "transparent"
 				}
 			}
-		}, {
+		},
+		{
+			"path": "pages/ConsumptionReport/ConsumptionReport",
+			"style": {
+				"navigationBarTitleText": "周消费报告",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
 			"path": "pages/WxworkTearch/WxworkTearch",
 			"style": {
 				"navigationBarTitleText": "企业微信教职工采集签约助手",
@@ -20,7 +29,8 @@
 				"navigationStyle": "custom"
 			}
 
-		}, {
+		}, 
+		{
 			"path": "pages/wxWorkAuth/wxWorkAuth",
 			"style": {
 				"navigationBarTitleText": "校智付",
@@ -127,28 +137,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/AccessControlModular/SchoolAttendance/SchoolAttendance",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/AccessControlModular/StudentAttendance/StudentAttendance",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/AccessControlModular/TeacherAttendance/TeacherAttendance",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
+		},   {
 			"path": "pages/StudentsGraduate/StudentsGraduate",
 			"style": {
 				"navigationStyle": "custom",