Merge branch 'develop'

package.json

@@ -64,9 +64,10 @@
     "flyio": "^0.6.2",
     "jweixin-module": "^1.6.0",
     "less-loader": "5.0.0",
+    "node-sass": "^4.14.1",
+    "pdfh5": "^1.4.2",
     "regenerator-runtime": "^0.12.1",
     "sass-loader": "8.0.2",
-    "node-sass": "^4.14.1",
     "vant": "^2.12.30",
     "vconsole": "^3.7.0",
     "vue": "^2.6.11",

src/pages.json

@@ -293,7 +293,37 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/pdfPreview/pdfPreview",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "custom",
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/OpenAccountAgreementBOC/OpenAccountAgreementBOC",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "custom",
+                "navigationBarTitleText": "渤海银行线上个人银行Ⅱ、Ⅲ类账户服务协议",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/UserAgreement/UserAgreement",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "navigationBarTitleText": "消费用户协议",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "校智付",

src/pages/ConsumptionReport/ConsumptionReport.vue

@@ -141,7 +141,7 @@
 					</view>
 					<view class="average-daily-consumption-chart">
 						<view class="average-daily-consumption-chart-item-box">
-							<view v-for="(item,index) in dailyConsumptionData"
+							<view v-for="(item,index) in dailyConsumptionData" :key="index"
 								class="average-daily-consumption-chart-item">
 								<view class="average-daily-consumption-chart-item-data" @click="click">
 									{{item.value}}

src/pages/UserAgreement/UserAgreement.vue

+<template>
+	<view class="UserAgreement">
+		<view class="AgreementIcon">
+			<image :src="ImgUrl+'xzf/AgreementIcon.png'" mode="aspectFit"></image>
+		</view>
+		<view class="AgreementList">
+			<view class="AgreementItem" @click="ToAgreement(1)" style="border-bottom: none;">
+				<view class="left">
+					<image :src="ImgUrl+'xzf/AgreementIcon1.png'" mode="aspectFit"></image>
+					<view class="">《服务协议》</view>
+				</view>
+				<view class="right">
+					>
+				</view>
+			</view>
+			<view class="AgreementItem" @click="ToAgreement(2)" style="border-bottom: none;">
+				<view class="left">
+					<image :src="ImgUrl+'xzf/AgreementIcon2.png'" mode="aspectFit"></image>
+					<view class="">《隐私权政策》</view>
+				</view>
+				<view class="right">
+					>
+				</view>
+			</view>
+			<view class="AgreementItem" @click="ToAgreement(3)">
+				<view class="left">
+					<image :src="ImgUrl+'xzf/AgreementIcon3.png'" mode="aspectFit"></image>
+					<view class="">《未成年人个人信息保护规则》</view>
+				</view>
+				<view class="right">
+					>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "UserAgreement",
+		data() {
+			return {
+				externalInfo: {
+					seesionID: '',
+					userID: '',
+					AppID: ''
+				},
+				ImgUrl: this.$ImgUrl
+			}
+		},
+		onLoad: function(options) {
+			console.warn(options);
+			this.externalInfo = options
+		},
+		methods: {
+			// 跳转协议
+			async ToAgreement(type) {
+				try {
+					uni.navigateTo({
+						url: "../pdfPreview/pdfPreview?pdfName=" + this.externalInfo.AppID + '_' + type
+					})
+				} catch (e) {
+					//TODO handle the exception
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.AgreementIcon {
+		text-align: center;
+
+		image {
+			width: 265rpx;
+			height: 147rpx;
+			position: relative;
+		}
+	}
+
+
+	.UserAgreement {
+		padding-top: 111rpx;
+		// margin-left: 150rpx;
+
+
+		.AgreementList {
+			width: 638rpx;
+			height: 144rpx;
+			margin: 0 auto;
+
+			margin-top: 88rpx;
+		}
+
+		.AgreementItem {
+			height: 144rpx;
+			width: 100%;
+			border-top: 1rpx solid #DDDDDD;
+			border-bottom: 1rpx solid #DDDDDD;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+
+
+			image {
+				width: 70rpx;
+				height: 70rpx;
+				position: relative;
+			}
+
+			.left {
+				display: flex;
+				align-items: center;
+			}
+
+			.right {
+				padding-right: 24rpx;
+			}
+			
+			
+			font-size: 28rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 800;
+			color: rgba(0, 0, 0, 0.85);
+			line-height: 40rpx;
+
+			// font-family: PingFang SC;
+			// font-size: 35rpx;
+			letter-spacing: 1rpx;
+			// font-weight: 600;
+			// color: #34C98E;
+			// line-height: 100rpx;
+		}
+	}
+</style>

src/pages/pdfPreview/pdfPreview.vue

+<template>
+	<div id="app">
+		<div id="pdfh5"></div>
+	</div>
+</template>
+<script>
+	import Pdfh5 from "pdfh5";
+	export default {
+		name: 'App',
+		data() {
+			return {
+				pdfh5: null,
+				pdfName: "",
+				ImgUrl: this.$ImgUrl
+			};
+		},
+		onLoad: function(options) {
+			console.warn(options);
+			let type = options.pdfName.split("_")[1] * 1
+			switch (type) {
+				case 1:
+					uni.setNavigationBarTitle({
+						title: "服务协议"
+					})
+					break;
+				case 2:
+					uni.setNavigationBarTitle({
+						title: "隐私权政策"
+					})
+					break;
+				case 3:
+					uni.setNavigationBarTitle({
+						title: "未成年人个人信息保护规则"
+					})
+					break;
+				default:
+					break;
+			}
+			this.pdfName = options.pdfName
+			this.Init(this.ImgUrl + 'AgreementPdf/' + this.pdfName)
+		},
+		mounted() {},
+		methods: {
+			// 跳转协议
+			async Init(pdfName) {
+				let this_ = this
+				try {
+					this.$nextTick(function() {
+						//实例化
+						this_.pdfh5 = new Pdfh5("#pdfh5", {
+							pdfurl: pdfName + '.pdf',
+							scale: 2,
+							zoomEnable: true,
+							renderType: 'svg'
+
+						});
+						//监听完成事件
+						this_.pdfh5.on("complete", function(status, msg, time) {
+							console.log("状态：" + status + "，信息：" + msg + "，耗时：" + time + "毫秒，总页数：" +
+								this.totalNum)
+						})
+					})
+				} catch (e) {
+					//TODO handle the exception
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	@import "pdfh5/css/pdfh5.css";
+
+	* {
+		padding: 0;
+		margin: 0;
+	}
+
+	html,
+	body,
+	#app {
+		width: 100%;
+		height: 100%;
+	}
+</style>

yarn.lock

@@ -8405,6 +8405,11 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+pdfh5@^1.4.2:
+  version "1.4.2"
+  resolved "https://repo.huaweicloud.com/repository/npm/pdfh5/-/pdfh5-1.4.2.tgz#4dc501b0312bb912f68c1610228a2ed6feab2a0a"
+  integrity sha512-1BL8HIx/EEZowRPBgas7/WokbGEv1gxKNRmmHSimG113178mKxIBH4pxWBc0tj6d25Sy+EwnlQwv9cUUmQa42w==
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://repo.huaweicloud.com/repository/npm/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"