From 9ea24a8694b0ceac43f0ece8161083dec8a3c64e Mon Sep 17 00:00:00 2001
From: 905166056 <905166056@qq.com>
Date: Fri, 5 Nov 2021 15:48:44 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3b?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/payFeeByQrCode/payFeeByQrCode.vue |  5 ++++-
 pages/roomPayFee/roomPayFee.vue         | 22 +++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pages/payFeeByQrCode/payFeeByQrCode.vue b/pages/payFeeByQrCode/payFeeByQrCode.vue
index 9e984df..11066c1 100644
--- a/pages/payFeeByQrCode/payFeeByQrCode.vue
+++ b/pages/payFeeByQrCode/payFeeByQrCode.vue
@@ -32,7 +32,10 @@
 		},
 		methods: {
 			_closePayModal: function() {
-				this.context.navigateBack();
+				// this.context.navigateBack();
+				uni.navigateBack({
+					delta:1
+				})
 			},
 			_payOweFee: function() {
 				let _that = this;
diff --git a/pages/roomPayFee/roomPayFee.vue b/pages/roomPayFee/roomPayFee.vue
index d4231e7..498c0e9 100644
--- a/pages/roomPayFee/roomPayFee.vue
+++ b/pages/roomPayFee/roomPayFee.vue
@@ -94,15 +94,16 @@
 			this.java110Context.onLoad();
 		},
 		onShow() {
-			if(this.context.isPageBack()){
-				this.roomInfo = {
-					ownerName:'',
-					link:""
-				};
-				this.fees = [];
-				this.roomInfo.roomId = '';
-				this.roomNum = '';
-			}
+			this._queryRoom();
+			// if(this.context.isPageBack()){
+			// 	this.roomInfo = {
+			// 		ownerName:'',
+			// 		link:""
+			// 	};
+			// 	this.fees = [];
+			// 	this.roomInfo.roomId = '';
+			// 	this.roomNum = '';
+			// }
 		},
 		methods: {
 			/**
@@ -183,6 +184,9 @@
 					})
 			},
 			_queryRoom: function() {
+				if(!this.roomName){
+					return;
+				}
 				let _allNum = this.roomName.split("-");
 
 				if (_allNum.length != 3) {