Merge branch 'develop' into uat

package.json

@@ -62,6 +62,7 @@
     "dayjs": "^1.10.4",
     "echarts": "^5.1.0",
     "flyio": "^0.6.2",
+    "html2canvas": "^1.4.1",
     "jweixin-module": "^1.6.0",
     "less-loader": "5.0.0",
     "node-sass": "^4.14.1",

src/pages.json

@@ -414,6 +414,14 @@
 				"enablePullDownRefresh": false
 			}
 
+		},{
+			"path": "pages/SchoolReport/SchoolReport",
+			"style": {
+				"navigationBarTitleText": "校园报告",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+
 		}
 		
 	],