From e987030a708e65306cfaab98e8c416cb72ebd297 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 16 May 2026 14:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E5=AE=8C=E5=96=84=E4=B8=80=E5=BA=97=E4=B8=80=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/tea-room.ts                              |  5 +++--
 src/bundle/order/tea-specialist/order-detail.vue |  4 ++--
 src/bundle/package/reserve.vue                   |  9 ++-------
 src/bundle/profile/profile.vue                   |  2 +-
 src/bundle/tea-room/room.vue                     | 10 ++++++++--
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/api/tea-room.ts b/src/api/tea-room.ts
index ec523bf..d55c6d2 100644
--- a/src/api/tea-room.ts
+++ b/src/api/tea-room.ts
@@ -67,7 +67,7 @@ export function getHomeTeaStoreList(data: IHomeTeaStoreListParams) {
  * 获取茶室开通城市列表
  */
 export function getOpenCityList() {
-    return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', null,
+    return http.Post<IOpenCityListResult>('/api/teaStore/teaStoreCity', {},
         {
             meta: { ignoreAuth: true }
         }
@@ -85,7 +85,7 @@ export function getTeaRoomSearchHistory() {
  * 清除茶室搜索历史
  */
 export function clearTeaRoomSearchHistory() {
-    return http.Post('/api/teaStore/delTeaStoreSearchHistory', null)
+    return http.Post('/api/teaStore/delTeaStoreSearchHistory', {})
 }
 
 /**
@@ -97,6 +97,7 @@ export interface IRoomDetailParams {
     longitude: number
     user_id: number
     room_id?: number
+    is_scan?: boolean
 }
 
 export function getTeaRoomDetail(data: IRoomDetailParams) {
diff --git a/src/bundle/order/tea-specialist/order-detail.vue b/src/bundle/order/tea-specialist/order-detail.vue
index 66508b5..dadcaa7 100644
--- a/src/bundle/order/tea-specialist/order-detail.vue
+++ b/src/bundle/order/tea-specialist/order-detail.vue
@@ -409,10 +409,10 @@
                     <view>
                         <view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
                             <view class="text-[#606266] mr-54rpx">服务方式</view>
-                            <view class="text-[#303133]">{{ order.service_type == 1 ? '到店服务' : '上门服务'}}</view>
+                            <view class="text-[#303133]">{{ order.server_type == 1 ? '到店服务' : '上门服务'}}</view>
                         </view>
                         <view class="text-28rpx leading-40rpx flex items-center mt-22rpx">
-                            <view class="text-[#606266] mr-54rpx">{{ order.service_type == 1 ? '服务门店' : '服务地址'}}</view>
+                            <view class="text-[#606266] mr-54rpx">{{ order.server_type == 1 ? '服务门店' : '服务地址'}}</view>
                             <view class="text-[#303133] line-1 w-300rpx">{{ order.address }}</view>
                         </view>
                     </view>
diff --git a/src/bundle/package/reserve.vue b/src/bundle/package/reserve.vue
index d74c262..929ccab 100644
--- a/src/bundle/package/reserve.vue
+++ b/src/bundle/package/reserve.vue
@@ -427,7 +427,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useMessage, useToast } from 'wot-design-uni'
+import { useToast } from 'wot-design-uni'
 import { router, toPlus, previewImage } from '@/utils/tools'
 import PriceFormat from '@/components/PriceFormat.vue'
 import { OrderType } from '@/utils/order'
@@ -440,16 +440,11 @@ import { CouponType } from '@/utils/coupon'
 
 const OSS = inject('OSS')
 const toast = useToast()
-const message = useMessage('wd-message-box-slot')
 
 // 防止重复提交
 const isSubmitting = ref(false)
 
 // 服务方式
-const serviceType = ref<Array<any>>([
-    { type: 1, name: '到店服务' },
-    { type: 2, name: '上门服务' },
-])
 const serviceTypeValue = ref<number>(1)
 
 // 选择茶馆
@@ -604,7 +599,7 @@ const costParams = ref({
 const teaPackage = ref<any>({})
 const teaPackageId = ref<number>(0)
 
-onLoad(async (args) => {
+onLoad(async (args: any) => {
     teaPackageId.value = Number(uni.getStorageSync('teaPackageId'))
 
     if (teaPackageId.value === 0) {
diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue
index 77220cd..c5c0fdd 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.18
+							2.14.19
 						</view>
 					</view>
 				</view>
diff --git a/src/bundle/tea-room/room.vue b/src/bundle/tea-room/room.vue
index 38f13b2..55f4b02 100644
--- a/src/bundle/tea-room/room.vue
+++ b/src/bundle/tea-room/room.vue
@@ -204,13 +204,17 @@
     // 随机颜色列表
     const tagColors = ['#40AE36', '#F55726']
 
-	onLoad((args) => {
+    // 是否是扫码进入
+    const isScan = ref<boolean>(false)
+
+	onLoad((args: any) => {
         console.log("🚀 ~ args:", args)
         // 处理小程序码扫码进入时的 scene 参数
         if (!args.id && args.scene) {
             const scene = decodeURIComponent(args.scene)
             const params = strToParams(scene)
             Object.assign(args, params)
+            isScan.value = true
         }
 
         if (args.id) {
@@ -223,6 +227,7 @@
       
             Room.handleInit()
         }
+        console.log("🚀 ~ args2:", args)
 
         // 如果是从分享进入的未登录的情况下
         uni.$on('refreshShareTeaRoomLists', (params) => {
@@ -302,7 +307,8 @@
                 id: teaRoomId.value,
                 latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
                 longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
-                user_id: userInfo.value.id || 0
+                user_id: userInfo.value.id || 0,
+                is_scan: isScan.value
             })
 
             if (res && res.status == 0) {