@tplc/business 0.2.50 → 0.2.52

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 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.2.52](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.51...v0.2.52) (2025-01-02)
+
+
+### ✨ Features | 新功能
+
+* 兼容location ([cfeae91](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/cfeae9129e034ecec8055d930255894bfa05ebd9))
+
+### [0.2.51](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.50...v0.2.51) (2025-01-02)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.2.47 ([47cc32b](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/47cc32b906ccffb611a235174e92f6abc7a3f3da))
+* **release:** 0.2.48 ([a5124e2](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/a5124e26342e7b2f597f1f3e187841fd975b5467))
+* **release:** 0.2.49 ([0cf9dae](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/0cf9dae889de78c64ac86bfc538a07dcce46ce39))
+* **release:** 0.2.50 ([61b87b8](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/61b87b87b7630c164c5603e2dfb98c393de7c744))
+
+
+### ✨ Features | 新功能
+
+* home-search cityName ([265572a](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/265572a3c7b2dc5a9ff203129551df0ec2a6dd20))
+* sheet city-select 调整底部 ([e048be0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/e048be0036c72a7648a8434bdfa66fd570df3bf4))
+* 修复问题 ([2c67644](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/2c67644cc03e4f88b8e0f5aac2f8837c9317f7ec))
+* 修复问题 ([1c9f269](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1c9f269c95b79e67abeec8af5b309d765069fd3a))
+* 修改打包方式 ([9580a78](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9580a789d427c2db7e07c493c36f7f03258d1462))
+* 处理地址字段切换 ([27dd10e](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/27dd10e9d609b88560dcb6671503035199e30d08))
+
 ### [0.2.50](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.49...v0.2.50) (2025-01-01)
 
 

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

@@ -71,28 +71,19 @@ const { getLocation, userLocation } = useLocation()
 watch(
   () => addressCity.value,
   (val) => {
-    form!.value = {
-      ...form!.value,
-      cityId: val?.cityId,
-    }
+    if (val) form.value.cityId = val?.cityId
   },
 )
 watch(
   () => dayRange.value,
   (val) => {
-    form!.value = {
-      ...form!.value,
-      startDate: dayjs(val[0]).format('YYYY-MM-DD'),
-      endDate: dayjs(val[1]).format('YYYY-MM-DD'),
-    }
+    form.value.startDate = dayjs(val[0]).format('YYYY-MM-DD')
+    form.value.endDate = dayjs(val[1]).format('YYYY-MM-DD')
   },
 )
 getLocation()
 const onSearch = (e) => {
-  form.value = {
-    ...form.value,
-    keywords: e.detail.value,
-  }
+  form.value.keywords = e.target.value
 }
 </script>
 

package/components/lcb-city-select/api/index.ts

@@ -1,6 +1,7 @@
 export interface HotAddress {
   categoryName: string
   hint?: string
+  tips?: string
   childHotAddress: ChildHotAddress[]
 }
 
@@ -11,8 +12,10 @@ export interface ChildHotAddress {
   categoryName: string
   createDate?: string
   hotAddressId: string
+  icon?: string
   lastModifyDate?: string
   latitude?: string
+  className?: string
   cityId: string
   longitude?: string
   weightSort: string

package/components/lcb-city-select/components/lcb-city-letter/index.vue

@@ -26,6 +26,7 @@
             class="address-tag"
             :class="{
               'current-address': modelValue && modelValue.cityId === city.cityId,
+              [city.className || '']: true,
             }"
             v-for="city in item.childHotAddress"
             :key="city.addr"
@@ -34,9 +35,17 @@
               fontSize: city.addr.length > 4 ? '20rpx' : '24rpx',
             }"
           >
+            <wd-icon v-if="city.icon" :name="city.icon" class="mr-0.5" />
             {{ city.addr }}
           </view>
         </view>
+        <view
+          v-if="item.tips"
+          class="flex items-center text-red-5 text-3 gap-1 px-28rpx box-border mt-3"
+        >
+          <wd-icon name="error-circle" size="28rpx"></wd-icon>
+          <view>{{ item.tips }}</view>
+        </view>
       </view>
     </wd-index-bar>
   </view>
@@ -75,11 +84,17 @@ const locationAddress = computed<HotAddress[]>(() => {
         {
           categoryName: '定位',
           hint: '当前位置',
+          tips: props.location.haveNotTip || '当前地址未开通',
           childHotAddress: [
             {
-              addressInfo: props.location.addressInfo,
-              addr: props.location.cityName,
-              cityId: props.location.cityId,
+              addr: props.location.haveNotCityName || props.location.cityName,
+              cityId: props.location.haveNotCityId || props.location.cityId,
+              icon: 'location',
+            },
+            {
+              addr: props.location.haveNotAddressInfo || props.location.addressInfo,
+              cityId: props.location.haveNotCityId || props.location.cityId,
+              className: 'w-25',
             },
           ],
         },

package/components/lcb-city-select/lcb-city-select.vue

@@ -72,7 +72,6 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-const isTabBar = uni.$lcb.getIsTabbar()
 const props = withDefaults(defineProps<LcbCitySelectProps>(), {
   placeholder: '搜索城市/区域/景点',
 })

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

@@ -52,7 +52,7 @@
           :placeholder="placeholder"
           v-model="form.keywords"
         />
-        <view class="justify-center flex flex-col items-center" @click="getLocation">
+        <view class="justify-center flex flex-col items-center" @click="getLocation(true)">
           <wd-loading size="30rpx" v-if="locationIng" />
           <img
             class="w-30rpx h-30rpx"
@@ -145,6 +145,8 @@ const form = reactive({
   startDate: '',
   endDate: '',
   cityId: '',
+  addr: '',
+  cityName: '',
 })
 
 // 今天 明天 后天  周...
@@ -173,6 +175,7 @@ watchEffect(() => {
 watchEffect(() => {
   if (addressCity.value) {
     form.cityId = addressCity.value.cityId
+    form.addr = addressCity.value.addr
   }
 })
 </script>

package/components/lcb-list/components/FilterSlider/index.vue

@@ -12,6 +12,7 @@
       custom-class="px-4"
       custom-min-class="left-0  slider-text"
       custom-max-class="right--2 slider-text"
+      :active-color="themeColor"
     />
     <view class="grid grid-cols-4 gap-4 mt-2" v-if="options.length">
       <SelectTagView
@@ -29,7 +30,7 @@
 <script setup lang="ts">
 import { FilterSliderProps } from './types'
 import SelectTagView from '../SelectTagView/index.vue'
-import { onMounted, onUnmounted, ref, watch } from 'vue'
+import { onMounted, onUnmounted, ref, watch, inject } from 'vue'
 import type { SliderInstance } from '@tplc/wot/components/wd-slider/types'
 defineOptions({
   name: 'FilterSlider',
@@ -39,6 +40,7 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
+const themeColor = inject('theme-color', '#3875FF')
 const slider = ref<SliderInstance>()
 const props = defineProps<FilterSliderProps>()
 const model = defineModel<number[]>()

package/hooks/useLocation.api.ts

@@ -2,6 +2,10 @@ export interface UserLocation {
   addressInfo: string
   cityId: string
   cityName: string
+  haveNotCityId: string
+  haveNotCityName: string
+  haveNotAddressInfo: string
+  haveNotTip: string
 }
 export const getUserLocation = (data: { userLongitude: string; userLatitude: string }) =>
   uni.$lcb.http.post<UserLocation>('/hotAddress/userLocation', data)

package/hooks/useLocation.ts

@@ -1,10 +1,10 @@
 import { useTranslate } from '@tplc/wot'
 import { ref } from 'vue'
 import { getUserLocation, UserLocation } from './useLocation.api'
-
+const currentLocation = ref<UserLocation>()
 const useLocation = () => {
   const { translate } = useTranslate()
-  const userLocation = ref<UserLocation>()
+  const userLocation = ref<UserLocation | undefined>(currentLocation.value)
   // 正在获取经纬度
   const locationIng = ref(false)
   // 检查用户是否授权定位
@@ -41,22 +41,22 @@ const useLocation = () => {
     })
   }
 
-  const getLocation = async () => {
+  const getLocation = async (force = false) => {
+    // 如果不是force并且当前位置有值，则不刷新
+    if (!force && currentLocation.value) return
     if ((await checkLocationPermission()) !== false) {
       locationIng.value = true
-      console.log('开始获取位置信息')
       uni.getLocation({
         // type: 'gcj02',
         // type: 'wgs84',
         success: function (res) {
-          console.log('当前位置的经度：' + res.longitude)
-          console.log('当前位置的纬度：' + res.latitude)
           getUserLocation({
             userLongitude: res.longitude.toString(),
             userLatitude: res.latitude.toString(),
           })
             .then((res) => {
               userLocation.value = res.data
+              currentLocation.value = res.data
             })
             .finally(() => {
               locationIng.value = false
@@ -68,7 +68,6 @@ const useLocation = () => {
         },
       })
     } else {
-      console.log('开始获取位2置信息')
       navigateToSettings()
     }
   }

package/package.json

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

package/types/components/lcb-city-select/api/index.d.ts

@@ -1,6 +1,7 @@
 export interface HotAddress {
   categoryName: string
   hint?: string
+  tips?: string
   childHotAddress: ChildHotAddress[]
 }
 export interface ChildHotAddress {
@@ -10,8 +11,10 @@ export interface ChildHotAddress {
   categoryName: string
   createDate?: string
   hotAddressId: string
+  icon?: string
   lastModifyDate?: string
   latitude?: string
+  className?: string
   cityId: string
   longitude?: string
   weightSort: string

package/types/hooks/useLocation.api.d.ts

@@ -2,6 +2,10 @@ export interface UserLocation {
   addressInfo: string
   cityId: string
   cityName: string
+  haveNotCityId: string
+  haveNotCityName: string
+  haveNotAddressInfo: string
+  haveNotTip: string
 }
 export declare const getUserLocation: (data: {
   userLongitude: string

package/types/hooks/useLocation.d.ts

@@ -1,7 +1,17 @@
-import { UserLocation } from './useLocation.api'
 declare const useLocation: () => {
-  getLocation: () => Promise<void>
+  getLocation: (force?: boolean) => Promise<void>
   locationIng: import('vue').Ref<boolean>
-  userLocation: import('vue').Ref<UserLocation | undefined>
+  userLocation: import('vue').Ref<
+    | {
+        addressInfo: string
+        cityId: string
+        cityName: string
+        haveNotCityId: string
+        haveNotCityName: string
+        haveNotAddressInfo: string
+        haveNotTip: string
+      }
+    | undefined
+  >
 }
 export default useLocation