From 2b58bac9acd1dd947edb793c328052f42480144a Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Thu, 8 Jan 2026 02:30:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=A5=E4=B8=8B4=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=86=85=E5=AE=B9=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=201.=20=E9=A6=96=E9=A1=B5=202.=20=E5=8C=85=E9=97=B4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=203.=20=E8=8C=B6=E8=89=BA=E5=B8=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=204.=20=E8=8C=B6=E8=89=BA=E5=B8=88=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  |  5 --
 src/api/tea-room.ts                          | 11 +---
 src/bundle/tea-room/room.vue                 | 19 +++++-
 src/bundle_b/pages/tea-specialist/detail.vue | 61 +++++++++++++++++---
 src/bundle_b/pages/tea-specialist/list.vue   | 21 ++++++-
 src/pages/index/index.vue                    |  7 +++
 src/pages/login/login.vue                    |  6 ++
 7 files changed, 103 insertions(+), 27 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 48c0834..19c907f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,11 +27,6 @@
    	 	// uni.setStorageSync(LOCATION_CITY_KEY, LOCATION_DEFAULT_CITY)
 	})
 	onShow((options) => {
-		// uni.showModal({
-		// 	title: '提示',
-		// 	content: `当前请求域名是：${import.meta.env.VITE_SERVER_BASEURL}`,
-		// 	showCancel: false
-		// })
 		if (options?.path === 'bundle/order/tea-room/order-detail') {
 			uni.setStorageSync('transferOrderParams', {
 				orderId: options?.query?.orderId || '',
diff --git a/src/api/tea-room.ts b/src/api/tea-room.ts
index a4be1ec..7e532c9 100644
--- a/src/api/tea-room.ts
+++ b/src/api/tea-room.ts
@@ -99,9 +99,7 @@ export interface IRoomDetailParams {
 }
 
 export function getTeaRoomDetail(data: IRoomDetailParams) {
-    return http.Post<ITeaRoomDetailResult>('/api/teaStore/teaStoreDetails',
-        data
-    )
+    return http.Post<ITeaRoomDetailResult>('/api/teaStore/teaStoreDetails', data)
 }
 
 /**
@@ -142,12 +140,7 @@ export interface IStoreTeaRoomListParams {
 }
 
 export function getStoreTeaRoomList(data: IStoreTeaRoomListParams) {
-    return http.Post<IHomeTeaRoomListResult>('/api/teaStore/teaStoreRoomLists',
-        data,
-        {
-            meta: { ignoreAuth: true }
-        }
-    )
+    return http.Post<IHomeTeaRoomListResult>('/api/teaStore/teaStoreRoomLists', data)
 }
 
 /**
diff --git a/src/bundle/tea-room/room.vue b/src/bundle/tea-room/room.vue
index 9b511bc..35025f4 100644
--- a/src/bundle/tea-room/room.vue
+++ b/src/bundle/tea-room/room.vue
@@ -187,6 +187,7 @@
     const tagColors = ['#40AE36', '#F55726']
 
 	onLoad((args) => {
+        console.log("🚀 ~ args:", args)
         if (args.id) {
             teaRoomId.value = Number(args.id)
             storeType.value = Number(args.type) || StoreType.Direct
@@ -198,6 +199,14 @@
             Room.handleInit()
         }
 
+        // 如果是从分享进入的未登录的情况下
+        uni.$on('refreshShareTeaRoomLists', (params) => {
+            uni.$off('refreshShareTeaRoomLists')
+            Room.handleInit()
+            list.value = []
+			getMescroll().resetUpScroll()
+        })
+
         uni.$on('refreshTeaRoomDetail', () => {
             list.value = []
 			getMescroll().resetUpScroll()
@@ -205,10 +214,18 @@
 	})
 
     onUnload(() => {
-        console.log("🚀 ~ 卸载refreshTeaRoomDetail事件:")
+        uni.$off('refreshShareTeaRoomLists')
         uni.$off('refreshTeaRoomDetail')
     })
 
+    // 茶室分享（仅页面右上角分享，无需按钮分享）
+    onShareAppMessage(() => {
+        return {
+            title: teaRoom.value.name || '茶室预约',
+            path: `/bundle/tea-room/room?id=${teaRoomId.value}&type=${storeType.value}`,
+        }
+    })
+
     const Room = {
         sheetMenuType: '', // 记录菜单类型
 
diff --git a/src/bundle_b/pages/tea-specialist/detail.vue b/src/bundle_b/pages/tea-specialist/detail.vue
index 51156c4..98564aa 100644
--- a/src/bundle_b/pages/tea-specialist/detail.vue
+++ b/src/bundle_b/pages/tea-specialist/detail.vue
@@ -68,7 +68,15 @@
         </wd-popup>
 
         <view>
-            <navbar :title="isReserve ? '预约茶艺师' : '茶艺师详情'" fixed :left-arrow="false">
+            <navbar fixed layoutLeft hideLeftIcon>
+                <template #left>
+                    <view class="h-48rpx flex items-center" @click="Detail.handleBack">
+                        <view class="mt-4rpx">
+                            <wd-icon name="thin-arrow-left" size="30rpx" color="#121212" ></wd-icon>
+                        </view>
+                        <view class="text-[#303133] text-36rpx ml-24rpx leading-48rpx">{{isReserve ? '预约茶艺师' : '茶艺师详情'}}</view>
+                    </view>
+                </template>
                 <template #right>
 					<view class="flex items-center ml-114rpx">
                         <!-- <view class="mr-16rpx flex items-center" @click="Detail.handleCollect">
@@ -403,20 +411,21 @@
     const tipMoney = ref<string>('') // 其他打赏金额
 
     onLoad(async (args) => {
+        console.log("🚀 ~ args:", args)
         const userStore = useUserStore()
         userInfo.value = userStore.userInfo 
 
         id.value = args.id || 0
+        Detail.handleGetTeaSpecialistDetail()
 
-        // 获取茶艺师详情
-        const res = await getTeaSpecialistDetail({
-            team_user_id: args.id,
-            latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
-            longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
+        // 如果是从分享进入的未登录的情况下
+        uni.$on('refreshTeaSpecialistDetails', (params) => {
+            // 处理未登录的情况下
+            id.value = id.value
+            uni.$off('refreshTeaSpecialistDetails')
+ 
+            Detail.handleGetTeaSpecialistDetail()
         })
-        info.value = res.teamaster
-        console.log("🚀 ~ res:", res)
-
         // rate.value = info.value.star
         // tabList.value = info.value.textarea
         // console.log("🚀 ~ tabList:", res)
@@ -440,7 +449,32 @@
         // })
     })
 
+    onUnload(() => {
+        uni.$off('refreshTeaSpecialistDetails')
+    })
+
+    // 茶艺师分享
+    onShareAppMessage(() => {
+        return {
+            title: info.value.name || '预约茶艺师',
+            path: `/bundle_b/pages/tea-specialist/detail?id=${id.value}`,
+        }
+    })
+
+
     const Detail = {
+        /**
+         * 获取茶艺师详情
+         */
+        handleGetTeaSpecialistDetail: async () => {
+            const res = await getTeaSpecialistDetail({
+                team_user_id: id.value,
+                latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
+                longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
+            })
+            info.value = res.teamaster
+        },
+
         /**
          * TODO 处理收藏-暂时不要
          */
@@ -523,6 +557,15 @@
             // id.value - 茶艺师的ID
             router.navigateTo(`/bundle_b/pages/tea-specialist/reserve?id=${id.value}`)
         },
+        
+        /**
+         * 分享的页面没有栈，所以需要switch方法跳转
+         */
+        handleBack: () => {
+            router.navigateBack().catch(err => {
+                router.switchTab('/pages/index/index')
+            })
+        }
     }
 </script>
 
diff --git a/src/bundle_b/pages/tea-specialist/list.vue b/src/bundle_b/pages/tea-specialist/list.vue
index e3479a5..b99cd6a 100644
--- a/src/bundle_b/pages/tea-specialist/list.vue
+++ b/src/bundle_b/pages/tea-specialist/list.vue
@@ -12,8 +12,8 @@
 		<view class="home-bg w-[100%] sticky top-0 left-0 z-100">
 			<wd-navbar safeAreaInsetTop :bordered="false" custom-style="background-color: transparent !important;">
                 <template #left>
-                    <view class="flex items-center">
-                        <view class="mt-4rpx" @click="router.navigateBack()">
+                    <view class="flex items-center" @click="List.handleBack">
+                        <view class="mt-4rpx">
                             <wd-icon name="thin-arrow-left" size="30rpx" color="#121212"></wd-icon>
                         </view>
                         <view class="text-[#303133] text-36rpx ml-24rpx leading-48rpx">预约茶艺师</view>
@@ -196,6 +196,13 @@
 
 	})
 
+    // 茶室分享（仅页面右上角分享，无需按钮分享）
+    onShareAppMessage(() => {
+        return {
+            title: '茶艺师列表',
+            path: `/bundle_b/pages/tea-specialist/list`,
+        }
+    })
 
     const List = {
         /**
@@ -230,7 +237,6 @@
             router.navigateTo(`/bundle_b/pages/tea-specialist/detail?id=${id}`)
         },
     
-
         /**
          * 获取茶艺师等级
          * @param value 
@@ -255,6 +261,15 @@
 			list.value = [] 
 			getMescroll().resetUpScroll()
         },
+
+        /**
+         * 分享的页面没有栈，所以需要switch方法跳转
+         */
+        handleBack: () => {
+            router.navigateBack().catch(err => {
+                router.switchTab('/pages/index/index')
+            })
+        }
     }
 </script>
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 89aabcb..e8f5321 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -229,6 +229,13 @@
 		Index.handleResetSearch()
 	})
 
+	// 首页分享
+	onShareAppMessage(async (e) => {
+		return {
+			title: '首页',
+			path: `/pages/index/index`,
+		}
+    })
 
 	const Index = {
 		/**
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 3a0c676..fee58ae 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -92,6 +92,7 @@
                 const userStore = useUserStore()
                 const res = await userStore.wxLogin()
                 console.log("🚀 ~ res:", res)
+                console.log("🚀 ~ token:", uni.getStorageSync('token'))
                 uni.hideLoading()
                 if (!res.mobile) {
                     showBindMobilePopup.value = true
@@ -158,9 +159,14 @@
         handleToLogin: () => {
             const decoded = decodeURIComponent(redirectUrl.value)
             console.log("🚀 ~ decoded:", decoded)
+            console.log("🚀 ~ decoded:",  uni.getStorageSync('refreshTeaSpecialistDetailsParams'))
             if (decoded == '/bundle/order/tea-room/order-detail') {
                 const transferOrderParams = uni.getStorageSync('transferOrderParams')
                 uni.$emit('transferOrder', transferOrderParams)
+            } else if (decoded == '/bundle_b/pages/tea-specialist/detail') {
+                uni.$emit('refreshTeaSpecialistDetails')
+            } else if (decoded == '/bundle/tea-room/room') {
+                uni.$emit('refreshShareTeaRoomLists')
             }
 
             toast.info('登录成功')