From ef85346d0e99c31e3bac29a7b311c1d1ae698402 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Wed, 20 May 2026 14:05:47 +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/tea-room/choose-room.vue           |  19 +-
 src/bundle/tea-room/room.vue                  | 134 ++++++++++++++-
 src/bundle_b/pages/tea-specialist/list.vue    |  84 ++++++++-
 src/bundle_b/pages/tea-specialist/reserve.vue |   6 +-
 src/hooks/useLocation.ts                      |   2 -
 src/pages/cashier/cashier.vue                 |   2 +-
 src/pages/city/city.vue                       |   5 +-
 src/pages/index/index.vue                     |  54 ++++--
 ....timestamp-1778912985140-1539f5b4657a5.mjs | 162 ++++++++++++++++++
 9 files changed, 412 insertions(+), 56 deletions(-)
 create mode 100644 vite.config.ts.timestamp-1778912985140-1539f5b4657a5.mjs

diff --git a/src/bundle/tea-room/choose-room.vue b/src/bundle/tea-room/choose-room.vue
index 0201f87..c603c00 100644
--- a/src/bundle/tea-room/choose-room.vue
+++ b/src/bundle/tea-room/choose-room.vue
@@ -71,7 +71,6 @@
 
     const goods = ref<Array<any>[]>([])
     const showAction = ref<boolean>(false)
-    const sheetMenu = ref([])
     const showServicePopup = ref<boolean>(false)
 
     const storeType = ref<number>(1) // 1：直营 2：加盟
@@ -130,7 +129,7 @@
     const couponRoomId = ref<number>(0)
     const couponRoomPrice = ref<number>(0)
 
-	onLoad((args) => {
+	onLoad((args: any) => {
         groupCouponId.value = args.groupCouponId
         groupCouponOrderId.value = args.groupCouponOrderId
         teaRoomId.value = Number(args.teaRoomId)
@@ -217,22 +216,6 @@
             })
         },
 
-        // 处理拨打电话逻辑
-        handleCallPhone: () => {
-            ChooseRoom.sheetMenuType = 'call'
-            showAction.value = true
-            sheetMenu.value = [
-                {
-                    name:  15005837859,
-                    value: ''
-                },
-                {
-                    name: '呼叫',
-                    value: 15005837859
-                }
-            ]
-        },
-
         // tab切换获取index
         handleChangeTab: (item: { index: number }) => {
             // tabIndexs.value = item.index
diff --git a/src/bundle/tea-room/room.vue b/src/bundle/tea-room/room.vue
index 55f4b02..9c268b3 100644
--- a/src/bundle/tea-room/room.vue
+++ b/src/bundle/tea-room/room.vue
@@ -8,6 +8,55 @@
 }</route>
 <template>
 	<view>
+        <!-- 领取优惠券 -->
+		<wd-overlay :show="showCoupon" @click="Room.handleCloseCoupon('coupon1')">
+			<view class="flex flex-col justify-center items-center h-100%">
+				<view class="w-652rpx h-590rpx relative" >
+					<wd-img :src="`${OSS}images/home/home_image10.png`" width="100%" height="100%"></wd-img>
+					<view class="absolute top-200rpx left-1/2 transform -translate-x-1/2 flex flex-col items-center">
+						<view class="mt-220rpx" @click.stop="Room.handleCloseCoupon('coupon1')">
+							<view class="h-90rpx relative">
+								<wd-img :src="`${OSS}images/home/home_image9.png`" width="342rpx" height="90rpx"></wd-img>
+								<view class="absolute top-20rpx left-1/2 transform -translate-x-1/2 flex flex-col items-center" @click.stop="Room.handleToGetCoupon('coupon1')">立即领取</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="mt-80rpx" @click.stop="Room.handleCloseCoupon('coupon1')">
+					<wd-img :src="`${OSS}icon/icon_close2.png`" width="72rpx" height="72rpx"></wd-img>
+				</view>
+			</view>
+		</wd-overlay>	
+		
+		<!-- 领取20张20元优惠券 -->
+		<wd-overlay :show="showCoupon2" @click="Room.handleCloseCoupon('coupon2')">
+			<view class="flex flex-col justify-center items-center h-100%">
+				<view class="w-572rpx h-518rpx relative" >
+					<wd-img :src="`${OSS}images/home/home_image_20.png`" width="100%" height="100%"></wd-img>
+					<view class="absolute top-50rpx left-1/2 transform -translate-x-1/2">
+						<view class="text-[#FF5643] font-bold text-32rpx leading-42rpx text-center">通用优惠券</view>
+						<view class="text-[#E64545] font-bold flex items-end mt-20rpx">
+							<view class="text-52rpx mb-20rpx">￥</view>
+							<view class="text-102rpx">400</view>
+						</view>
+					</view>
+					<view class="absolute top-200rpx left-1/2 transform -translate-x-1/2 flex flex-col items-center">
+						<view class="mt-160rpx" @click.stop="Room.handleCloseCoupon('coupon2')">
+							<view class="h-90rpx relative" @click.stop="Room.handleToGetCoupon('coupon2')">
+								<wd-img :src="`${OSS}images/home/home_image9.png`" width="342rpx" height="90rpx"></wd-img>
+								<view class="absolute top-20rpx left-1/2 transform -translate-x-1/2 flex flex-col items-center">立即领取</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="mt-80rpx" @click.stop="Room.handleCloseCoupon('coupon2')">
+					<wd-img :src="`${OSS}icon/icon_close2.png`" width="72rpx" height="72rpx"></wd-img>
+				</view>
+			</view>
+		</wd-overlay>
+
         <view>
             <navbar fixed layoutLeft hideLeftIcon>
                 <template #left>
@@ -158,12 +207,12 @@
     import RoomList from '@/components/reserve/RoomList.vue'
     import {toast} from '@/utils/toast'
 	import { getTeaRoomDetail, collectTeaRoom, getStoreTeaRoomList, getTeaRoomPackage } from '@/api/tea-room'
-    import type { ITeaRoomDetailResult } from '@/api/types/tea-room'
     import type {IUserInfoVo } from '@/api/types/login'
 	import { useUserStore } from '@/store'
     import { router, previewImage, strToParams } from '@/utils/tools'
     import { StoreType } from '@/utils/tea'
     import DouYinExcharge from '@/bundle/components/DouYinExcharge.vue'
+	import { getHomeCouponPopup, claimIndexCoupon } from '@/api/home'
 
     const rightPadding = inject('capsuleOffset')
 	const OSS = inject('OSS')
@@ -176,7 +225,7 @@
     const teaRoom = ref<any>({})
 
     // 用户信息
-	const userInfo = ref<IUserInfoVo>(null)
+	const userInfo = ref<IUserInfoVo>({})
     
     // tab
     const tab = ref<number>(0)
@@ -184,7 +233,7 @@
 
     // 弹窗
     const showAction = ref<boolean>(false)
-    const sheetMenu = ref([])
+    const sheetMenu = ref<any>([])
     const showServicePopup = ref<boolean>(false)
 
     const storeType = ref<number>(StoreType.Direct)
@@ -207,6 +256,14 @@
     // 是否是扫码进入
     const isScan = ref<boolean>(false)
 
+    // 优惠券状态
+	const couponStatus = ref<any>({})
+	//  显示优惠券弹窗
+	const showCoupon = ref<boolean>(false)	
+	//  显示第2种优惠券弹窗
+	const showCoupon2 = ref<boolean>(false)
+
+
 	onLoad((args: any) => {
         console.log("🚀 ~ args:", args)
         // 处理小程序码扫码进入时的 scene 参数
@@ -256,6 +313,10 @@
         }
     })
 
+    onShow(() => {
+       Room.handleIsGetCoupon()
+    })
+
     const Room = {
         sheetMenuType: '', // 记录菜单类型
 
@@ -263,7 +324,7 @@
          * 获取茶室预定和团购套餐列表
          * @param mescroll 
          */
-		upCallback: (mescroll) => {
+		upCallback: (mescroll: any) => {
             const filter = {
                 page: mescroll.num, 
                 size: mescroll.size,
@@ -300,8 +361,6 @@
         handleInit: async () => {
             const userStore = useUserStore()
             userInfo.value = userStore.userInfo 
-            console.log("🚀 ~ uni.getStorageSync('latitude'):", uni.getStorageSync('latitude'))
-            console.log("🚀 ~ uni.getStorageSync('longitude'):", uni.getStorageSync('longitude'))
 
             const res = await getTeaRoomDetail({ 
                 id: teaRoomId.value,
@@ -435,7 +494,68 @@
          */
         handlePreviewImage: (e: {index: number, item: any}) => {
             previewImage(swiperList.value[e.index], swiperList.value)
-        }
+        },
+
+        /**
+         * 是否领取过优惠券
+         */
+        handleIsGetCoupon: async () => {
+            // 如果是扫码进入，需要弹出优惠券
+            if (isScan.value) {
+                const userStore = useUserStore()
+                userInfo.value = userStore.userInfo 
+
+                const userId = userStore.userInfo?.id
+                if (userId) {
+                    // 获取首页优惠券弹窗
+                    const res = await getHomeCouponPopup()
+                    couponStatus.value = res
+                    if (Number(res.status) === 0) {
+                        showCoupon.value = true
+                    } else {
+                        showCoupon.value = false
+                    }
+
+                    // 如果第一张优惠券的弹窗没有被触发（可能是因为用户关闭了第一个优惠券的弹窗），但是接口返回还可以领第二张优惠券，就继续显示第二个优惠券的弹窗(如果一下子都弹出来，用户可能会觉得烦，所以分开两个弹窗)
+                    if (Number(res.status) !== 0 && Number(res.general_status) === 0 ) {
+                        showCoupon2.value = true
+                    } else {
+                        showCoupon2.value = false
+                    }
+                }
+            }
+        },
+
+        /**
+		 * 跳转领取优惠券页面
+		 */
+		handleToGetCoupon: async (type: string) => {
+			// 1是茶艺师优惠券，2是茶馆优惠券
+			if (type === 'coupon1') {
+				await claimIndexCoupon(1)
+				showCoupon.value = false
+				// router.navigateTo('/bundle_b/pages/tea-specialist/list')
+                Room.handleIsGetCoupon()
+			} else if (type === 'coupon2') {
+				await claimIndexCoupon(6)
+				showCoupon2.value = false
+			}
+		},
+
+        /**
+		 * 关闭优惠券
+		 */
+		handleCloseCoupon: (type: string) => {
+			if (type === 'coupon1') {
+				showCoupon.value = false
+				// 验证下，如果用户关闭了第一个优惠券的弹窗，如果还可以领第二个优惠券，就继续显示第二个优惠券的弹窗(如果一下子都弹出来，用户可能会觉得烦，所以分开两个弹窗)
+				if (Number(couponStatus.value.general_status) === 0 ) {
+					showCoupon2.value = true
+				}
+			} else if (type === 'coupon2') {
+				showCoupon2.value = false
+			}
+		}
     }
 </script>
 
diff --git a/src/bundle_b/pages/tea-specialist/list.vue b/src/bundle_b/pages/tea-specialist/list.vue
index b76fa9c..955851d 100644
--- a/src/bundle_b/pages/tea-specialist/list.vue
+++ b/src/bundle_b/pages/tea-specialist/list.vue
@@ -70,7 +70,7 @@
             <wd-navbar safeAreaInsetTop :bordered="false" custom-style="background-color: #fff !important;">
                 <template #left>
                     <view class="flex items-center" @click="List.handleBack">
-                        <view class="mt-4rpx">
+                        <view class="mt-4rpx pr-10rpx">
                             <wd-icon name="thin-arrow-left" size="30rpx" color="#121212"></wd-icon>
                         </view>
                         <view class="text-[#303133] text-36rpx ml-24rpx leading-48rpx">预约茶艺师</view>
@@ -78,8 +78,12 @@
                 </template>
             </wd-navbar>
 
-            <view class="search-box px-30rpx pb-10rpx pt-20rpx bg-[#fff]">
-                <view class="w-full h-72rpx bg-[#F6F7F8] rounded-36rpx flex items-center pl-30rpx pr-6rpx">
+            <view class="search-box pl-30rpx pb-10rpx pt-10rpx bg-[#fff] flex items-center header-search-box">
+                <view class="flex items-center line-1 max-w-150rpx mr-20rpx" @click="List.handleToCity">
+                    <view class="mr-10rpx font-400 leading-44rpx text-32rpx line-1">{{ city || LOCATION_DEFAULT_CITY }}</view>
+                    <wd-icon name="arrow-down" size="24rpx" color="#333" custom-class="mt-4rpx"></wd-icon>
+                </view>
+                <view class="flex-1 h-72rpx bg-[#F6F7F8] rounded-36rpx flex items-center pl-30rpx pr-6rpx">
                     <wd-icon name="search" size="32rpx" color="#C0C4CC"></wd-icon>
                     <input type="text" class="flex-1 ml-16rpx text-28rpx h-full bg-transparent" placeholder="茶艺师名称"
                         placeholder-style="color: #C0C4CC" v-model="keywords" @confirm="List.handleSearch"
@@ -249,6 +253,8 @@ import { getTeaSpecialist } from '@/api/tea-specialist'
 import TeaSpecialistLevel from '@/components/TeaSpecialistLevel.vue'
 import type { ITeaSpecialistResult } from '@/api/types/tea-specialist'
 import { TeaSpecialistLevelValue, TeaSpecialistLevels, GetTeaSpecialistLevelLabel } from '@/utils/teaSpecialist'
+import { LOCATION_CITY_KEY, LOCATION_DEFAULT_CITY } from '@/hooks/useLocation'
+import { getOpenCityList } from '@/api/tea-room'
 
 const OSS = inject('OSS')
 const navbarHeight = inject('navbarHeight')
@@ -260,26 +266,57 @@ const selectedLevel = ref<Array<any>>([]) // 当前选中的茶艺师等级
 // mescroll
 const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
 const downOption = {
-    auto: true
+    auto: false // 关闭自动请求，等城市加载完再请求
 }
 const upOption = {
     empty: {
         icon: OSS + 'icon/icon_reserver_empty.png',
         tip: '暂无预约信息',
     },
-    auto: true,
+    auto: false, // 关闭自动请求，等城市加载完再请求
     textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
 }
 const orderStatus = ref<string>('')
 const list = ref<Array<any>>([]) // 茶室列表
 const keywords = ref<string>('') // 搜索关键词
+const city = ref<string>('') // 当前城市名称
 const cityId = ref<number>(0)
-onLoad(async () => {
-    console.log("🚀 ~ 213:", 213)
+
+// 首页进来的cityId
+const indexCity = ref<number>(0)
+
+// 已开通的城市列表
+const openCityList = ref<Array<any>>([])
+
+onLoad(async (args: any) => {
+    indexCity.value = Number(args.cityId) || 0
+    console.log("🚀 ~ indexCity.value:", indexCity.value)
+
+    // 优先读取独立缓存，如果没有则读取系统默认定位
+    const listSavedCity = uni.getStorageSync('listCityName')
+    const listSavedCityId = uni.getStorageSync('listCityId')
+    
+    if (listSavedCity && listSavedCityId !== '') {
+        city.value = listSavedCity
+        cityId.value = listSavedCityId
+    } else {
+        city.value = uni.getStorageSync(LOCATION_CITY_KEY) || LOCATION_DEFAULT_CITY
+        cityId.value = 0
+    }
+
     uni.$on('refreshTeaSpecialist', () => {
         list.value = []
         getMescroll().resetUpScroll()
     })
+
+    // 获取已开通城市列表
+    getOpenCityList().then(res => {
+        openCityList.value = res.list
+        // 获取完毕后再触发列表请求
+        setTimeout(() => {
+            getMescroll().resetUpScroll()
+        }, 100)
+    })
 })
 
 onUnload(() => {
@@ -314,10 +351,39 @@ const List = {
         return firstThreeStyles[index] || { backgroundColor: '#F3F3F3', color: '#818CA9' }
     },
 
+    /**
+     * 跳转城市选择
+     */
+    handleToCity: () => {
+        uni.$on('locationUpdate', params => {
+            console.log("🚀 ~ list -> params:", params)
+            uni.$off('locationUpdate')
+            city.value = params.city
+            cityId.value = params.id
+            uni.setStorageSync('listCityId', params.id)
+            uni.setStorageSync('listCityName', params.city)
+            List.handleSearch()
+        })
+        const storeLat = uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE
+        const storeLng = uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE
+        router.navigateTo(`/pages/city/city?lat=${storeLat}&lng=${storeLng}`)
+    },
+
     /**
      * 筛选表
      */
-    upCallback: (mescroll) => {
+    upCallback: (mescroll: any) => {
+        // 如果没有城市id，就是初始化进入了系统，这个时候需要获取到对应的城市id
+        if (cityId.value == 0) {
+            openCityList.value.forEach((item: any) => {
+                if (item.name === city.value) {
+                    cityId.value = item.id
+                    return
+                }
+            })
+        }
+        console.log("🚀 ~ cityId.value2:", cityId.value)
+
         const filter = {
             level: selectedLevel.value.join(',') || '',
             page: mescroll.num,
@@ -328,7 +394,7 @@ const List = {
             server_type: serverType.value || '',
             state: condition.value || 0,
             gender: gender.value || '',
-            city_id: uni.getStorageSync('cityId') || 0,
+            city_id: cityId.value || 0,
         }
 
         getTeaSpecialist(filter).then((res: ITeaSpecialistResult) => {
diff --git a/src/bundle_b/pages/tea-specialist/reserve.vue b/src/bundle_b/pages/tea-specialist/reserve.vue
index 5a3287e..30bae37 100644
--- a/src/bundle_b/pages/tea-specialist/reserve.vue
+++ b/src/bundle_b/pages/tea-specialist/reserve.vue
@@ -467,9 +467,9 @@
     const endTimeValue = ref<string>('') // 结束时间
     const now = new Date()
     const minTimestamp = Date.now() + 0.5 * 60 * 60 * 1000
-        // 允许选择今天及未来六天的日期
+    // 允许选择今天及未来三十天的日期
     const futureTimestamp = minTimestamp + 2 * 60 * 60 * 1000
-    const maxTimestamp = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 6, 23, 59, 59, 999).getTime()
+    const maxTimestamp = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 30, 23, 59, 59, 999).getTime()
     const startTimeLayout = ref<string>('')
     const endTimeLayout = ref<string>('')
     const totalHour = ref<number>(0)
@@ -585,7 +585,7 @@
         team_user_id: 0, // 茶艺师id
     })
 
-	onLoad(async (args) => {
+	onLoad(async (args: any) => {
         if (args.id) {
             id.value = Number(args.id)
             costParams.value.team_user_id = Number(args.id)
diff --git a/src/hooks/useLocation.ts b/src/hooks/useLocation.ts
index 1672beb..18d6566 100644
--- a/src/hooks/useLocation.ts
+++ b/src/hooks/useLocation.ts
@@ -14,8 +14,6 @@ export const LOCATION_DEFAULT_CITY = '上海市' // 默认城市
 export const LOCATION_DEFAULT_LNG =  121.473629 // 上海经度
 export const LOCATION_DEFAULT_LAT = 31.230393 // 上海纬度
 
-
-
 // 检查过期时间
 export function handleCheckLocationCacheHooks() {
     const expire = uni.getStorageSync(LOCATION_EXPIRE_KEY)
diff --git a/src/pages/cashier/cashier.vue b/src/pages/cashier/cashier.vue
index de8af30..cd9fe32 100644
--- a/src/pages/cashier/cashier.vue
+++ b/src/pages/cashier/cashier.vue
@@ -132,7 +132,7 @@ const teaPackageTitle = ref<string>('')
 // 防止重复提交
 const isSubmitting = ref(false)
 
-onLoad(async (args) => {
+onLoad(async (args: any) => {
     // 订单
     orderId.value = Number(args.orderId)
     comboId.value = Number(args.cmoboId) || 0
diff --git a/src/pages/city/city.vue b/src/pages/city/city.vue
index 0aad403..b5c68dc 100644
--- a/src/pages/city/city.vue
+++ b/src/pages/city/city.vue
@@ -57,7 +57,7 @@
 	// 已开通城市列表
 	const openCityList = ref<Array<any>>([])
 
-	onLoad((args) => {
+	onLoad((args: any) => {
 		if (args.lat && args.lng) {
 			latitude.value = Number(args.lat)
 			longitude.value = Number(args.lng)
@@ -95,9 +95,10 @@
             }
             uni.$emit('locationUpdate', params)
 
+			// 取消全局城市缓存修改以实现功能页面之间的城市隔离
 			// uni.setStorageSync(LOCATION_LAT_KEY, item.latitude)
 			// uni.setStorageSync(LOCATION_LNG_KEY, item.longitude)
-			uni.setStorageSync(LOCATION_CITY_KEY, item.name)
+			// uni.setStorageSync(LOCATION_CITY_KEY, item.name)
 			router.navigateBack()
 		},
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5f3d4d6..3e18de0 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -202,10 +202,10 @@
 	import { router, previewImage } from '@/utils/tools'
 	import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
 	import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
-	import { LOCATION_DENY_TIME_KEY, handleEnsureLocationAuthHooks, LOCATION_DEFAULT_CITY, handleGetLocationCity, LOCATION_CITY_KEY, handleForceGetLocation } from '@/hooks/useLocation'
+	import { LOCATION_DENY_TIME_KEY, handleEnsureLocationAuthHooks, LOCATION_DEFAULT_CITY, handleGetLocationCity } from '@/hooks/useLocation'
 	import { getHomeBannerList, getHomeCouponPopup, claimIndexCoupon, getTeaArtistEntrance } from '@/api/home'
 	import { getTeaPackageList } from '@/api/tea-package'
-	import { getHomeTeaStoreList } from '@/api/tea-room'
+	import { getHomeTeaStoreList, getOpenCityList } from '@/api/tea-room'
 	import { useUserStore } from '@/store'
     import { useToast } from 'wot-design-uni'
 	import { getSetting } from '@/api/tea-specialist'
@@ -260,6 +260,9 @@
 	// 茶艺师入口图
 	const teaArtistEntrance = ref<string>('')
 
+	// 已开通的城市列表
+	const openCityList = ref<Array<any>>([])
+
 	onShow(async () => {
 		// if (canLocation) {
 		// 	const location = await handleGetLocationCity(latitude.value, longitude.value)
@@ -273,7 +276,9 @@
 				// 只有经纬度变化时才刷新
 				if (location.lat !== lastLocation.lat || location.lng !== lastLocation.lng) {
 					const loc = await handleGetLocationCity(location.lat, location.lng)
-					city.value = loc.city
+					if (!uni.getStorageSync('indexCityName')) {
+						city.value = loc.city
+					}
 
 					latitude.value = location.lat
 					longitude.value = location.lng
@@ -306,7 +311,7 @@
 		}
 	})
 
-	onLoad(async(args) => {
+	onLoad(async() => {
 		// 获取小程序码注册来源
 		// getWxacode().then( res => {})
 
@@ -318,14 +323,20 @@
 		latitude.value = lat
 		longitude.value = lng 
 
-		// 根据经纬度获取城市信息再重新赋值经纬度和城市
-		const location = await handleGetLocationCity(lat, lng)
-		city.value = location.city
-		latitude.value = location.latitude
-		longitude.value = location.longitude
-
-		// 删除city_id的缓存
-		uni.removeStorageSync('cityId')
+		// 如果有首页独立的城市缓存，优先使用；否则使用定位城市
+		const indexSavedCity = uni.getStorageSync('indexCityName')
+		const indexSavedCityId = uni.getStorageSync('indexCityId')
+		
+		if (indexSavedCity && indexSavedCityId !== '') {
+			city.value = indexSavedCity
+			city_id.value = indexSavedCityId
+		} else {
+			// 根据经纬度获取城市信息再重新赋值经纬度和城市
+			const location = await handleGetLocationCity(lat, lng)
+			city.value = location.city
+			latitude.value = location.latitude
+			longitude.value = location.longitude
+		}
 
 		Index.handleResetSearch()
 	})
@@ -355,6 +366,16 @@
 			}
 			canLocation.value = true
 
+			// 如果没有城市id，就是初始化进入了系统，这个时候需要获取到对应的城市id
+			if (city_id.value == 0) {
+				openCityList.value.forEach((item: any) => {
+					if (item.name === city.value) {
+						city_id.value = item.id
+						return
+					}
+				})
+			}
+
 			const filter = {
 				page: mescroll.num, 
 				size: mescroll.size,
@@ -411,6 +432,10 @@
 				teaPackageList.value = res
 			})
 
+			// 获取已开通城市列表
+			getOpenCityList().then(res => {
+				openCityList.value = res.list
+			})
 		},
 
 		/**
@@ -424,7 +449,8 @@
 				city_id.value = params.id
 				// latitude.value = params.latitude
 				// longitude.value = params.longitude
-				uni.setStorageSync('cityId', params.id)
+				uni.setStorageSync('indexCityId', params.id)
+				uni.setStorageSync('indexCityName', params.city)
 				Index.handleResetSearch()
 			})
 			router.navigateTo(`/pages/city/city?lat=${latitude.value}&lng=${longitude.value}`)
@@ -447,7 +473,7 @@
 		 * 跳转到预约茶室页面
 		 */
 		handleToReserveRoom: (id: number = 0, type: number = 1) => {
-			router.navigateTo( `/bundle/tea-room/room?id=${id}&type=${type}`)
+			router.navigateTo( `/bundle/tea-room/room?id=${id}&type=${type}` )
 		},
 
 		/**
diff --git a/vite.config.ts.timestamp-1778912985140-1539f5b4657a5.mjs b/vite.config.ts.timestamp-1778912985140-1539f5b4657a5.mjs
new file mode 100644
index 0000000..d9f4de7
--- /dev/null
+++ b/vite.config.ts.timestamp-1778912985140-1539f5b4657a5.mjs
@@ -0,0 +1,162 @@
+// vite.config.ts
+import path from "node:path";
+import process from "node:process";
+import Uni from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+plugin-uni@0.1._13a08374fc746519ba2cdc3ac66336dc/node_modules/@uni-helper/plugin-uni/src/index.js";
+import Components from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+vite-plugin-uni-components@0.2.0_rollup@4.46.2/node_modules/@uni-helper/vite-plugin-uni-components/dist/index.mjs";
+import UniLayouts from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+vite-plugin-uni-layouts@0.1.11_rollup@4.46.2/node_modules/@uni-helper/vite-plugin-uni-layouts/dist/index.mjs";
+import UniManifest from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+vite-plugin-uni_2e79d4912f4f16552fcb82978a6a988b/node_modules/@uni-helper/vite-plugin-uni-manifest/dist/index.mjs";
+import UniPages from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+vite-plugin-uni_5216a1b2930e52cb254f93c3166fc8fc/node_modules/@uni-helper/vite-plugin-uni-pages/dist/index.mjs";
+import UniPlatform from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-helper+vite-plugin-uni-platform@0.0.5/node_modules/@uni-helper/vite-plugin-uni-platform/dist/index.mjs";
+import Optimization from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/@uni-ku+bundle-optimizer@1._5ab614773e6f14d4b1f53be3d75b20b3/node_modules/@uni-ku/bundle-optimizer/dist/index.mjs";
+import dayjs from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js";
+import { visualizer } from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/rollup-plugin-visualizer@5.14.0_rollup@4.46.2/node_modules/rollup-plugin-visualizer/dist/plugin/index.js";
+import UnoCSS from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/unocss@66.0.0_postcss@8.5.6_11a0fdb79703efeb72296cc703204d63/node_modules/unocss/dist/vite.mjs";
+import AutoImport from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/unplugin-auto-import@0.17.8_rollup@4.46.2/node_modules/unplugin-auto-import/dist/vite.js";
+import { defineConfig, loadEnv } from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/vite@5.2.8_@types+node@20.19.9_sass@1.77.8_terser@5.43.1/node_modules/vite/dist/node/index.js";
+import ViteRestart from "file:///D:/Hbuilder/Project/chazhi/node_modules/.pnpm/vite-plugin-restart@0.4.2_v_30f4b30a1abde0501a9b6d1dbad04de5/node_modules/vite-plugin-restart/dist/index.js";
+var vite_config_default = ({ command, mode }) => {
+  console.log("command, mode -> ", command, mode);
+  const { UNI_PLATFORM } = process.env;
+  console.log("UNI_PLATFORM -> ", UNI_PLATFORM);
+  const env = loadEnv(mode, path.resolve(process.cwd(), "env"));
+  const {
+    VITE_APP_PORT,
+    VITE_SERVER_BASEURL,
+    VITE_DELETE_CONSOLE,
+    VITE_SHOW_SOURCEMAP,
+    VITE_APP_PUBLIC_BASE,
+    VITE_APP_PROXY,
+    VITE_APP_PROXY_PREFIX
+  } = env;
+  console.log("\u73AF\u5883\u53D8\u91CF env -> ", env);
+  return defineConfig({
+    envDir: "./env",
+    // 自定义env目录
+    base: VITE_APP_PUBLIC_BASE,
+    plugins: [
+      UniPages({
+        exclude: ["**/components/**/**.*"],
+        // homePage 通过 vue 文件的 route-block 的type="home"来设定
+        // pages 目录为 src/pages，分包目录不能配置在pages目录下
+        subPackages: ["src/bundle", "src/bundle_b"],
+        // 是个数组，可以配置多个，但是不能为pages里面的目录
+        dts: "src/types/uni-pages.d.ts"
+      }),
+      UniLayouts(),
+      UniPlatform(),
+      UniManifest(),
+      // UniXXX 需要在 Uni 之前引入
+      {
+        // 临时解决 dcloudio 官方的 @dcloudio/uni-mp-compiler 出现的编译 BUG
+        // 参考 github issue: https://github.com/dcloudio/uni-app/issues/4952
+        // 自定义插件禁用 vite:vue 插件的 devToolsEnabled，强制编译 vue 模板时 inline 为 true
+        name: "fix-vite-plugin-vue",
+        configResolved(config) {
+          const plugin = config.plugins.find((p) => p.name === "vite:vue");
+          if (plugin && plugin.api && plugin.api.options) {
+            plugin.api.options.devToolsEnabled = false;
+          }
+        }
+      },
+      UnoCSS(),
+      AutoImport({
+        imports: ["vue", "uni-app"],
+        dts: "src/types/auto-import.d.ts",
+        dirs: ["src/hooks"],
+        // 自动导入 hooks
+        vueTemplate: true
+        // default false
+      }),
+      // Optimization 插件需要 page.json 文件，故应在 UniPages 插件之后执行
+      Optimization({
+        enable: {
+          "optimization": true,
+          "async-import": true,
+          "async-component": true
+        },
+        dts: {
+          base: "src/types"
+        },
+        logger: false
+      }),
+      ViteRestart({
+        // 通过这个插件，在修改vite.config.js文件则不需要重新运行也生效配置
+        restart: ["vite.config.js"]
+      }),
+      // h5环境增加 BUILD_TIME 和 BUILD_BRANCH
+      UNI_PLATFORM === "h5" && {
+        name: "html-transform",
+        transformIndexHtml(html) {
+          return html.replace("%BUILD_TIME%", dayjs().format("YYYY-MM-DD HH:mm:ss"));
+        }
+      },
+      // 打包分析插件，h5 + 生产环境才弹出
+      UNI_PLATFORM === "h5" && mode === "production" && visualizer({
+        filename: "./node_modules/.cache/visualizer/stats.html",
+        open: true,
+        gzipSize: true,
+        brotliSize: true
+      }),
+      // 只有在 app 平台时才启用 copyNativeRes 插件
+      // UNI_PLATFORM === 'app' && copyNativeRes(),
+      Components({
+        extensions: ["vue"],
+        deep: true,
+        // 是否递归扫描子目录，
+        directoryAsNamespace: false,
+        // 是否把目录名作为命名空间前缀，true 时组件名为 目录名+组件名，
+        dts: "src/types/components.d.ts"
+        // 自动生成的组件类型声明文件路径（用于 TypeScript 支持）
+      }),
+      Uni()
+    ],
+    define: {
+      __UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),
+      __VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY)
+    },
+    css: {
+      postcss: {
+        plugins: [
+          // autoprefixer({
+          //   // 指定目标浏览器
+          //   overrideBrowserslist: ['> 1%', 'last 2 versions'],
+          // }),
+        ]
+      }
+    },
+    resolve: {
+      alias: {
+        "@": path.join(process.cwd(), "./src"),
+        "@img": path.join(process.cwd(), "./src/static/images")
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      hmr: true,
+      port: Number.parseInt(VITE_APP_PORT, 10),
+      // 仅 H5 端生效，其他端不生效（其他端走build，不走devServer)
+      proxy: JSON.parse(VITE_APP_PROXY) ? {
+        [VITE_APP_PROXY_PREFIX]: {
+          target: VITE_SERVER_BASEURL,
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), "")
+        }
+      } : void 0
+    },
+    esbuild: {
+      drop: VITE_DELETE_CONSOLE === "true" ? ["console", "debugger"] : ["debugger"]
+    },
+    build: {
+      sourcemap: false,
+      // 方便非h5端调试
+      // sourcemap: VITE_SHOW_SOURCEMAP === 'true', // 默认是false
+      target: "es6",
+      // 开发环境不用压缩
+      minify: mode === "development" ? false : "esbuild"
+    }
+  });
+};
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"D:\\\\Hbuilder\\\\Project\\\\chazhi\";const __vite_injected_original_filename = \"D:\\\\Hbuilder\\\\Project\\\\chazhi\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///D:/Hbuilder/Project/chazhi/vite.config.ts\";import path from 'node:path'\r\nimport process from 'node:process'\r\nimport Uni from '@uni-helper/plugin-uni'\r\nimport Components from '@uni-helper/vite-plugin-uni-components'\r\n// @see https://uni-helper.js.org/vite-plugin-uni-layouts\r\nimport UniLayouts from '@uni-helper/vite-plugin-uni-layouts'\r\n// @see https://github.com/uni-helper/vite-plugin-uni-manifest\r\nimport UniManifest from '@uni-helper/vite-plugin-uni-manifest'\r\n// @see https://uni-helper.js.org/vite-plugin-uni-pages\r\nimport UniPages from '@uni-helper/vite-plugin-uni-pages'\r\n// @see https://github.com/uni-helper/vite-plugin-uni-platform\r\n// \u9700\u8981\u4E0E @uni-helper/vite-plugin-uni-pages \u63D2\u4EF6\u4E00\u8D77\u4F7F\u7528\r\nimport UniPlatform from '@uni-helper/vite-plugin-uni-platform'\r\n/**\r\n * \u5206\u5305\u4F18\u5316\u3001\u6A21\u5757\u5F02\u6B65\u8DE8\u5305\u8C03\u7528\u3001\u7EC4\u4EF6\u5F02\u6B65\u8DE8\u5305\u5F15\u7528\r\n * @see https://github.com/uni-ku/bundle-optimizer\r\n */\r\nimport Optimization from '@uni-ku/bundle-optimizer'\r\nimport dayjs from 'dayjs'\r\nimport { visualizer } from 'rollup-plugin-visualizer'\r\nimport UnoCSS from 'unocss/vite'\r\nimport AutoImport from 'unplugin-auto-import/vite'\r\nimport { defineConfig, loadEnv } from 'vite'\r\nimport ViteRestart from 'vite-plugin-restart'\r\n\r\n// https://vitejs.dev/config/\r\nexport default ({ command, mode }) => {\r\n\t// @see https://unocss.dev/\r\n\t// const UnoCSS = (await import('unocss/vite')).default\r\n\t// console.log(mode === process.env.NODE_ENV) // true\r\n\r\n\t// mode: \u533A\u5206\u751F\u4EA7\u73AF\u5883\u8FD8\u662F\u5F00\u53D1\u73AF\u5883\r\n\tconsole.log('command, mode -> ', command, mode)\r\n\t// pnpm dev:h5 \u65F6\u5F97\u5230 => serve development\r\n\t// pnpm build:h5 \u65F6\u5F97\u5230 => build production\r\n\t// pnpm dev:mp-weixin \u65F6\u5F97\u5230 => build development (\u6CE8\u610F\u533A\u522B\uFF0Ccommand\u4E3Abuild)\r\n\t// pnpm build:mp-weixin \u65F6\u5F97\u5230 => build production\r\n\t// pnpm dev:app \u65F6\u5F97\u5230 => build development (\u6CE8\u610F\u533A\u522B\uFF0Ccommand\u4E3Abuild)\r\n\t// pnpm build:app \u65F6\u5F97\u5230 => build production\r\n\t// dev \u548C build \u547D\u4EE4\u53EF\u4EE5\u5206\u522B\u4F7F\u7528 .env.development \u548C .env.production \u7684\u73AF\u5883\u53D8\u91CF\r\n\r\n\tconst { UNI_PLATFORM } = process.env\r\n\tconsole.log('UNI_PLATFORM -> ', UNI_PLATFORM) // \u5F97\u5230 mp-weixin, h5, app \u7B49\r\n\r\n\tconst env = loadEnv(mode, path.resolve(process.cwd(), 'env'))\r\n\tconst {\r\n\t\tVITE_APP_PORT,\r\n\t\tVITE_SERVER_BASEURL,\r\n\t\tVITE_DELETE_CONSOLE,\r\n\t\tVITE_SHOW_SOURCEMAP,\r\n\t\tVITE_APP_PUBLIC_BASE,\r\n\t\tVITE_APP_PROXY,\r\n\t\tVITE_APP_PROXY_PREFIX,\r\n\t} = env\r\n\tconsole.log('\u73AF\u5883\u53D8\u91CF env -> ', env)\r\n\r\n\treturn defineConfig({\r\n\t\tenvDir: './env', // \u81EA\u5B9A\u4E49env\u76EE\u5F55\r\n\t\tbase: VITE_APP_PUBLIC_BASE,\r\n\t\tplugins: [\r\n\t\t\tUniPages({\r\n\t\t\t\texclude: ['**/components/**/**.*'],\r\n\t\t\t\t// homePage \u901A\u8FC7 vue \u6587\u4EF6\u7684 route-block \u7684type=\"home\"\u6765\u8BBE\u5B9A\r\n\t\t\t\t// pages \u76EE\u5F55\u4E3A src/pages\uFF0C\u5206\u5305\u76EE\u5F55\u4E0D\u80FD\u914D\u7F6E\u5728pages\u76EE\u5F55\u4E0B\r\n\t\t\t\tsubPackages: ['src/bundle', 'src/bundle_b'], // \u662F\u4E2A\u6570\u7EC4\uFF0C\u53EF\u4EE5\u914D\u7F6E\u591A\u4E2A\uFF0C\u4F46\u662F\u4E0D\u80FD\u4E3Apages\u91CC\u9762\u7684\u76EE\u5F55\r\n\t\t\t\tdts: 'src/types/uni-pages.d.ts',\r\n\t\t\t}),\r\n\t\t\tUniLayouts(),\r\n\t\t\tUniPlatform(),\r\n\t\t\tUniManifest(),\r\n\t\t\t// UniXXX \u9700\u8981\u5728 Uni \u4E4B\u524D\u5F15\u5165\r\n\t\t\t{\r\n\t\t\t\t// \u4E34\u65F6\u89E3\u51B3 dcloudio \u5B98\u65B9\u7684 @dcloudio/uni-mp-compiler \u51FA\u73B0\u7684\u7F16\u8BD1 BUG\r\n\t\t\t\t// \u53C2\u8003 github issue: https://github.com/dcloudio/uni-app/issues/4952\r\n\t\t\t\t// \u81EA\u5B9A\u4E49\u63D2\u4EF6\u7981\u7528 vite:vue \u63D2\u4EF6\u7684 devToolsEnabled\uFF0C\u5F3A\u5236\u7F16\u8BD1 vue \u6A21\u677F\u65F6 inline \u4E3A true\r\n\t\t\t\tname: 'fix-vite-plugin-vue',\r\n\t\t\t\tconfigResolved(config) {\r\n\t\t\t\t\tconst plugin = config.plugins.find(p => p.name === 'vite:vue')\r\n\t\t\t\t\tif (plugin && plugin.api && plugin.api.options) {\r\n\t\t\t\t\t\tplugin.api.options.devToolsEnabled = false\r\n\t\t\t\t\t}\r\n\t\t\t\t},\r\n\t\t\t},\r\n\t\t\tUnoCSS(),\r\n\t\t\tAutoImport({\r\n\t\t\t\timports: ['vue', 'uni-app'],\r\n\t\t\t\tdts: 'src/types/auto-import.d.ts',\r\n\t\t\t\tdirs: ['src/hooks'], // \u81EA\u52A8\u5BFC\u5165 hooks\r\n\t\t\t\tvueTemplate: true, // default false\r\n\t\t\t}),\r\n\t\t\t// Optimization \u63D2\u4EF6\u9700\u8981 page.json \u6587\u4EF6\uFF0C\u6545\u5E94\u5728 UniPages \u63D2\u4EF6\u4E4B\u540E\u6267\u884C\r\n\t\t\tOptimization({\r\n\t\t\t\tenable: {\r\n\t\t\t\t\t'optimization': true,\r\n\t\t\t\t\t'async-import': true,\r\n\t\t\t\t\t'async-component': true,\r\n\t\t\t\t},\r\n\t\t\t\tdts: {\r\n\t\t\t\t\tbase: 'src/types',\r\n\t\t\t\t},\r\n\t\t\t\tlogger: false,\r\n\t\t\t}),\r\n\r\n\t\t\tViteRestart({\r\n\t\t\t\t// \u901A\u8FC7\u8FD9\u4E2A\u63D2\u4EF6\uFF0C\u5728\u4FEE\u6539vite.config.js\u6587\u4EF6\u5219\u4E0D\u9700\u8981\u91CD\u65B0\u8FD0\u884C\u4E5F\u751F\u6548\u914D\u7F6E\r\n\t\t\t\trestart: ['vite.config.js'],\r\n\t\t\t}),\r\n\t\t\t// h5\u73AF\u5883\u589E\u52A0 BUILD_TIME \u548C BUILD_BRANCH\r\n\t\t\tUNI_PLATFORM === 'h5' && {\r\n\t\t\t\tname: 'html-transform',\r\n\t\t\t\ttransformIndexHtml(html) {\r\n\t\t\t\t\treturn html.replace('%BUILD_TIME%', dayjs().format('YYYY-MM-DD HH:mm:ss'))\r\n\t\t\t\t},\r\n\t\t\t},\r\n\t\t\t// \u6253\u5305\u5206\u6790\u63D2\u4EF6\uFF0Ch5 + \u751F\u4EA7\u73AF\u5883\u624D\u5F39\u51FA\r\n\t\t\tUNI_PLATFORM === 'h5'\r\n\t\t\t&& mode === 'production'\r\n\t\t\t&& visualizer({\r\n\t\t\t\tfilename: './node_modules/.cache/visualizer/stats.html',\r\n\t\t\t\topen: true,\r\n\t\t\t\tgzipSize: true,\r\n\t\t\t\tbrotliSize: true,\r\n\t\t\t}),\r\n\t\t\t// \u53EA\u6709\u5728 app \u5E73\u53F0\u65F6\u624D\u542F\u7528 copyNativeRes \u63D2\u4EF6\r\n\t\t\t// UNI_PLATFORM === 'app' && copyNativeRes(),\r\n\t\t\tComponents({\r\n\t\t\t\textensions: ['vue'],\r\n\t\t\t\tdeep: true, // \u662F\u5426\u9012\u5F52\u626B\u63CF\u5B50\u76EE\u5F55\uFF0C\r\n\t\t\t\tdirectoryAsNamespace: false, // \u662F\u5426\u628A\u76EE\u5F55\u540D\u4F5C\u4E3A\u547D\u540D\u7A7A\u95F4\u524D\u7F00\uFF0Ctrue \u65F6\u7EC4\u4EF6\u540D\u4E3A \u76EE\u5F55\u540D+\u7EC4\u4EF6\u540D\uFF0C\r\n\t\t\t\tdts: 'src/types/components.d.ts', // \u81EA\u52A8\u751F\u6210\u7684\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u8DEF\u5F84\uFF08\u7528\u4E8E TypeScript \u652F\u6301\uFF09\r\n\t\t\t}),\r\n\t\t\tUni(),\r\n\t\t],\r\n\t\tdefine: {\r\n\t\t\t__UNI_PLATFORM__: JSON.stringify(UNI_PLATFORM),\r\n\t\t\t__VITE_APP_PROXY__: JSON.stringify(VITE_APP_PROXY),\r\n\t\t},\r\n\t\tcss: {\r\n\t\t\tpostcss: {\r\n\t\t\t\tplugins: [\r\n\t\t\t\t\t// autoprefixer({\r\n\t\t\t\t\t//   // \u6307\u5B9A\u76EE\u6807\u6D4F\u89C8\u5668\r\n\t\t\t\t\t//   overrideBrowserslist: ['> 1%', 'last 2 versions'],\r\n\t\t\t\t\t// }),\r\n\t\t\t\t],\r\n\t\t\t},\r\n\t\t},\r\n\r\n\t\tresolve: {\r\n\t\t\talias: {\r\n\t\t\t\t'@': path.join(process.cwd(), './src'),\r\n\t\t\t\t'@img': path.join(process.cwd(), './src/static/images'),\r\n\t\t\t},\r\n\t\t},\r\n\t\tserver: {\r\n\t\t\thost: '0.0.0.0',\r\n\t\t\thmr: true,\r\n\t\t\tport: Number.parseInt(VITE_APP_PORT, 10),\r\n\t\t\t// \u4EC5 H5 \u7AEF\u751F\u6548\uFF0C\u5176\u4ED6\u7AEF\u4E0D\u751F\u6548\uFF08\u5176\u4ED6\u7AEF\u8D70build\uFF0C\u4E0D\u8D70devServer)\r\n\t\t\tproxy: JSON.parse(VITE_APP_PROXY)\r\n\t\t\t\t? {\r\n\t\t\t\t\t[VITE_APP_PROXY_PREFIX]: {\r\n\t\t\t\t\t\ttarget: VITE_SERVER_BASEURL,\r\n\t\t\t\t\t\tchangeOrigin: true,\r\n\t\t\t\t\t\trewrite: path => path.replace(new RegExp(`^${VITE_APP_PROXY_PREFIX}`), ''),\r\n\t\t\t\t\t},\r\n\t\t\t\t}\r\n\t\t\t\t: undefined,\r\n\t\t},\r\n\t\tesbuild: {\r\n\t\t\tdrop: VITE_DELETE_CONSOLE === 'true' ? ['console', 'debugger'] : ['debugger'],\r\n\t\t},\r\n\t\tbuild: {\r\n\t\t\tsourcemap: false,\r\n\t\t\t// \u65B9\u4FBF\u975Eh5\u7AEF\u8C03\u8BD5\r\n\t\t\t// sourcemap: VITE_SHOW_SOURCEMAP === 'true', // \u9ED8\u8BA4\u662Ffalse\r\n\t\t\ttarget: 'es6',\r\n\t\t\t// \u5F00\u53D1\u73AF\u5883\u4E0D\u7528\u538B\u7F29\r\n\t\t\tminify: mode === 'development' ? false : 'esbuild',\r\n\r\n\t\t},\r\n\t})\r\n}\r\n"],
  "mappings": "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",
  "names": ["path"]
}
