@tplc/business 0.3.40 → 0.3.41

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.3.41](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.40...v0.3.41) (2025-02-12)
+
 ### [0.3.40](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.39...v0.3.40) (2025-02-12)
 
 ### [0.3.39](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.3.38...v0.3.39) (2025-02-12)

package/components/lcb-calendar-search/lcb-calendar-search.vue

@@ -77,24 +77,15 @@ watch(
   (val) => {
     if (val) {
       form.value.cityId = val?.cityId
+      form.value.userLatitude = userLatLon.value?.latitude
+      form.value.userLongitude = userLatLon.value?.longitude
       if (val.keywords) {
         form.value.keywords = val.keywords
       }
     }
   },
 )
-watch(
-  () => userLatLon.value,
-  (val) => {
-    if (!val) return
-    form.value.userLatitude = val.latitude
-    form.value.userLongitude = val.longitude
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
+
 watch(
   () => dayRange.value,
   (val) => {

package/hooks/useLocation.ts

@@ -5,8 +5,6 @@ const currentLocation = ref<UserLocation>()
 const currentUserLatLon = ref<UniApp.GetLocationSuccess>()
 const useLocation = () => {
   const { translate } = useTranslate()
-  const userLocation = ref(currentLocation.value)
-  const userLatLon = ref(currentUserLatLon.value)
   // 正在获取经纬度
   const locationIng = ref(false)
   // 检查用户是否授权定位
@@ -58,13 +56,12 @@ const useLocation = () => {
         // type: 'gcj02',
         // type: 'wgs84',
         success: function (res) {
-          userLatLon.value = res
+          currentUserLatLon.value = res
           getUserLocation({
             userLongitude: res.longitude.toString(),
             userLatitude: res.latitude.toString(),
           })
             .then((res) => {
-              userLocation.value = res.data
               currentLocation.value = res.data
             })
             .finally(() => {
@@ -80,7 +77,7 @@ const useLocation = () => {
       navigateToSettings()
     }
   }
-  return { getLocation, locationIng, userLocation, userLatLon }
+  return { getLocation, locationIng, userLocation: currentLocation, userLatLon: currentUserLatLon }
 }
 
 export default useLocation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.3.40",
+  "version": "0.3.41",
   "keywords": [
     "业务组件"
   ],

package/types/hooks/useLocation.d.ts

@@ -1,31 +1,8 @@
+import { UserLocation } from './useLocation.api'
 declare const useLocation: () => {
   getLocation: (force?: boolean) => Promise<void>
   locationIng: import('vue').Ref<boolean>
-  userLocation: import('vue').Ref<
-    | {
-        addressInfo: string
-        cityId: string
-        cityName: string
-        haveNotCityId: string
-        haveNotCityName: string
-        haveNotAddressInfo: string
-        haveNotTip: string
-      }
-    | undefined
-  >
-  userLatLon: import('vue').Ref<
-    | {
-        latitude: number
-        longitude: number
-        speed: number
-        accuracy: number
-        altitude: number
-        verticalAccuracy: number
-        horizontalAccuracy: number
-        address?: any
-        errMsg?: string | undefined
-      }
-    | undefined
-  >
+  userLocation: import('vue').Ref<UserLocation | undefined>
+  userLatLon: import('vue').Ref<UniApp.GetLocationSuccess | undefined>
 }
 export default useLocation