From 7aa0df1f4ec9e617cd368a5e4fcb4a6b9904bd7a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Tue, 30 Mar 2021 15:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=20=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B8=8D=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  9 +++++
 pages/payFeeByQrCode/payFeeByQrCode.vue | 41 +++++++++++++++++++++
 pages/roomPayFee/roomPayFee.vue         | 49 ++++++++++---------------
 3 files changed, 70 insertions(+), 29 deletions(-)
 create mode 100644 pages/payFeeByQrCode/payFeeByQrCode.vue

diff --git a/pages.json b/pages.json
index f930b21..eadf192 100644
--- a/pages.json
+++ b/pages.json
@@ -281,6 +281,15 @@
 				"navigationBarTitleText": "空置房详情"
 			}
 		}
+        ,{
+            "path" : "pages/payFeeByQrCode/payFeeByQrCode",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "请扫二维码支付",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/pages/payFeeByQrCode/payFeeByQrCode.vue b/pages/payFeeByQrCode/payFeeByQrCode.vue
new file mode 100644
index 0000000..fa16b36
--- /dev/null
+++ b/pages/payFeeByQrCode/payFeeByQrCode.vue
@@ -0,0 +1,41 @@
+<template>
+	<view>
+		<view class="padding-xl margin-top">
+			<canvas style="width: 300upx;height: 300upx;  margin: 0 auto;" canvas-id="oweFeeQrcode"></canvas>
+		</view>
+	
+		<view class="padding flex flex-direction margin-top">
+			<button class="cu-btn bg-green margin-tb-sm lg" @tap="_closePayModal()">已支付</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	const qrCode = require('@/lib/weapp-qrcode.js')
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(options) {
+			new qrCode('oweFeeQrcode', {
+				text: options.url,
+				width: 150,
+				height: 150,
+				colorDark: "#333333",
+				colorLight: "#FFFFFF",
+				correctLevel: qrCode.CorrectLevel.H
+			})
+		},
+		methods: {
+			_closePayModal: function() {
+				this.context.navigateBack();
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/roomPayFee/roomPayFee.vue b/pages/roomPayFee/roomPayFee.vue
index 91a3a10..9e7d563 100644
--- a/pages/roomPayFee/roomPayFee.vue
+++ b/pages/roomPayFee/roomPayFee.vue
@@ -55,17 +55,6 @@
 			</view>
 		</view>
 
-		<view class="cu-modal" :class="payModal==true?'show':''">
-			<view class="cu-dialog">
-				<view class="padding-xl">
-					<canvas style="width: 300upx;height: 300upx;    margin: 0 auto;" canvas-id="oweFeeQrcode"></canvas>
-				</view>
-				<view class="cu-bar bg-white justify-end">
-					<view class="action margin-0 flex-sub  solid-left" @tap="_closePayModal()">关闭</view>
-				</view>
-			</view>
-		</view>
-
 	</view>
 </template>
 
@@ -79,7 +68,6 @@
 		toPayOweFee
 	} from '../../api/fee/fee.js';
 	
-	const qrCode = require('@/lib/weapp-qrcode.js')
 	export default {
 		data() {
 			return {
@@ -94,7 +82,22 @@
 				fees: [],
 				receivableAmount: 0.0,
 				payModal: false,
-				payQrImg: ''
+				payQrImg: '',
+				roomInfo:{
+					ownerName:'',
+					link:""
+				}
+			}
+		},
+		onShow() {
+			if(this.context.isPageBack()){
+				this.roomInfo = {
+					ownerName:'',
+					link:""
+				};
+				this.fees = [];
+				this.roomInfo.roomId = '';
+				this.roomNum = '';
 			}
 		},
 		methods: {
@@ -191,14 +194,7 @@
 				this.roomNum = _allNum[2];
 				this._loadRoomInfo();
 			},
-			_closePayModal: function() {
-				this.payModal = false;
-				this.roomInfo = {};
-				this.fees = [];
-				this.roomInfo.roomId = '';
-				this.roomNum = '';
-				
-			},
+			
 			_payOweFee: function() {
 				let _that = this;
 				let _data = {
@@ -219,15 +215,10 @@
 							});
 							return;
 						}
-						_that.payModal = true;
-						new qrCode('oweFeeQrcode', {
-							text: _data.codeUrl,
-							width: 150,
-							height: 150,
-							colorDark: "#333333",
-							colorLight: "#FFFFFF",
-							correctLevel: qrCode.CorrectLevel.H
+						this.context.navigateTo({
+							url:"/pages/payFeeByQrCode/payFeeByQrCode?url="+_data.codeUrl
 						})
+						
 					})
 
 			}