From 8522757d3f0d7e38728240513773308435516c71 Mon Sep 17 00:00:00 2001
From: kaeery <3491123437@qq.com>
Date: Wed, 12 Mar 2025 12:06:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=A2=E5=8D=95=E3=80=91=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96#=20=E5=8E=BB=E6=8E=89=E5=AE=9E=E4=BB=98?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=8A=E5=B0=8F=E6=97=B6=E5=90=8E=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=AE=B5=E7=9A=84=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bundle/pages/appoint_time/index.vue       |  4 +--
 .../service_order/components/order-card.vue   |  4 +--
 .../pages/service_order_detail/index.vue      |  8 ++---
 src/pages/category/index.vue                  | 34 +++++++++++-------
 src/pages/order/components/order-card.vue     |  8 ++---
 src/pages/order_buy/index.vue                 | 35 +++++++++++--------
 src/pages/order_detail/index.vue              |  8 ++---
 7 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/src/bundle/pages/appoint_time/index.vue b/src/bundle/pages/appoint_time/index.vue
index eee5033..9f5041e 100644
--- a/src/bundle/pages/appoint_time/index.vue
+++ b/src/bundle/pages/appoint_time/index.vue
@@ -130,8 +130,8 @@ const handleTimeSlot = (timeSlot: TimeSlotObj[]) => {
     const startTime = time.getHours() + '' + (min <= 9 ? '0' + min : min) // 获取时分并组合成标准格式（时分）比如 10：30 --> 1030
     timeSlot.forEach(item => {
         const end = item.endTime.replace(':', '')
-        // 只可预约三个小时后的时间段
-        item.disabled = Number(startTime) + 300 >= Number(end)
+        // 只可预约半小时后的时间段
+        item.disabled = Number(startTime) + 50 >= Number(end)
         // console.log("startTime: " + startTime);
         // console.log("end: " + end);
     })
diff --git a/src/bundle/pages/service_order/components/order-card.vue b/src/bundle/pages/service_order/components/order-card.vue
index 60c9cb6..28efa21 100644
--- a/src/bundle/pages/service_order/components/order-card.vue
+++ b/src/bundle/pages/service_order/components/order-card.vue
@@ -21,12 +21,12 @@
                     {{ orderInfo.appointTimeStart }} - {{ orderInfo.appointTimeEnd }}
                 </view>
                 <view class="appointTitle mt-[16rpx]"></view>
-                <view class="mt-[16rpx]">
+                <!-- <view class="mt-[16rpx]">
                     实付金额:
                     <text class="text-[#f36161] text-base pl-1.5">
                         ¥{{ orderInfo.orderAmount }}
                     </text>
-                </view>
+                </view> -->
             </view>
         </view>
 
diff --git a/src/bundle/pages/service_order_detail/index.vue b/src/bundle/pages/service_order_detail/index.vue
index b20bc10..eafb0de 100644
--- a/src/bundle/pages/service_order_detail/index.vue
+++ b/src/bundle/pages/service_order_detail/index.vue
@@ -84,14 +84,14 @@
                     <view>服务金额</view>
                     <view>¥{{ orderData.orderAmount }}</view>
                 </view>
-                <view class="mt-[30rpx] flex justify-between" v-if="isUseCoupon">
+                <!-- <view class="mt-[30rpx] flex justify-between" v-if="isUseCoupon">
                     <view>抵扣金额</view>
                     <view class="text-primary">¥{{ orderData.deductionMoney }}</view>
                 </view>
                 <view class="mt-[30rpx] flex justify-between">
                     <view>实付金额</view>
                     <view class="text-primary">¥{{ orderData.orderAmount }}</view>
-                </view>
+                </view> -->
             </view>
 
             <!-- 备注 -->
@@ -106,10 +106,10 @@
                     <view>订单编号</view>
                     <view>{{ orderData.sn }}</view>
                 </view>
-                <view class="mt-[30rpx] flex justify-between">
+                <!-- <view class="mt-[30rpx] flex justify-between">
                     <view>支付方式</view>
                     <view>{{ orderData.payWayName }}</view>
-                </view>
+                </view> -->
                 <view class="mt-[30rpx] flex justify-between">
                     <view>下单时间</view>
                     <view>{{ orderData.createTime }}</view>
diff --git a/src/pages/category/index.vue b/src/pages/category/index.vue
index 7dbef69..ddf2d0f 100644
--- a/src/pages/category/index.vue
+++ b/src/pages/category/index.vue
@@ -2,7 +2,17 @@
 
     <view class="container bg-white">
 
-        
+        <u-navbar :is-back="false" title="" class="flex">
+            <!-- #ifdef MP -->
+            <view class="navbar mp_navbar flex ml-[20rpx] pl-[20rpx]" @click="goPage('/bundle/pages/search/index')">
+                <!-- #endif -->
+                <!-- #ifdef H5 -->
+                <view class="navbar h5_navbar flex ml-[20rpx] pl-[20rpx]" @click="goPage('/bundle/pages/search/index')">
+                    <!-- #endif -->
+                    <u-icon name="search" size="34" color="#888888"></u-icon>
+                    <text class="flex items-center ml-[20rpx]">请输入关键词搜索</text>
+                </view>
+        </u-navbar>
 
         <view class="flex main">
             <view class="content">
@@ -17,16 +27,16 @@
                     <z-paging ref="paging" v-model="categoryData" @query="queryList" :fixed="false" height="100%" :loading-more-enabled="false">
                         <!-- Content Start -->
                         <view class="content-box">
-                                <block v-for="(item2, index2) in categoryData" :key="item2.id">
-                                    <template v-if="index2 == current && !item2?.sons?.length">
-                                        <cate-card :param="item2"></cate-card>
-                                    </template>
-                                    <template v-if="index2 == current && item2?.sons?.length">
-                                        <block v-for="(item3, index3) in item2.sons" :key="item3.id">
-                                            <cate-card :param="item3" :pid="item2.id"></cate-card>
-                                        </block>
-                                    </template>
-                                </block>
+                            <block v-for="(item2, index2) in categoryData" :key="item2.id">
+                                <template v-if="index2 == current && !item2?.sons?.length">
+                                    <cate-card :param="item2"></cate-card>
+                                </template>
+                                <template v-if="index2 == current && item2?.sons?.length">
+                                    <block v-for="(item3, index3) in item2.sons" :key="item3.id">
+                                        <cate-card :param="item3" :pid="item2.id"></cate-card>
+                                    </block>
+                                </template>
+                            </block>
                         </view>
                         <!-- Content End -->
                     </z-paging>
@@ -51,7 +61,7 @@ import { onLoad } from "@dcloudio/uni-app"
 const categoryData = ref<Array<any>>([])
 const current = ref<number | null>(0)
 const paging = shallowRef()
-const categoryId=ref('')
+let categoryId=ref('')
 
 const queryList = async (pageNo: number, pageSize: number) => {
     try {
diff --git a/src/pages/order/components/order-card.vue b/src/pages/order/components/order-card.vue
index df82386..c9ad405 100644
--- a/src/pages/order/components/order-card.vue
+++ b/src/pages/order/components/order-card.vue
@@ -19,13 +19,13 @@
                 <view class="mt-[16rpx]">
                     预约时间: {{ orderInfo.appointTime }} {{ orderInfo.weekDay }}
                 </view>
-                <view class="mt-[16rpx]" v-if="orderInfo.orderStatus == 0">
+                <!-- <view class="mt-[16rpx]" v-if="orderInfo.orderStatus == 0">
                     待付金额:
                     <text class="text-[#f36161] text-base pl-1.5">
                         ¥{{ orderInfo.orderAmount }}
                     </text>
-                </view>
-                <view class="mt-[16rpx]" v-if="orderInfo.orderStatus == 1">
+                </view> -->
+                <!-- <view class="mt-[16rpx]" v-if="orderInfo.orderStatus == 1">
                     实付金额:
                     <text class="text-[#f36161] text-base pl-1.5">
                         ¥{{ orderInfo.orderAmount }}
@@ -48,7 +48,7 @@
                     <text class="text-[#f36161] text-base pl-1.5">
                         ¥{{ orderInfo.orderAmount }}
                     </text>
-                </view>
+                </view> -->
             </view>
         </view>
 
diff --git a/src/pages/order_buy/index.vue b/src/pages/order_buy/index.vue
index 31b28ca..31fbbd8 100644
--- a/src/pages/order_buy/index.vue
+++ b/src/pages/order_buy/index.vue
@@ -97,25 +97,31 @@
         </view>
 
         <!-- 服务金额 -->
-        <view class="card flex justify-between normal text-base">
+        <!-- <view class="card flex justify-between normal text-base">
             <view class="font-medium">服务金额</view>
             <view>{{ `¥${orderData.totalPrice}` }}</view>
-        </view>
+        </view> -->
         <!-- Main End -->
 
         <!-- Footer Start -->
-        <view class="footer flex justify-between items-center">
-            <view class="text-primary">
+        <view class="footer flex flex-col gap-[12rpx]">
+            <view class="text-warning flex items-center gap-[8rpx]">
+                <u-icon name="info-circle" size="34" color="#f9ae3d"></u-icon>
+                最终价格需与服务人员当面确认，平台不代收费用
+            </view>
+            <view class="flex justify-between items-center">
+                <!-- <view class="text-primary">
                 <text class="text-base">需支付：¥</text>
                 <text class="font-medium text-4xl">{{ computeOrderTotalPrice }}</text>
-            </view>
-            <view class="btn">
-                <button
-                    class="custom-button-bgColor text-lg text-white leading-[80rpx] h-[80rpx]"
-                    @tap="onSubmitOrder"
-                >
-                    提交订单
-                </button>
+            </view> -->
+                <view class="btn">
+                    <button
+                        class="custom-button-bgColor text-lg text-white leading-[80rpx] h-[80rpx]"
+                        @tap="onSubmitOrder"
+                    >
+                        提交订单
+                    </button>
+                </view>
             </view>
         </view>
 
@@ -376,7 +382,7 @@ onLoad(async (options: any) => {
         payState.showCheck = true
     }
     // 获取是否有优惠
-    getCouponMaxMoney()
+    // getCouponMaxMoney()
     uni.$on('resetAddress', event => {
         console.log(event)
 
@@ -438,7 +444,8 @@ onLoad(async (options: any) => {
         padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
 
         .btn {
-            width: 320rpx;
+            // width: 320rpx;
+            width: 100%;
             height: 100%;
         }
     }
diff --git a/src/pages/order_detail/index.vue b/src/pages/order_detail/index.vue
index 91dc190..9f17c93 100644
--- a/src/pages/order_detail/index.vue
+++ b/src/pages/order_detail/index.vue
@@ -115,7 +115,7 @@
                     <view>服务金额</view>
                     <view>¥{{ orderData.totalAmount }}</view>
                 </view>
-                <view class="mt-[30rpx] flex justify-between" v-if="orderData.orderStatus == 0">
+                <!-- <view class="mt-[30rpx] flex justify-between" v-if="orderData.orderStatus == 0">
                     <view>待付金额</view>
                     <view class="text-primary">¥{{ orderData.orderAmount }}</view>
                 </view>
@@ -138,7 +138,7 @@
                 <view class="mt-[30rpx] flex justify-between" v-if="orderData.orderStatus == 4">
                     <view>应付金额</view>
                     <view class="text-primary">¥{{ orderData.orderAmount }}</view>
-                </view>
+                </view> -->
             </view>
 
             <!-- 备注 -->
@@ -153,10 +153,10 @@
                     <view>订单编号</view>
                     <view>{{ orderData.sn }}</view>
                 </view>
-                <view class="mt-[30rpx] flex justify-between">
+                <!-- <view class="mt-[30rpx] flex justify-between">
                     <view>支付方式</view>
                     <view>{{ orderData.payWayName }}</view>
-                </view>
+                </view> -->
                 <view class="mt-[30rpx] flex justify-between">
                     <view>下单时间</view>
                     <view>{{ orderData.createTime }}</view>