Merge branch 'v_req_8.2' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into v_req_8.2

src/pages/ApplyConsumption/campusReport/campusReport.vue

@@ -309,7 +309,7 @@
 		}
 		return (false);
 	}
-	import html2cancas from "html2canvas"
+	// import html2cancas from "html2canvas"
 	import Canlendar from '@/components/canlendar.vue'
 	// 时间处理模块
 	import moment from 'moment'
@@ -445,7 +445,7 @@
 			},
 			toImage: function() {
 				this.$nextTick(() => {
-					html2cancas(document.getElementsByClassName("campusReport")[0], {
+					html2canvas(document.getElementsByClassName("campusReport")[0], {
 						useCORS: true,
 						// 解决截图不完整问题
 						scale: 1,

src/pages/SchoolReport/SchoolReport.vue

@@ -1169,7 +1169,7 @@
 </template>
 
 <script>
-	import html2cancas from "html2canvas"
+	// import html2cancas from "html2canvas"
 	var gHost = "https://" + window.location.host;
 	if (window.location.protocol != "https:") {
 		gHost = "https://fpdev.xiaopay.net";
@@ -1618,7 +1618,7 @@
 			},
 			toImage: function() {
 				this.$nextTick(() => {
-					html2cancas(document.getElementsByClassName("tainer")[0], {
+					html2canvas(document.getElementsByClassName("tainer")[0], {
 						useCORS: true,
 						// 解决截图不完整问题
 						scale: 1,

src/template.h5.html

@@ -11,6 +11,7 @@
 		<title>
 			<%= htmlWebpackPlugin.options.title %>
 		</title>
+		<script src="https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/src/js/html2canvas.js"></script>
 		<script src="//xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/src/js/jquery-1.8.0.min.js" async="async"></script>
 		<script src="//xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/src/js/weui.min.js" async="async"></script>
 		<script src="//xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/src/js/jweixin-1.6.0.js"></script>