1.合并代码解决冲突;

public/index.html

@@ -4,7 +4,10 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-		<link rel="shortcut icon" type="image/x-icon" href="./faceico.ico"/>
+		<meta http-equiv="pragram" content="no-cache">
+		<meta http-equiv="cache-control" content="no-cache, must-revalidate">
+		<meta http-equiv="expires" content="0">
+		<link rel="shortcut icon" type="image/x-icon" href="./static/faceico.ico"/>
 		<title>
 			<%= htmlWebpackPlugin.options.title %>
 		</title>

src/App.vue

@@ -8,6 +8,11 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
+		},
+		onPageNotFound: function(res) {
+			uni.redirectTo({
+				url: "/pages/NotFound/NotFound"
+			})
 		}
 	}
 </script>

src/pages.json

@@ -374,7 +374,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/TemperatureRecords/TemperatureStatistics/TemperatureStatistics",
 			"style": {
 				"navigationBarTitleText": "体温记录",
@@ -382,7 +382,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/TemperatureRecords/HighTemperature/HighTemperature",
 			"style": {
 				"navigationBarTitleText": "高温",
@@ -390,7 +390,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/TemperatureRecords/LowTemperature/LowTemperature",
 			"style": {
 				"navigationBarTitleText": "低温",
@@ -398,7 +398,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/TemperatureRecords/NormalTemperatrue/NormalTemperatrue",
 			"style": {
 				"navigationBarTitleText": "正常",
@@ -406,7 +406,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/TemperatureRecords/Undetected/Undetected",
 			"style": {
 				"navigationBarTitleText": "未测量",
@@ -414,7 +414,7 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
+		}, {
 			"path": "pages/SchoolReport/SchoolReport",
 			"style": {
 				"navigationBarTitleText": "校园报告",
@@ -424,6 +424,15 @@
 
 		}
 
+		, {
+			"path": "pages/NotFound/NotFound",
+			"style": {
+				"navigationBarTitleText": "抱歉！没有找到您想要的资源",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false
+			}
+
+		}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

src/pages/BankModule/Recharge/Recharge.vue

@@ -571,14 +571,27 @@ export default {
     },
     // 代扣状态查询
     async signStatusQuery() {
-      let respes = await this.$http.post({
-        // url: "http://159.75.47.27:8091/bank-wechat/bohai/comprehensive/signStatusQuery",
-        url: orderApi + "/bank-wechat/bohai/comprehensive/signStatusQuery",
+      let loading = Toast.loading({
+        message: "加载中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0,
+      });
+      $.ajax({
+        url: gHost + "/bank-wechat/bohai/comprehensive/signStatusQuery",
+        type: "POST",
+        contentType: "application/x-www-form-urlencoded",
         data: {
           schoolId: bankInfo.schoolId, //学校id
           userId: userID, //用户id
+          sessionid: sessionID,
+          wechattype: 1
         },
-      });
+        headers: {
+          sessionid: sessionID,
+        },
+        success: function (respes) {
+          loading.clear();
           if (respes.code == "10000") {
             console.log(respes, "respes");
             if (respes.results.dkstatus != 1) {
@@ -607,6 +620,13 @@ export default {
             throw new Error("代扣状态查询,请重试！");
           }
         },
+        error: function (err) {
+          loading.clear();
+          Toast(err || "代扣状态查询,请重试！");
+            throw new Error("代扣状态查询,请重试！");
+        },
+      });
+    },
     // 充值验证获取验证码
     async SendSms() {
       if (MyTimer) {

src/pages/NotFound/NotFound.vue

+<template>
+	<view class="noData hideToShow" :style="{ backgroundColor: bgColor }">
+		<view class="image">
+			<image :src="noDataImg"></image>
+		</view>
+		<!-- 网络连接失败默认显示内容 -->
+		<view class="content">
+			<text class="title" :style="{ color: mainColor }">不存在的内容</text>
+			<text class="desc" :style="{ color: viceColor }">没有找到您想要的东西</text>
+		</view>
+		<!-- 自定义内容 -->
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "NotFound",
+		props: {
+			isShow: {
+				type: Boolean,
+				default: false
+			},
+			/* 背景颜色自定义 */
+			bgColor: {
+				type: String,
+				default: '#ffffff'
+			},
+			/* 标题颜色自定义 */
+			mainColor: {
+				type: String,
+				default: '#373a40'
+			},
+			/* 描述颜色自定义 */
+			viceColor: {
+				type: String,
+				default: '#8b8b8b'
+			},
+			// 是否开启自定义
+			custom: {
+				type: false,
+				default: false
+			}
+		},
+		data() {
+			return {
+				type: '',
+				netType: "",
+				mainText: '网络居然崩溃了',
+				viceText: '别紧张,去检测一下网络设置',
+				netWorkImg: '/static/images/noNetWork.png',
+				noDataImg: '/static/images/notFound.png'
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.noData {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		
+		padding-top: 400rpx;
+
+		.image {
+			width: 187upx;
+			height: 144upx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.content {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			justify-content: center;
+			letter-spacing: 1upx;
+
+			.title {
+				font-size: 36upx;
+			}
+
+			.desc {
+				font-size: 28upx;
+				margin-top: 6upx;
+			}
+
+			.btn {
+				width: 160upx;
+				height: 65upx;
+				color: #868d91;
+				font-size: 24upx;
+				margin-top: 34upx;
+				border-radius: 36upx;
+				border: 1upx solid #d4d4d4;
+			}
+
+			.btn::after {
+				border: none;
+			}
+		}
+	}
+</style>

src/pages/TemperatureRecords/HighTemperature/HighTemperature.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="cardBox">
 			<view v-if="ifShow">
-				<view class="card" v-for="item of detailsList">
+				<view class="card" v-for="(item,index) of detailsList" :key="index">
 					<view class="temperatureResult">
 						<view class="studentInfo">
 							<view class="studentName">

src/pages/TemperatureRecords/LowTemperature/LowTemperature.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="cardBox">
 			<view v-if="ifShow">
-				<view class="card" v-for="item of detailsList">
+				<view class="card" v-for="(item,index) of detailsList" :key="index">
 					<view class="temperatureResult">
 						<view class="studentInfo">
 							<view class="studentName">

src/pages/TemperatureRecords/NormalTemperatrue/NormalTemperatrue.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="cardBox">
 			<view v-if="ifShow">
-				<view class="card" v-for="item of detailsList">
+				<view class="card" v-for="(item,index) of detailsList" :key="index">
 					<view class="temperatureResult">
 						<view class="studentInfo">
 							<view class="studentName">

src/pages/TemperatureRecords/Undetected/Undetected.vue

@@ -14,7 +14,7 @@
 		</view>
 		<view class="cardBox">
 			<view v-if="ifShow">
-				<view class="card" v-for="item of detailsList">
+				<view class="card" v-for="(item,index) of detailsList" :key="index">
 					<view class="temperatureResult">
 						<view class="studentInfo">
 							<view class="studentName">

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 {

src/template.h5.html

@@ -4,7 +4,10 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-		<link rel="shortcut icon" type="image/x-icon" href="./faceico.ico"/>
+		<meta http-equiv="pragram" content="no-cache">
+		<meta http-equiv="cache-control" content="no-cache, must-revalidate">
+		<meta http-equiv="expires" content="0">
+		<link rel="shortcut icon" type="image/x-icon" href="./static/faceico.ico"/>
 		<title>
 			<%= htmlWebpackPlugin.options.title %>
 		</title>