From 473e40b817ac8112f1dc8e558ad2c5b22b35b170 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 9 May 2026 16:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/bundle/collect/collect.vue                | 32 ++++++-----
 .../order/tea-specialist/order-detail.vue     | 54 ++++++++++++++++---
 src/bundle/profile/profile.vue                |  2 +-
 src/bundle_b/pages/tea-specialist/list.vue    | 28 ++++++----
 src/components/order/ComboCard.vue            | 32 +++++++----
 src/pages/my/my.vue                           |  3 +-
 6 files changed, 109 insertions(+), 42 deletions(-)

diff --git a/src/bundle/collect/collect.vue b/src/bundle/collect/collect.vue
index 1331745..baeb93b 100644
--- a/src/bundle/collect/collect.vue
+++ b/src/bundle/collect/collect.vue
@@ -70,7 +70,7 @@
                         <template v-if="tab === 0">
                             <view class="flex items-center bg-white p-20rpx rounded-10rpx mx-30rpx mb-20rpx relative"
                                 v-for="(item, index) in list" :key="index">
-                                <view class="mr-28rpx relative z-2" @click="Collect.handlePreviewImage(item.image)">
+                                <view class="mr-28rpx relative z-2" @click="Collect.handlePreviewImage(item.image, item.image_arr)">
                                     <wd-img width="260rpx" height="320rpx" :src="item.image" mode="aspectFill"
                                         radius="10rpx"></wd-img>
                                     <view
@@ -101,24 +101,32 @@
                                         </view>
                                     </view>
 
-
-                                    <view class="flex items-center mb-14rpx">
+                                    <view class="flex flex-wrap items-center mb-14rpx gap-y-12rpx">
                                         <!-- 到店服务标签 -->
-                                        <view class="mr-12rpx" v-if="item.server_type == 1 || item.server_type == 3">
+                                        <view class="mr-12rpx shrink-0"
+                                            v-if="item.server_type == 1 || item.server_type == 3">
                                             <wd-tag color="#F55726" bg-color="#F55726" plain
-                                                custom-class="!rounded-4rpx">到店服务</wd-tag>
+                                                custom-class="!rounded-4rpx whitespace-nowrap">到店服务</wd-tag>
                                         </view>
 
                                         <!-- 上门服务标签 -->
-                                        <view class="mr-12rpx" v-if="item.server_type == 2 || item.server_type == 3">
+                                        <view class="mr-12rpx shrink-0"
+                                            v-if="item.server_type == 2 || item.server_type == 3">
                                             <wd-tag color="#40AE36" bg-color="#40AE36" plain
-                                                custom-class="!rounded-4rpx">上门服务</wd-tag>
+                                                custom-class="!rounded-4rpx whitespace-nowrap">上门服务</wd-tag>
                                         </view>
 
-                                        <view class="mr-12rpx">
-                                            <wd-tag color="#818CA9" bg-color="#F3F3F3">{{ item.both }}岁</wd-tag>
+                                        <view class="mr-12rpx shrink-0" v-if="item.is_mileage == 1">
+                                            <!-- 醒目的红色实心标签 -->
+                                            <wd-tag color="#FFF" bg-color="#FF5951"
+                                                custom-class="!rounded-4rpx whitespace-nowrap border-none !px-12rpx">免费出行</wd-tag>
                                         </view>
-                                        <view class="flex items-center mt-8rpx">
+
+                                        <view class="mr-12rpx shrink-0">
+                                            <wd-tag color="#818CA9" bg-color="#F3F3F3"
+                                                custom-class="whitespace-nowrap">{{ item.both }}岁</wd-tag>
+                                        </view>
+                                        <view class="flex items-center shrink-0">
                                             <wd-img
                                                 :src="item.sex == 1 ? `${OSS}icon/icon_man.png` : `${OSS}icon/icon_woman.png`"
                                                 width="28rpx" height="28rpx"></wd-img>
@@ -276,8 +284,8 @@ const Collect = {
     /**
      * 预览图片
      */
-    handlePreviewImage: (img: any) => {
-        previewImage(img, [img])
+    handlePreviewImage: (img: any, imageList: any) => {
+        previewImage(img, imageList)
     },
 
     // 取消收藏茶艺师
diff --git a/src/bundle/order/tea-specialist/order-detail.vue b/src/bundle/order/tea-specialist/order-detail.vue
index e05ac9f..1f08478 100644
--- a/src/bundle/order/tea-specialist/order-detail.vue
+++ b/src/bundle/order/tea-specialist/order-detail.vue
@@ -203,7 +203,6 @@
         <navbar :title="title" custom-class='!bg-[#F6F7F8]' :leftArrow="false"></navbar>
 
         <view class="text-[#909399] text-26rpx leading-36rpx mb-40rpx">
-            <view class="text-center" v-if="orderStatus == TeaSpecialistOrderStatus.Arrived || orderStatus == TeaSpecialistOrderStatus.Accepted">使用过程中有任何问题，请联系客服</view>
             <view class="flex items-center justify-center" v-if="(orderStatus == TeaSpecialistOrderStatus.Unpaid || orderStatus == TeaSpecialistOrderStatus.Pending) && order.timekeeping > 0">
                 <view class="flex items-center mr-6rpx">
                     <wd-img width="36rpx" height="36rpx" :src="`${OSS}icon/icon_time.png`"/>
@@ -230,9 +229,19 @@
         <view class="mx-30rpx coupon-bg" v-if="orderStatus < TeaSpecialistOrderStatus.SpecialistRefund">
             <view class="flex items-center px-30rpx pt-30rpx">
                 <view class="mr-30rpx">
-                    <wd-img width="190rpx" height="190rpx" :src="order.image" mode="scaleToFill"></wd-img>
+                    <wd-img width="190rpx" height="190rpx" :src="order.image" mode="scaleToFill" @click="OrderDetail.handlePreviewImage(order.image, order.image_arr)"></wd-img>
                 </view>
                 <view class="flex-1">
+                    <view class="flex flex-col items-end shrink-0">
+                        <text v-if="orderStatus === TeaSpecialistOrderStatus.Unpaid" class="text-28rpx mb-12rpx text-[#FF5951]">待付款</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Pending" class="text-28rpx mb-12rpx text-[#FF5951]">待接单</text>
+                        <text v-else-if="orderStatus >= TeaSpecialistOrderStatus.SpecialistRefund && orderStatus <= TeaSpecialistOrderStatus.CustomerRefundAfterArrive" class="text-28rpx mb-12rpx text-[#606266]">已退款</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Accepted" class="text-28rpx mb-12rpx text-[#4C9F44]">已预约</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Departed" class="text-28rpx mb-12rpx text-[#4C9F44]">已出发</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Arrived" class="text-28rpx mb-12rpx text-[#4C9F44]">服务中</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Completed" class="text-28rpx mb-12rpx text-[#606266]">完成</text>
+                        <text v-else-if="orderStatus === TeaSpecialistOrderStatus.Cancelled" class="text-28rpx mb-12rpx text-[#C9C9C9]">订单取消</text>
+                    </view>
                     <view class="flex justify-between items-center">
                         <view class="font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx line-1 w-280rpx">
                             {{ order.title }}
@@ -310,6 +319,14 @@
                 </view>
             </view>
         </view>
+        
+        <!-- 联系官方客服 -->
+        <view class="px-30rpx mx-30rpx mt-20rpx rounded-16rpx h-90rpx flex justify-between items-center border-[2rpx] border-[#4C9F44] bg-[#F2FAF4]" @click="OrderDetail.handleContactService">
+            <view class="font-bold text-26rpx leading-48rpx text-[#4C9F44]">服务遇到问题或需要帮助？</view>
+            <view class="flex items-center bg-[#4C9F44] rounded-8rpx px-18rpx py-8rpx">
+                <view class="text-24rpx leading-34rpx text-[#fff] ml-6rpx">联系客服</view>
+            </view>
+        </view>
 
         <!-- 茶艺服务 -->
         <view class="bg-white rounded-16rpx px-30rpx pb-32rpx mx-30rpx mt-20rpx" v-if="orderStatus < TeaSpecialistOrderStatus.SpecialistRefund">
@@ -495,9 +512,9 @@
 <script lang="ts" setup>
     import { getTeaSpecialistOrderDetails } from '@/api/teaSpecialist-order'
     import { useMessage, useToast } from 'wot-design-uni'
-	import { TeaSpecialistManageOrderStatusText, TeaSpecialistManageStatusTextValue,  TeaSpecialistOrderStatus} from '@/utils/teaSpecialistOrder'
+	import { TeaSpecialistManageOrderStatusText, TeaSpecialistManageStatusTextValue, TeaSpecialistOrderStatus} from '@/utils/teaSpecialistOrder'
     import { handleCancelOrderHooks, handleRefundTeaSpecialistOrderHooks } from '@/hooks/useTeaSpecialistOrder'
-    import { router, copy, toPlus } from '@/utils/tools'
+    import { router, copy, toPlus, previewImage } from '@/utils/tools'
     import { OrderType } from '@/utils/order'
     import { getTeaTypeList } from '@/api/tea'
     import { getTeaSpecialistFeeDetails, createTeaSpecialistRenewOrder } from '@/api/tea-specialist'
@@ -572,7 +589,7 @@
         day_time: '', // 预约日期
         start_time: '', // 开始日期
         end_time: '', // 结束日期0
-        service_type: 1, // 服务方式 1到店服务 2上门服务
+        server_type: 1, // 服务方式 1到店服务 2上门服务
         address: '', // 服务地址
         longitude: 0, // 经度
         latitude: 0, // 纬度
@@ -593,6 +610,10 @@
         renew_tea_price: 0, // 续订茶叶金额
         tea_price: 0, // 茶叶费
         teacup_price: 0, // 茶具费
+        is_mileage: 0, // 是否免费出行
+        both: 0, // 年龄
+        sex: 0, // 性别
+        image_arr: [] // 订单相关图片数组
     })
 
     onLoad(async (args) => {
@@ -822,6 +843,27 @@
             uni.makePhoneCall({
                 phoneNumber: res.mobile
             })
+        },
+
+        /**
+         * 联系企业微信客服
+         */
+        handleContactService: () => {
+            // @ts-ignore
+			wx.openCustomerServiceChat({
+				extInfo: {
+					url: 'https://work.weixin.qq.com/kfid/kfc723bd879ef30a161' //客服ID
+				},
+				corpId: 'wwe8c5c7cf7d2010e6',
+				success(res) {},
+				fail(res) {
+                    toast.show('调起客服失败')
+                }
+			})
+        },
+
+        handlePreviewImage: (img: any, imageList: any) => {
+            previewImage(img, imageList)
         }
     }
 </script>
@@ -845,4 +887,4 @@
     .renew-border {
         border-top: 2rpx dashed #E5E7EB;
     }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue
index b708f1c..e00b0eb 100644
--- a/src/bundle/profile/profile.vue
+++ b/src/bundle/profile/profile.vue
@@ -119,7 +119,7 @@
 				<view class="flex justify-end">
 					<view class="flex items-center">
 						<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
-							2.14.16
+							2.14.17
 						</view>
 					</view>
 				</view>
diff --git a/src/bundle_b/pages/tea-specialist/list.vue b/src/bundle_b/pages/tea-specialist/list.vue
index aa7ea56..b76fa9c 100644
--- a/src/bundle_b/pages/tea-specialist/list.vue
+++ b/src/bundle_b/pages/tea-specialist/list.vue
@@ -145,7 +145,7 @@
                 :up="upOption" fixed>
                 <view class="flex items-center bg-white p-20rpx rounded-10rpx mx-30rpx mb-20rpx relative"
                     v-for="(item, index) in list" :key="index">
-                    <view class="mr-28rpx relative z-2" @click="List.handlePreviewImage(item.image)">
+                    <view class="mr-28rpx relative z-2" @click="List.handlePreviewImage(item.image, item.image_arr)">
                         <wd-img width="260rpx" height="320rpx" :src="item.image" mode="aspectFill"
                             radius="10rpx"></wd-img>
                         <view
@@ -170,23 +170,29 @@
                             </view>
                         </view>
 
-                        <view class="flex items-center mb-14rpx">
+                        <view class="flex flex-wrap items-center mb-14rpx gap-y-12rpx">
                             <!-- 到店服务标签 -->
-                            <view class="mr-12rpx" v-if="item.server_type == 1 || item.server_type == 3">
+                            <view class="mr-12rpx shrink-0" v-if="item.server_type == 1 || item.server_type == 3">
                                 <wd-tag color="#F55726" bg-color="#F55726" plain
-                                    custom-class="!rounded-4rpx">到店服务</wd-tag>
+                                    custom-class="!rounded-4rpx whitespace-nowrap">到店服务</wd-tag>
                             </view>
 
                             <!-- 上门服务标签 -->
-                            <view class="mr-12rpx" v-if="item.server_type == 2 || item.server_type == 3">
+                            <view class="mr-12rpx shrink-0" v-if="item.server_type == 2 || item.server_type == 3">
                                 <wd-tag color="#40AE36" bg-color="#40AE36" plain
-                                    custom-class="!rounded-4rpx">上门服务</wd-tag>
+                                    custom-class="!rounded-4rpx whitespace-nowrap">上门服务</wd-tag>
                             </view>
 
-                            <view class="mr-12rpx">
-                                <wd-tag color="#818CA9" bg-color="#F3F3F3">{{ item.both }}岁</wd-tag>
+                            <view class="mr-12rpx shrink-0" v-if="item.is_mileage == 1">
+                                <!-- 醒目的红色实心标签 -->
+                                <wd-tag color="#FFF" bg-color="#FF5951" 
+                                    custom-class="!rounded-4rpx whitespace-nowrap border-none !px-12rpx">免费出行</wd-tag>
                             </view>
-                            <view class="flex items-center mt-8rpx">
+
+                            <view class="mr-12rpx shrink-0">
+                                <wd-tag color="#818CA9" bg-color="#F3F3F3" custom-class="whitespace-nowrap">{{ item.both }}岁</wd-tag>
+                            </view>
+                            <view class="flex items-center shrink-0">
                                 <wd-img :src="item.sex == 1 ? `${OSS}icon/icon_man.png` : `${OSS}icon/icon_woman.png`"
                                     width="28rpx" height="28rpx"></wd-img>
                             </view>
@@ -450,8 +456,8 @@ const List = {
     /**
      * 预览图片
      */
-    handlePreviewImage: (img: any) => {
-        previewImage(img, [img])
+    handlePreviewImage: (img: any, imageList: any) => {
+        previewImage(img, imageList)
     }
 }
 </script>
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 111b3c8..fff6ed9 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -160,7 +160,7 @@
         <view v-if="type === OrderSource.TeaSpecialist" class="bg-white rounded-10rpx p-28rpx">
             <view class="flex items-center">
                 <view class="mr-28rpx">
-                    <wd-img width="200rpx" height="200rpx" :src="order.image"  radius="10rpx"></wd-img>
+                    <wd-img width="200rpx" height="200rpx" :src="order.image"  radius="10rpx" @click="ComboCard.handlePreviewImage(order.image, order.image_arr)"></wd-img>
                 </view>
                 <view class="flex-1" @click="ComboCard.handleToOrderDetail">
                     <view class="flex items-center relative">
@@ -183,17 +183,20 @@
                         </view>
                     </view>
 
-                    <view class="flex items-center">
-                        <view class="mr-12rpx" v-if="order.server_type == 1 || order.server_type == 3">
-                            <wd-tag color="#F55726" bg-color="#F55726" plain>到店服务</wd-tag>
+                    <view class="flex flex-wrap items-center gap-y-12rpx">
+                        <view class="mr-12rpx shrink-0" v-if="order.server_type == 1 || order.server_type == 3">
+                            <wd-tag color="#F55726" bg-color="#F55726" plain custom-class="!rounded-4rpx whitespace-nowrap">到店服务</wd-tag>
                         </view>
-                        <view class="mr-12rpx" v-if="order.server_type == 2 || order.server_type == 3">
-                            <wd-tag color="#40AE36" bg-color="#40AE36" plain custom-class="!rounded-4rpx">上门服务</wd-tag>
+                        <view class="mr-12rpx shrink-0" v-if="order.server_type == 2 || order.server_type == 3">
+                            <wd-tag color="#40AE36" bg-color="#40AE36" plain custom-class="!rounded-4rpx whitespace-nowrap">上门服务</wd-tag>
                         </view>
-                        <view class="mr-12rpx">
-                            <wd-tag color="#818CA9" bg-color="#F3F3F3">{{ order.both }}岁</wd-tag>
+                        <view class="mr-12rpx shrink-0" v-if="order.is_mileage == 1">
+                            <wd-tag color="#FFF" bg-color="#FF5951" custom-class="!rounded-4rpx whitespace-nowrap border-none !px-12rpx">免费出行</wd-tag>
                         </view>
-                        <view class="flex items-center mt-8rpx">
+                        <view class="mr-12rpx shrink-0">
+                            <wd-tag color="#818CA9" bg-color="#F3F3F3" custom-class="whitespace-nowrap">{{ order.both }}岁</wd-tag>
+                        </view>
+                        <view class="flex items-center mt-8rpx shrink-0">
                             <wd-img :src="order.sex == 1 ? `${OSS}icon/icon_man.png` : `${OSS}icon/icon_woman.png`" width="28rpx" height="28rpx"></wd-img>
                         </view>
                     </view>
@@ -247,7 +250,7 @@
     // import { toast } from '@/utils/toast'
     import { handleTRCancelOrderHooks, handleTRDeleteOrderHooks, handleTRToPayHooks, handleToTRStoreHooks, handleRefundOrderHooks } from '@/hooks/useOrder'
     import { StoreType } from '@/utils/tea'
-    import { router } from '@/utils/tools'
+    import { router, previewImage } from '@/utils/tools'
     import { PayOrderType } from '@/utils/pay'
 	import { TeaSpecialistOrderStatus } from '@/utils/teaSpecialistOrder'
     import { handleCancelOrderHooks, handleDeleteOrderHooks } from '@/hooks/useTeaSpecialistOrder'
@@ -523,7 +526,14 @@
                     // TODO 确认订单接口
                 }   
             }).catch(() => {})
-        }
+        },
+
+        /**
+         * 预览图片
+         */
+        handlePreviewImage: (img: any, imageList: any) => {
+            previewImage(img, imageList)
+        },
     }
 </script>
 
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 2e73d4a..e932e43 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -444,8 +444,9 @@
 
 		// 选择菜单-拨打客服电话
 		handleSelectMenu: (item: any) => {
+			console.log("🚀 ~ item:", item)
 			uni.makePhoneCall({
-				phoneNumber: item.item.name
+				phoneNumber: String(item.item.name)
 			})
 		},