From c5d30767bd9313ddeb4d98b85b52ae7e4c037306 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 14 Nov 2022 12:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/fee/feeApi.js                     |  3 ++-
 pages/oweFee/oweFee.vue               |  7 ++++---
 pages/payParkingFee/payParkingFee.vue | 19 ++++++++++++++++++-
 pages/roomFee/roomFee.vue             | 18 +++++++++++++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/api/fee/feeApi.js b/api/fee/feeApi.js
index f0f53a6..65ae8d9 100755
--- a/api/fee/feeApi.js
+++ b/api/fee/feeApi.js
@@ -77,7 +77,8 @@ export function getRoomFees(_objData, _tmpRoom) {
 						_tmpRoom.feeState = _roomFee.state;
 						_tmpRoom.deadlineTime = _roomFee.deadlineTime;
 						_tmpRoom.amountOwed = _roomFee.amountOwed;
-						_tmpRoom.startTime = _roomFee.startTime;
+						_tmpRoom.startTime = _roomFee.startTime;
+						_tmpRoom.payOnline = _roomFee.payOnline;
 						moreRooms.push(_tmpRoom);
 					});
 					resolve(moreRooms);
diff --git a/pages/oweFee/oweFee.vue b/pages/oweFee/oweFee.vue
index 69aa9f3..aad9c8b 100644
--- a/pages/oweFee/oweFee.vue
+++ b/pages/oweFee/oweFee.vue
@@ -2,7 +2,7 @@
 	<view>
 		<scroll-view scroll-y style="padding-bottom: 200rpx;">
 			<view class="block__title" v-if="fees.length > 0">应缴费用</view>
-			<view class="cu-list menu"  v-for="(item,index) in fees" :key="index" :data-item="item">
+			<view class="cu-list menu"  v-for="(item,index) in fees" :key="index" :data-item="item" v-if="item.payOnline == 'Y'">
 				<view class="cu-item " >
 					<view class="content padding-tb-sm">
 						<view>
@@ -120,8 +120,9 @@
 					})
 					.then(function(_fees){
 						_fees.forEach(function(_item){
-							_that.receivableAmount += _item.feePrice;
-							
+							if(_item.payOnline == 'Y'){
+								_that.receivableAmount += _item.feePrice;
+							}
 						})
 						_that.receivableAmount = _that.receivableAmount.toFixed(2);
 					})
diff --git a/pages/payParkingFee/payParkingFee.vue b/pages/payParkingFee/payParkingFee.vue
index 339c298..6d0bdc1 100755
--- a/pages/payParkingFee/payParkingFee.vue
+++ b/pages/payParkingFee/payParkingFee.vue
@@ -163,6 +163,7 @@
 				payerObjId: '',
 				payerObjType: '',
 				userId: '',
+				payOnline:'Y'
 			};
 		},
 
@@ -220,7 +221,8 @@
 			this.$nextTick(() => {
 				this.$refs.vcDiscountRef._loadFeeDiscount(this.feeId, this.communityId, this.feeMonth);
 				this.$refs.vcUserAccountRef._listOwnerAccount(this.feeId, this.communityId);
-			})
+			});
+			this.payOnline = _fee.payOnline;
 		},
 
 		/**
@@ -273,7 +275,15 @@
 			},
 			_payWxApp: function(_data) {
 				let _receivedAmount = this.receivableAmount;
+				if(this.payOnline == 'N'){
+					uni.showToast({
+						icon:'none',
+						title:'暂不支持线上缴费，请到前台缴费'
+					})
+					return;
+				}
 				let _tradeType = 'APP';
+				
 				payFeeApp(this,{
 					cycles: this.feeMonth,
 					communityId: this.communityId,
@@ -290,6 +300,13 @@
 			},
 			onPayFee: function() {
 				let _receivedAmount = this.receivableAmount;
+				if(this.payOnline == 'N'){
+					uni.showToast({
+						icon:'none',
+						title:'暂不支持线上缴费，请到前台缴费'
+					})
+					return;
+				}
 				let _tradeType = 'JSAPI';
 		
 				payFeeWechat(this,{
diff --git a/pages/roomFee/roomFee.vue b/pages/roomFee/roomFee.vue
index 52a3299..d760210 100755
--- a/pages/roomFee/roomFee.vue
+++ b/pages/roomFee/roomFee.vue
@@ -218,7 +218,8 @@
 				deductionAmount: 0.0, // 抵扣金额
 				couponAmount: 0.0,
 				amountCount: 0.0,
-				couponList: []
+				couponList: [],
+				payOnline:'Y'
 			};
 		},
 
@@ -272,6 +273,7 @@
 			this.deadlineTime = _fee.deadlineTime;
 			this.amountOwed = _fee.amountOwed;
 			this.amountCount = this.receivableAmount;
+			this.payOnline = _fee.payOnline;
 
 			if (this.feeFlag != '2006012') {
 				this.paymentCycle = _fee.paymentCycle;
@@ -391,6 +393,13 @@
 			_payWxApp: function(_data) {
 				let _receivedAmount = this.receivableAmount;
 				let _tradeType = 'APP';
+				if(this.payOnline == 'N'){
+					uni.showToast({
+						icon:'none',
+						title:'暂不支持线上缴费，请到前台缴费'
+					})
+					return;
+				}
 				payFeeApp(this,{
 					cycles: this.feeMonth,
 					communityId: this.communityId,
@@ -407,6 +416,13 @@
 			onPayFee: function() {
 				let _receivedAmount = this.receivableAmount;
 				let _tradeType = 'JSAPI';
+				if(this.payOnline == 'N'){
+					uni.showToast({
+						icon:'none',
+						title:'暂不支持线上缴费，请到前台缴费'
+					})
+					return;
+				}
 				payFeeWechat(this,{
 					business: "payFee",
 					cycles: this.feeMonth,