From 70640e6432ca573a8bc3b7adceab6c1466902f77 Mon Sep 17 00:00:00 2001
From: yindongqi <yin_dongqi@163.com>
Date: Wed, 23 Apr 2025 16:47:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=94=AF=E4=BB=98=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除订单页面冗余的 `onShow` 逻辑，避免重复刷新订单数据
- 调整账单组件中加载状态和类型映射逻辑，简化代码结构
- 修改支付组件备注框高度和 z-index 值，提升用户体验
---
 pages/components/pages/balance/bill.vue | 17 ++++++++++-------
 pages/components/pages/pay/pay.vue      | 19 ++++++++++---------
 pages/order/order.vue                   | 10 +++++-----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/pages/components/pages/balance/bill.vue b/pages/components/pages/balance/bill.vue
index 181291c..9f1ce8f 100644
--- a/pages/components/pages/balance/bill.vue
+++ b/pages/components/pages/balance/bill.vue
@@ -78,9 +78,6 @@ const list = ref([
 	{
 		name: '消费'
 	},
-	// {
-	// 	name: '充值'
-	// },
 	{
 		name: '退款'
 	}
@@ -99,7 +96,7 @@ const current = ref(0)
 const swiperCurrent = ref(0)
 const tabsHeight = ref(0)
 const dx = ref(0)
-const loadStatus = ref(['loadmore', 'loadmore', 'loadmore', 'loadmore'])
+const loadStatus = ref(['loadmore', 'loadmore', 'loadmore'])
 const page = ref(1)
 const pageSize = ref(20)
 const tabs = ref()
@@ -116,7 +113,13 @@ const getBill = async () => {
 		return;
 	}
 	loadStatus.value.splice(swiperCurrent.value, 1, "loading")
-	let data = await balanceGetBillList({ cate: cate.value, type: swiperCurrent.value, page: page.value, pagesize: pageSize.value });
+		let data;
+	if(swiperCurrent.value === 2) {
+		data = await balanceGetBillList({ cate: cate.value, type: 3, page: page.value, pagesize: pageSize.value });
+	}else {
+		data = await balanceGetBillList({ cate: cate.value, type: swiperCurrent.value, page: page.value, pagesize: pageSize.value });
+	}
+	
 	if (page.value == 1) {
 		orderList.value[swiperCurrent.value] = [];
 	}
@@ -137,8 +140,8 @@ const reachBottom = () => {
 }
 // tab栏切换
 const change = (e) => {
-	if (e.name == '退款') {
-		swiperCurrent.value = 3;
+	if (e.index === 2) {
+		swiperCurrent.value = 2;
 		page.value = 1;
 
 	} else {
diff --git a/pages/components/pages/pay/pay.vue b/pages/components/pages/pay/pay.vue
index 17b4eaf..dbd7c15 100644
--- a/pages/components/pages/pay/pay.vue
+++ b/pages/components/pages/pay/pay.vue
@@ -215,20 +215,21 @@
           
         </view> -->
         <view class="flex-fill">
-            <textarea placeholder-class="text-color-assist font-size-base" v-model="form.remark"
-              class="bg-white w-100 border-box font-size-base"
-              :class="{ 'text-color-danger': remarkLength > 50, 'text-color-assist': remarkLength <= 50 }"
-              placeholder="请填写备注信息" />
-            <view class="tips"
-              :class="{ 'text-color-danger': remarkLength > 50, 'text-color-assist': remarkLength <= 50 }">
-              {{ remarkLength }}/50
-            </view>
+          <textarea placeholder-class="text-color-assist font-size-base" v-model="form.remark"
+            class="bg-white w-100 border-box font-size-base"
+            :class="{ 'text-color-danger': remarkLength > 50, 'text-color-assist': remarkLength <= 50 }"
+            placeholder="请填写备注信息"
+            style="height: 100rpx;" />
+          <view class="tips"
+            :class="{ 'text-color-danger': remarkLength > 50, 'text-color-assist': remarkLength <= 50 }">
+            {{ remarkLength }}/50
           </view>
+        </view>
       </list-cell>
       <!-- 备注 end -->
     </view>
     <!-- 付款栏 begin -->
-    <view style="z-index: 1"
+    <view style="z-index: 9999"
       class="w-100 pay-box position-fixed fixed-bottom d-flex align-items-center justify-content-between bg-white">
       <view class="font-size-sm" style="margin-left: 20rpx">合计：</view>
       <view class="font-size-lg flex-fill">￥{{ amount }}</view>
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 5d89cb6..b372993 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -162,11 +162,11 @@ onLoad(() => {
     getOrders(true); // 每次显示页面时刷新订单数据
   }
 });
-onShow(() => {
-  if (isLogin.value) {
-    getOrders(true); // 每次显示页面时刷新订单数据
-  }
-});
+// onShow(() => {
+//   if (isLogin.value) {
+//     getOrders(true); // 每次显示页面时刷新订单数据
+//   }
+// });
 onPullDownRefresh(() => {
   getOrders(true);
 });