From edec5513fc773d91b32da091737652b837d63226 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 27 Dec 2025 22:34:07 +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

---
 src/bundle/order/tea-room/order-detail.vue |  6 +++---
 src/components/order/ComboCard.vue         |  4 ++--
 src/pages/index/index.vue                  | 14 ++++++++++---
 src/pages/login/login.vue                  | 24 +++++++++++-----------
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/bundle/order/tea-room/order-detail.vue b/src/bundle/order/tea-room/order-detail.vue
index 9a069a1..8c81558 100644
--- a/src/bundle/order/tea-room/order-detail.vue
+++ b/src/bundle/order/tea-room/order-detail.vue
@@ -267,19 +267,19 @@
         </view>
 
         <!-- 操作按钮 -->
-        <view class="w-full fixed bottom-0 left-0 right-0 bg-white h-152rpx" v-if="orderStatus !== TeaRoomOrderStatus.Refunded">
+        <view class="w-full fixed bottom-0 left-0 right-0 bg-white h-152rpx" v-if="orderStatus !== TeaRoomOrderStatus.Refunded && orderStatus !== TeaRoomOrderStatus.Pending">
             <!-- 已预约 -->
             <view class="flex items-center justify-center text-32rpx leading-44rpx leading-90rpx text-center !mt-34rpx" v-if="orderStatus == TeaRoomOrderStatus.Pay">
                 <wd-button custom-class="!text-32rpx !w-630rpx !h-90rpx !bg-[#4C9F44] !rounded-8rpx !text-[#fff]" open-type="share">分享房间给朋友</wd-button>
             </view>
 
             <!-- 待付款 -->
-            <view class="flex items-center justify-between mx-58rpx mt-34rpx" v-if="orderStatus == TeaRoomOrderStatus.Pending">
+            <!-- <view class="flex items-center justify-between mx-58rpx mt-34rpx" v-if="orderStatus == TeaRoomOrderStatus.Pending">
                 <view class="flex items-center">
                     <view class="text-28rpx leading-40rpx text-[#606266] mr-16rpx" @click="OrderDetail.handleCancelOrder">取消订单</view>
                 </view>
                 <view class="w-360rpx h-90rpx leading-90rpx text-center bg-[#4C9F44] rounded-8rpx text-[#fff]" @click="OrderDetail.handleToPay">立即支付￥{{ order.order_amount }}</view>
-            </view>
+            </view> -->
 
             <!-- 消费中 -->
             <view class="flex items-center justify-between mx-58rpx mt-34rpx" v-if="orderStatus == TeaRoomOrderStatus.Consumption">
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index ffba470..92fb3c4 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -147,8 +147,8 @@
              
                 <template v-if="order.order_status === TeaRoomOrderStatus.Pending">
                     <view class="text-center flex items-center text-28rpx mt-28rpx justify-end">
-                        <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center"
-                            @click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">取消订单</view>
+                        <!-- <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#9CA3AF] text-[#303133] mr-28rpx flex items-center justify-center"
+                            @click="ComboCard.handleCancelOrder(OrderSource.TeaRoom)">取消订单</view> -->
                         <view class="w-178rpx h-70rpx rounded-8rpx border-[2rpx] border-[#4C9F44] text-[#4C9F44] flex items-center justify-center"
                             @click="ComboCard.handleToPayOrder(OrderSource.TeaRoom)">去支付</view>
                     </view>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index c7c2d41..51d9dcb 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -38,17 +38,25 @@
 				<text class="text-22rpx leading-32rpx text-[#818CA9] ml-36rpx">更多茶艺师点击预约</text>
 			</view>
 
-			<view class="mt-16rpx relative w-690rpx h-180rpx mx-30rpx" @click="router.navigateTo(`/bundle_b/pages/tea-specialist/list`)">
+			<!-- <view class="mt-16rpx relative w-690rpx h-180rpx mx-30rpx" @click="router.navigateTo(`/bundle_b/pages/tea-specialist/list`)">
 				<wd-img width="690rpx" height="180rpx" :src="`${OSS}images/home/home_image7.png`" mode="scaleToFill" />
-			</view>
+			</view> -->
 
-			<view class="relative mt-40rpx h-44rpx mx-30rpx">
+			<!-- <view class="relative mt-40rpx h-44rpx mx-30rpx">
 				<view class="absolute ele-center" >
 					<wd-img width="252.04rpx" height="24.43rpx" :src="`${OSS}images/home/home_image3.png`" mode="aspectFit" />
 				</view>
 				<view class="text-32rpx text[#303133] font-500 absolute top-0 ele-center">预约茶室</view>
+			</view> -->
+			<view class="mt-16rpx relative w-690rpx h-180rpx mx-30rpx">
+				<wd-img width="690rpx" height="180rpx" :src="`${OSS}images/home/home_image2.png`" mode="scaleToFill" />
+				<view class="h-64rpx absolute bottom-0 right-0 bg-[#4C9F44] text-[#fff] flex items-center px-26rpx rounded">
+					<text class="mr-8rpx">一键约</text>
+					<wd-img width="22rpx" height="18.06rpx" :src="`${OSS}icon/icon_arrow_right.png`" mode="aspectFit" />
+				</view>
 			</view>
 
+
 			<view>
 				<mescroll-body @init="mescrollInit"  :down="downOption" @down="downCallback" :up="upOption" @up="Index.upCallback" top="28rpx"
 					:fixed="true">
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 815837b..d681cc2 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -31,7 +31,7 @@
         </view>
         <view class="mt-124rpx mx-60rpx box-border">
             <wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleLogin">立即登录</wd-button>
-            <wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleMobileLogin">测试-账号登录</wd-button> 
+            <!-- <wd-button custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border" @click="Login.handleMobileLogin">测试-账号登录</wd-button>  -->
             <!-- <wd-button open-type="getUserInfo" @getuserinfo="Login.handleWxLogin" custom-class="!bg-[#4C9F44] !rounded-8rpx !text-[#fff] !text-30rpx !leading-42rpx !h-90rpx !w-[100%] box-border">立即登录</wd-button> -->
             <!-- <view class="text-30rpx font-400 text-[#303133] leading-42rpx text-center mt-32rpx">其它手机号登录</view> -->
         </view>
@@ -134,17 +134,17 @@
         /**
          * 测试-账号登录
          */
-        handleMobileLogin: async () => {
-            const userStore = useUserStore()
-            console.log("🚀 ~ userStore:", userStore)
-            const res = await userStore.mobileLogin('15024322520', 1, 2)
-            if (res) {
-                uni.setStorageSync('latitude', '30.74744')
-                uni.setStorageSync('longitude', '120.78483')
-                toast.info('登录成功')
-                router.navigateBack(1, 500)
-            }
-        },
+        // handleMobileLogin: async () => {
+        //     const userStore = useUserStore()
+        //     console.log("🚀 ~ userStore:", userStore)
+        //     const res = await userStore.mobileLogin('15024322520', 1, 2)
+        //     if (res) {
+        //         uni.setStorageSync('latitude', '30.74744')
+        //         uni.setStorageSync('longitude', '120.78483')
+        //         toast.info('登录成功')
+        //         router.navigateBack(1, 500)
+        //     }
+        // },
 
         /**
          * 登录成功跳转页面