From b58262ac0bcb96b9d2317f4ef8fa33ec4e59efe0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 13 Sep 2023 15:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8C=89=E6=88=BF=E5=B1=8B?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/fee/qrcode-owe-fee.vue | 18 ++++++++++++++++--
 pages/fee/payQrCode.vue           |  3 ++-
 pages/fee/payQrCodeFee.vue        |  6 +++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/components/fee/qrcode-owe-fee.vue b/components/fee/qrcode-owe-fee.vue
index c1605cd..0edac32 100644
--- a/components/fee/qrcode-owe-fee.vue
+++ b/components/fee/qrcode-owe-fee.vue
@@ -80,11 +80,13 @@
 			return {
 				fees: [],
 				ownerId: '',
+				roomId:'',
 				communityId: '',
 				storeId: '',
 				receivableAmount: 0,
 				customFee: 'OFF',
 				createStaffId:'',
+				feeType:'OWNER',
 				feeIds: []
 			};
 		},
@@ -94,13 +96,25 @@
 				this.communityId = _param.communityId;
 				this.customFee = _param.customFee;
 				this.createStaffId = _param.createStaffId;
-				let _that = this;
+				this.roomId = _param.roomId;
+				this.feeType = _param.feeType;
 				_that.feeIds = [];
 				getQrcodeOweFees(this, {
 					ownerId: this.ownerId,
 					communityId: this.communityId
 				}).then(_data => {
-					_that.fees = _data.data;
+					
+					let _fees = [];
+					if(_that.feeType == 'ROOM' && _that.roomId){
+						_data.data.forEach(item=>{
+							if(item.payerObjId == _that.roomId){
+								_fees.push(item);
+							}
+						})
+					}else{
+						_fees = _data.data;
+					}
+					_that.fees = _fees;
 					if (_data.data && _data.data.length > 0) {
 						_that.storeId = _data.data[0].incomeObjId;
 					}
diff --git a/pages/fee/payQrCode.vue b/pages/fee/payQrCode.vue
index b03bfe1..be3be20 100644
--- a/pages/fee/payQrCode.vue
+++ b/pages/fee/payQrCode.vue
@@ -119,8 +119,9 @@
 						});
 						return;
 					}
+					
 					uni.navigateTo({
-						url:'/pages/fee/payQrCodeFee?communityId='+_that.communityId+"&ownerId="+_data.data+"&pfqId="+_that.pfqId
+						url:'/pages/fee/payQrCodeFee?communityId='+_that.communityId+"&ownerId="+_data.data.ownerId+"&roomId="+_data.data.roomId+"&pfqId="+_that.pfqId
 					})
 				})
 			},
diff --git a/pages/fee/payQrCodeFee.vue b/pages/fee/payQrCodeFee.vue
index 1682c6c..fbcae18 100644
--- a/pages/fee/payQrCodeFee.vue
+++ b/pages/fee/payQrCodeFee.vue
@@ -27,6 +27,7 @@
 		data() {
 			return {
 				ownerId:'',
+				roomId:'',
 				communityId:'',
 				pfqId:'',
 				active:0,
@@ -48,6 +49,7 @@
 		},
 		onLoad(options) {
 			this.ownerId = options.ownerId;
+			this.roomId = options.roomId;
 			this.pfqId = options.pfqId;
 			this.communityId = options.communityId;
 			this._loadConfig();
@@ -68,9 +70,11 @@
 				if(this.active == 0){
 					this.$refs.qrCodeOweFeeRef._loadFees({
 						ownerId:this.ownerId,
+						roomId:this.roomId,
 						communityId:this.communityId,
 						customFee:this.config.customFee,
-						createStaffId:this.config.createStaffId
+						createStaffId:this.config.createStaffId,
+						feeType:this.config.feeType
 					});
 					return;
 				}