From 029ae941399e5df0d7979ea510a353045e82e10d Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Mon, 15 Dec 2025 18:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bundle/wallet/bill.vue   | 34 +++++++++++++++++++--------
 src/bundle/wallet/wallet.vue | 45 +++++++++++++++++++++++++++---------
 src/pages/my/my.vue          | 14 ++++++++---
 3 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/bundle/wallet/bill.vue b/src/bundle/wallet/bill.vue
index da385fb..6c6a2e4 100644
--- a/src/bundle/wallet/bill.vue
+++ b/src/bundle/wallet/bill.vue
@@ -13,18 +13,34 @@
         </view>
 
         <!-- 订单详情 -->
-        <view class="mt-28rpx mx-32rpx bg-white rounded-16rpx py-30rpx">
+        <view class="mt-28rpx mx-32rpx bg-white rounded-16rpx py-30rpx relative">
+            <view class="absolute top-0 right-38rpx">
+                <!-- TODO 预定或续订图标或团购核销 -->
+                <wd-img width="112rpx" height="112rpx" :src="`${OSS}images/store/bill/image1.png`"
+                    mode="aspectFill" />      
+                <!-- <wd-img width="112rpx" height="112rpx" :src="`${OSS}images/store/bill/image2.png`"
+                    mode="aspectFill" />   
+                <wd-img width="112rpx" height="112rpx" :src="`${OSS}images/store/bill/image3.png`"
+                    mode="aspectFill" />    -->
+            </view>
             <view class="flex items-center">
                 <view class="w-8rpx h-32rpx bg-[#4C9F44] mr-22rpx"></view>
                 <view class="font-bold text-28rpx leading-40rpx text-[#303133]">订单号：1744601722882174</view>
             </view>
 
+            <view class="mt-38rpx text-center">
+                <view class="text-28rpx leading-40rpx text-[#606266]">金额</view>
+                <view class="mt-20rpx">
+                   + <price-format color="#000" :first-size="36" :second-size="36" :showSubscript="false"></price-format>
+                </view>
+            </view>
+
             <view class="mt-16rpx mb-20rpx border-b-2rpx border-b-solid border-[#E5E5E5] mx-18rpx"></view>
 
             <view class="text-28rpx leading-40rpx text-[#606266] mx-28rpx">
                 <view class="flex justify-between items-center mb-16rpx">
                     <view>消费类型</view>
-                    <view>茶艺师预定</view>
+                    <view>包间预定 || 包间续费 || 团购核销</view>
                 </view>
                 <view class="flex justify-between items-center mb-16rpx">
                     <view>交易方式</view>
@@ -34,24 +50,24 @@
                     <view>消费金额</view>
                     <view>￥158</view>
                 </view>
+                <view class="flex justify-between items-center mb-16rpx">
+                    <view>平台服务费</view>
+                    <view>￥158</view>
+                </view>
             </view>
 
             <view class="mt-26rpx mb-20rpx border-b-2rpx border-b-dashed border-[#E5E5E5] mx-18rpx"></view>
 
             <view class="text-28rpx leading-40rpx text-[#606266] mx-28rpx">
                 <view class="flex justify-between items-center mb-16rpx">
-                    <view>茶艺师</view>
-                    <view>茶艺师的昵称</view>
+                    <view>用户名</view>
+                    <view>用户名</view>
                 </view>
                 <!-- 如果是茶室预定类型则显示消费门店 -->
                 <view class="flex justify-between items-center mb-16rpx">
-                    <view>消费门店</view>
+                    <view>用户手机号</view>
                     <view>茶艺师的昵称</view>
                 </view>
-                <view class="flex justify-between items-center mb-16rpx">
-                    <view>下单时间</view>
-                    <view>2025-04-25  04:43</view>
-                </view>
                 <view class="flex justify-between items-center mb-16rpx">
                     <view>支付时间</view>
                     <view>2025-04-25  04:43</view>
diff --git a/src/bundle/wallet/wallet.vue b/src/bundle/wallet/wallet.vue
index e091493..bda7e6f 100644
--- a/src/bundle/wallet/wallet.vue
+++ b/src/bundle/wallet/wallet.vue
@@ -1,5 +1,4 @@
 <route lang="jsonc" type="page">{
-    "needLogin": true,
     "layout": "default",
     "style": {
 		"navigationStyle": "custom"
@@ -39,7 +38,7 @@
                             <price-format color="#000" :first-size="48" :second-size="48" :subscript-size="28" :price="23.02"></price-format>
                         </view>
                         <view class="w-200rpx h-80rpx bg-[#4C9F44] rounded-8rpx font-bold text-28rpx leading-80rpx text-center text-[#fff]" @click="wallet.handleToRecharge">
-                            充值
+                            提现
                         </view>
                     </view>
                 </view>
@@ -64,14 +63,38 @@
             <view>
                 <!-- 最后一个元素不显示border -->
                 <mescroll-body @init="mescrollInit" @down="downCallback" @up="wallet.upCallback" :up="upOption">
-                    <view class="h-144rpx leading-144rpx mt-18rpx border-b border-b-solid border-b-[#E5E5E5] flex flex-col justify-center" @click="wallet.handleToBillDetail(item)" v-for="(item, index) in 5" :key="index">
-                        <view class="text-28rpx leading-40rpx text-[#303133] flex justify-between items-center">
-                            <view>茶艺师预定</view>
-                            <view>-402.33</view>
+                    <!-- TODO  这里除了提现其余的要跳转到账单明细（/bundle/wallet/wallet）提现（/bundle/parten/pages/withdraw/withdraw）-->
+                    <view class="h-144rpx leading-144rpx mt-18rpx border-b border-b-solid border-b-[#E5E5E5] flex items-center justify-between pb-14rpx" @click="wallet.handleToBillDetail(item)" v-for="(item, index) in 5" :key="index">
+                        <view>
+                            <view class="font-bold text-30rpx leading-42rpx text-[#303133]">
+                                <view>包间预定</view>
+                                <!-- <view>包间续费</view>
+                                <view>团购核销</view>
+                                <view class="flex items-center">
+                                    <view>提现</view>
+                                    <view class="w-86rpx h-32rpx leading-32rpx text-center ml-30rpx text-[#40AE36] text-22rpx rounded-4rpx border-2rpx border-solid border-[#40AE36]">申请中</view>
+                                </view> -->
+                            </view>
+                            <view class="text-24rpx text-[#606266] leading-34rpx mt-16rpx">
+                                <!-- TODO 包间预定 || 包间续费下显示 -->
+                                <text>预定账号：13917942276</text>
+                            </view>
+                            <view class="mt-12rpx text-24rpx text-[#606266] leading-34rpx">
+                                2025-03-02 11:20
+                            </view>
                         </view>
-                        <view class="text-24rpx leading-34rpx text-[#909399] flex justify-between items-center mt-10rpx">
-                            <view>2025-03-18 11:20</view>
-                            <view>余额24.55</view>
+                        <view>
+                            <view class="flex items-center h-50rpx">
+                                <view class="mr-16rpx">
+                                    +<price-format color="#000" :first-size="36" :second-size="36" :showSubscript="false"></price-format>
+                                </view>
+                                <view>
+                                    <wd-icon name="arrow-right" size="32rpx" color="#9496A5"></wd-icon>
+                                </view>
+                            </view>
+                            <view class="text-24rpx text-[#909399] leading-34rpx">
+                                余额5,224.55
+                            </view>
                         </view>
                     </view>
                 </mescroll-body>
@@ -152,10 +175,10 @@
             console.log(`${year}年${month}月`);
         },
 
-        // 去充值
+        // 去提现
         handleToRecharge: () => {
             uni.navigateTo({
-                url: '/bundle/wallet/recharge'
+                url: '/bundle/parten/pages/withdraw/withdraw'
             })
         },
 
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 3492168..e2abba0 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -159,6 +159,14 @@ const My = {
 			})
 		}
 	},
+
+	handleToWallet: () => {
+		// if (!isLogin.value) {
+		// 	router.navigateTo('/bundle/wallet/wallet')
+		// } else {
+			router.navigateTo('/pages/login/login')
+		// }
+	},
 }
 </script>
 
@@ -171,8 +179,8 @@ const My = {
 					<view class="ml-16rpx flex items-center" @click="My.handleToSettings" />
 				</template>
 				<template #right>
-					<view class="right-slot mr-16rpx flex">
-						<view class="mr-16rpx flex flex-col" @click="My.handleShowService">
+					<view class="right-slot mr-16rpx">
+						<view class="mr-16rpx" @click="My.handleShowService">
 							<wd-icon name="setting" color="#fff" size="16px" />
 						</view>
 					</view>
@@ -209,7 +217,7 @@ const My = {
 									￥{{ isLogin ? user.user_money : '0.00' }}
 								</view>
 							</view>
-							<view class="ml-0rpx mt-4rpx text-20rpx text-[#909399] leading-28rpx">
+							<view class="ml-0rpx mt-4rpx text-20rpx text-[#909399] leading-28rpx" @click="My.handleToWallet">
 								钱包余额
 							</view>
 						</view>