From d6c5634f69de2d77f08157232739ceb16132ecc7 Mon Sep 17 00:00:00 2001
From: shilei <965026003@qq.com>
Date: Fri, 6 Dec 2024 18:54:49 +0800
Subject: [PATCH] =?UTF-8?q?12.6=20=20=20=E9=80=80=E6=AC=BE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 17 +++++++++-------
 pagesCenter/accountBalance/accountBalance.vue | 20 +++++++++++++++++--
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/App.vue b/App.vue
index 19d3153..434b32d 100644
--- a/App.vue
+++ b/App.vue
@@ -18,14 +18,17 @@
 			// handle_loop()
 		},
 		onShow: function() {
+			// console.log(uni.getStorageSync('token'), 'token')
+			let token = uni.getStorageSync('token')
 			// console.log(globalData.isLogin, 'globalData.isLogin')
-			// if (globalData.isLogin == false) {
-			// 	setTimeout(() => {
-			// 		uni.navigateTo({
-			// 			url: '../../pagesCenter/login/enter'
-			// 		})
-			// 	}, 1000)
-			// }
+			if (token != '' && token != null) {
+				globalData.isLogin = true
+				// setTimeout(() => {
+				// 	uni.navigateTo({
+				// 		url: '../../pagesCenter/login/enter'
+				// 	})
+				// }, 1000)
+			}
 		},
 		onHide: function() {
 			// console.log('App Hide') 
diff --git a/pagesCenter/accountBalance/accountBalance.vue b/pagesCenter/accountBalance/accountBalance.vue
index cd267aa..406b6de 100644
--- a/pagesCenter/accountBalance/accountBalance.vue
+++ b/pagesCenter/accountBalance/accountBalance.vue
@@ -36,9 +36,11 @@
 									付款成功
 								</view>
 								<text class="refund_moneny"
-									v-if="tab_current == 0 && item.refundStatus == null || item.refundStatus == 0"
+									v-if="tab_current == 0 && item.refundStatus == 0 && item.payRefundId == null"
 									@click="handle_refund(item.id)">退款</text>
-								<text v-if="item.refundStatus == 10" class="refund_moneny_10">已退款</text>
+								<text class="refund_moneny_ing" v-if="item.refundStatus == 0 && item.payRefundId != null">退款中</text>
+								<text class="refund_moneny_fail" v-if="item.refundStatus == 20 && item.payRefundId != null">退款失败</text>
+								<text v-if="item.refundStatus == 10 && item.payRefundId != null" class="refund_moneny_10">已退款( {{item.refundTotalPrice / 100}}元 )</text>
 							</view>
 							<view class="margin-top-sm payTime" v-if="tab_current == 0">{{item.payTime}}</view>
 							<view class="margin-top-sm payTime" v-else>{{item.createTime}}</view>
@@ -160,6 +162,7 @@
 				}, 2000)
 				setTimeout(() => {
 					handle_bindType()
+					getPayList(0)
 					uni.hideLoading()
 				}, 4000)
 			} else {
@@ -172,6 +175,7 @@
 				}, 2000)
 				setTimeout(() => {
 					handle_bindType()
+					getPayList(0)
 					uni.hideLoading()
 				}, 4000)
 
@@ -367,6 +371,18 @@
 		margin-left: 10rpx;
 		color: red;
 	}
+	.refund_moneny_ing {
+		font-size: 13px;
+		// text-decoration: underline;
+		margin-left: 10rpx;
+		color: forestgreen;
+	}
+	.refund_moneny_fail {
+		font-size: 13px;
+		// text-decoration: underline;
+		margin-left: 10rpx;
+		color: red;
+	}
 
 	.refund_moneny_10 {
 		color: #ad8787;