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
+			}
+
 		}
 		
 	],

src/pages/BankModule/Recharge/Recharge.vue

@@ -275,7 +275,7 @@
                   item.bindCardNo.slice(item.bindCardNo.length - 4)
                 }}</span
               >
-              <!-- <image class='BankListImg' src='../../../static/img/choiceBank.png'></image> -->
+              <image class='BankListImg' src='../../../static/img/choiceBank.png'></image>
             </view>
           </view>
         </view>

src/pages/IcbcModule/Recharge/Recharge.vue

@@ -216,7 +216,7 @@
                   item.bindCardNo.slice(item.bindCardNo.length - 4)
                 }}</span
               >
-              <!-- <image class='BankListImg' src='../../../static/img/choiceBank.png'></image> -->
+              <image class='BankListImg' src='../../../static/img/choiceBank.png'></image>
             </view>
           </view>
         </view>

src/pages/pdfPreview/pdfPreview.vue

@@ -5,6 +5,7 @@
 </template>
 <script>
 	import Pdfh5 from "pdfh5";
+	import "pdfh5/css/pdfh5.css";
 	export default {
 		name: 'App',
 		data() {
@@ -36,6 +37,11 @@
 				default:
 					break;
 			}
+			if (options.pdfName == 'azkjmenber') {
+				uni.setNavigationBarTitle({
+					title: "会员服务协议"
+				})
+			}
 			this.pdfName = options.pdfName
 			this.Init(this.ImgUrl + 'AgreementPdf/' + this.pdfName)
 		},
@@ -50,9 +56,8 @@
 						this_.pdfh5 = new Pdfh5("#pdfh5", {
 							pdfurl: pdfName + '.pdf',
 							scale: 2,
+							goto: 0,
 							zoomEnable: true,
-							renderType: 'svg'
-
 						});
 						//监听完成事件
 						this_.pdfh5.on("complete", function(status, msg, time) {
@@ -76,6 +81,10 @@
 		margin: 0;
 	}
 
+	page {
+		height: 100%;
+	}
+
 	html,
 	body,
 	#app {