From f2b2eba05b3283fd8e08abb08deeb4e75e8cefe8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 6 Apr 2023 14:02:54 +0800
Subject: [PATCH] optimzie owe

---
 components/service/service-property.vue |  3 ++-
 pages/fee/oweFee.vue                    |  4 ++--
 pages/machine/machineToCharge.vue       | 15 +++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/components/service/service-property.vue b/components/service/service-property.vue
index 59255d4..fb8e793 100644
--- a/components/service/service-property.vue
+++ b/components/service/service-property.vue
@@ -158,7 +158,8 @@
 					{
 						name: '智能充电',
 						src: this.imgUrl + '/h5/images/serve/my3.png',
-						href: '/pages/machine/chargeMachines'
+						href: '/pages/machine/chargeMachines',
+						needLogin: 'N'
 					},
 					{
 						name: '物业打分',
diff --git a/pages/fee/oweFee.vue b/pages/fee/oweFee.vue
index 287f6d2..6afd0c6 100644
--- a/pages/fee/oweFee.vue
+++ b/pages/fee/oweFee.vue
@@ -12,7 +12,7 @@
 							<text class="margin-right-xs">{{item.endTime}}至{{item.deadlineTime}}</text></view>
 					</view>
 					<view class="action">
-						<text class="text-grey text-sm">应缴:￥{{item.feePrice}}</text>
+						<text class="text-grey text-sm">应缴:￥{{item.feeTotalPrice}}</text>
 					</view>
 				</view>
 			</view>
@@ -121,7 +121,7 @@
 					.then(function(_fees){
 						_fees.forEach(function(_item){
 							if(_item.payOnline == 'Y'){
-								_that.receivableAmount += _item.feePrice;
+								_that.receivableAmount += _item.feeTotalPrice;
 							}
 						})
 						_that.receivableAmount = _that.receivableAmount.toFixed(2);
diff --git a/pages/machine/machineToCharge.vue b/pages/machine/machineToCharge.vue
index 3b7d368..84bfb69 100644
--- a/pages/machine/machineToCharge.vue
+++ b/pages/machine/machineToCharge.vue
@@ -39,15 +39,19 @@
 				<view v-else>{{couponCount+ '张' }}</view>
 			</view>
 		</view>
-		<view class="margin-sm">
+		<view class="margin-sm" v-if="login">
 			<account ref="accRef"></account>
 		</view>
 		
 		<view class="plat-btn-black"></view>
-		<view class="cu-bar btn-group" style="margin-top: 30px;">
+		<view class="cu-bar btn-group" style="margin-top: 30px;" v-if="login">
 			<button @click="_toCharge" :disabled="!curHours.duration || !curPort.portId"
 				class="cu-btn bg-green shadow-blur round lg">去充电</button>
 		</view>
+		<view class="cu-bar btn-group" style="margin-top: 30px;" v-else>
+			<button @click="_toLogin" 
+				class="cu-btn bg-green shadow-blur round lg">请先登录</button>
+		</view>
 
 	</view>
 </template>
@@ -73,6 +77,7 @@
 				curHours:{},
 				couponList:[],
 				couponCount:0,
+				login:false,
 				hours:[{
 					name:'充满自停',
 					duration:999,
@@ -101,6 +106,7 @@
 			context.onLoad(options);
 			this.machineId = options.machineId;
 			this.communityId = options.communityId;
+			this.login= context.checkLoginStatus();
 			this._loadChargeMachines();
 			this._loadChargeMachinePorts();
 			let _that = this;
@@ -180,6 +186,11 @@
 				this.couponList = chargeCoupons;
 				this.couponCount = chargeCoupons.length;	
 			},
+			_toLogin:function(){
+				uni.navigateTo({
+					url: '/pages/login/login'
+				})
+			}
 		}
 	}
 </script>