@tplc/business 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -2,6 +2,37 @@
 
 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.5](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.3...v0.2.5) (2024-12-02)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.2.4 ([10b9b0f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/10b9b0f905f3f29d13f4ebff43db68baeabc8ec1))
+
+
+### ✨ Features | 新功能
+
+* 修改icon ([9fc14e0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9fc14e02d6a2ac3030ab86d1c5460e40929b51eb))
+* 新增lcb-search params ([f80d853](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/f80d853bfb96c24f09ea16b054ee8e83cc18690e))
+* 新增map ([4e97876](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/4e97876c4f74632bb3b2c7c106a21024d33d57bd))
+* 订单跳转 ([3e89c5c](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/3e89c5c21b20c200e75037422ff3d9453b80225b))
+
+### [0.2.4](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.2...v0.2.4) (2024-11-28)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.1.16 ([2c69e6f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/2c69e6f2099187fa852420c52bca155c1b3a9368))
+* **release:** 0.1.22 ([0b4e25d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/0b4e25da273d86d8f014beb487d8d213504c6527))
+* **release:** 0.2.1 ([bc2cd3d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/bc2cd3dea73e5f07aac983749c7d19e1df477cbf))
+* **release:** 0.2.3 ([75a3b55](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/75a3b55df8890b5fc914c79b4a200e1cf3a8d176))
+
+
+### ✨ Features | 新功能
+
+* lcb-image 支持height ([1631e5f](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/1631e5fc1505748ed9db83aee52f27c4a80a29c2))
+* 修改icon ([9fc14e0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/9fc14e02d6a2ac3030ab86d1c5460e40929b51eb))
+
 ### [0.2.3](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.1...v0.2.3) (2024-11-28)
 
 

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

@@ -26,7 +26,14 @@
         <view class="text-#999999">{{ placeholder }}</view>
       </view>
     </view>
-    <wd-icon name="search" size="36rpx" color="#333" custom-class="ml-4" />
+    <wd-icon
+      name="dianwei"
+      class-prefix="lcb"
+      size="36rpx"
+      color="#333"
+      custom-class="ml-4"
+      @click="toMap"
+    />
   </lcb-block>
 </template>
 
@@ -34,9 +41,10 @@
 import { useTranslate } from '@tplc/wot'
 import dayjs from 'dayjs/esm'
 import useLocation from '../../hooks/useLocation'
-import { ref } from 'vue'
+import { inject, Ref, ref, watch } from 'vue'
 import { LcbCalendarSearchProps } from './types'
 import { ChildHotAddress } from '../lcb-city-select/api'
+import { FORM_KEY } from '../../constants'
 defineOptions({
   name: 'LcbCalendarSearch',
   options: {
@@ -52,11 +60,33 @@ withDefaults(defineProps<LcbCalendarSearchProps>(), {
   icon: 'search',
 })
 const addressCity = ref<ChildHotAddress>()
-
+const form = inject<Ref<Record<string, any>>>(FORM_KEY)
 const dayRange = ref([dayjs().valueOf(), dayjs().add(1, 'day').valueOf()])
 const { translate } = useTranslate()
 const { getLocation, userLocation } = useLocation()
+watch(
+  () => addressCity.value,
+  (val) => {
+    form!.value = {
+      ...form!.value,
+      hotAddressId: val?.hotAddressId,
+    }
+  },
+)
+watch(
+  () => dayRange.value,
+  (val) => {
+    form!.value = {
+      ...form!.value,
+      checkInDate: dayjs(val[0]).format('YYYY-MM-DD'),
+      checkOutDate: dayjs(val[1]).format('YYYY-MM-DD'),
+    }
+  },
+)
 getLocation()
+const toMap = () => {
+  uni.$lcb.navigateTo(`/pages/map/index?form=${JSON.stringify(form?.value)}`)
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -15,11 +15,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, getCurrentInstance, onMounted, ref, watch, watchEffect } from 'vue'
+import { inject, Ref, ref, watch, watchEffect } from 'vue'
 import useZPaging from 'z-paging/components/z-paging/js/hooks/useZPaging'
-import { LcbFilterListProps } from './type'
+import { FORM_KEY } from '../../../../constants'
 import { formatJson } from '../../../../utils/utils'
-import { getRect, isH5 } from '@tplc/wot/components/common/util'
+import { LcbFilterListProps } from './type'
+import useAutoHeight from '../../../../hooks/useAutoHeight'
 
 defineOptions({
   name: 'FilterList',
@@ -32,8 +33,8 @@ defineOptions({
 const props = defineProps<LcbFilterListProps>()
 const dataList = ref<unknown[]>([])
 const paging = ref()
-const viewPageHeight = uni.getSystemInfoSync().windowHeight
-const height = ref('')
+const height = useAutoHeight()
+const form = inject<Ref<Record<string, any>>>(FORM_KEY)
 useZPaging(paging)
 const modelValue = defineModel<unknown[]>({
   default: [],
@@ -83,7 +84,7 @@ const queryList = async (page: number, limit: number) => {
   try {
     const { data } = await uni.$lcb.http.post(props.url, {
       ...props.baseParam,
-      ...props.filter,
+      ...form?.value,
       pageSearch: {
         limit,
         page,
@@ -94,17 +95,6 @@ const queryList = async (page: number, limit: number) => {
     paging.value.complete(false)
   }
 }
-const { proxy } = getCurrentInstance() as any
-const isTabBar = uni.$lcb.getIsTabbar()
-onMounted(() => {
-  getRect(`#pagingTop`, false, proxy).then((res) => {
-    if (!isTabBar || isH5) {
-      height.value = `${viewPageHeight - (res.top || 0)}px`
-    } else {
-      height.value = `calc(${viewPageHeight - (res.top || 0)}px - var(--window-bottom) - env(safe-area-inset-bottom))`
-    }
-  })
-})
 </script>
 <style lang="scss" scoped>
 .action-view {

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

@@ -19,9 +19,10 @@
     />
 
     <FilterList
-      v-bind="{ ...info.listInfo, listType, filter, ...attrs }"
+      v-bind="{ ...info.listInfo, listType, ...attrs }"
       :autoHeight="!isSticky"
       v-model="items"
+      v-if="mode === 'list'"
     >
       <slot name="list" :items="items" v-if="$slots.list" />
       <template v-else>
@@ -66,6 +67,7 @@ const props = withDefaults(defineProps<LcbListProps>(), {
   styleMode: 'default',
   listType: 'list',
   isSticky: true,
+  mode: 'list',
   // @ts-ignore
   pageListProps: () => ({
     productProps: {

package/components/lcb-list/types.ts

@@ -8,6 +8,7 @@ export interface LcbListProps {
   styleMode?: 'default' | 'plain'
   listType?: LcbProductProps['listType']
   isSticky?: boolean
+  mode?: 'map' | 'list'
 }
 export interface Option {
   label: string

package/components/lcb-map/lcb-map.vue

@@ -0,0 +1,203 @@
+<template>
+  <view class="flex-col flex h-full w-full">
+    <view class="flex-1 h-0 relative">
+      <map
+        style="width: 100%; height: 100%"
+        :latitude="form.latitude"
+        :longitude="form.longitude"
+        :markers="info.covers"
+        show-location
+        show-compass
+        show-scale
+        @regionchange="onRegionChange"
+        @markertap="onMarkerTap"
+      />
+      <image
+        src="../../static/images/2.png"
+        class="w-36rpx h-66rpx absolute z-1 left-0 top-0 m-auto bottom-0 right-0"
+      />
+      <view class="absolute bottom-0 left-0 p-3 w-full box-border" v-if="data?.[current]">
+        <view class="card w-full !p-0">
+          <lcb-product-item :item="data?.[current]" />
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { FORM_KEY } from '@tplc/business/constants'
+import { getJsonStrFirstUrl } from 'utils/transform'
+import { reactive, inject, ref } from 'vue'
+import { LcbMapProps } from './types'
+export interface MapMarker {
+  id: number
+  name?: string
+  longitude: number
+  latitude: number
+  iconPath: string
+  width: number
+  height: number
+  poiId: string
+  anchor?: {
+    x: number
+    y: number
+  }
+  callout?: {
+    content: string
+    color: string
+    fontSize: number
+    borderRadius: number
+    bgColor: string
+    padding: number
+    display: 'ALWAYS' | 'BYCLICK'
+  }
+  zIndex?: number
+}
+defineOptions({
+  name: 'LcbMap',
+  options: {
+    addGlobalClass: true,
+    virtualHost: true,
+    styleIsolation: 'shared',
+  },
+})
+defineProps<LcbMapProps>()
+const scaleRadius: Record<string, number> = {
+  3: 1_000_000,
+  4: 500_000,
+  5: 200_000,
+  6: 100_000,
+  7: 50_000,
+  8: 25_000,
+  9: 20_000,
+  10: 10_000,
+  11: 5_000,
+  12: 2_000,
+  13: 1_000,
+  14: 500,
+  15: 200,
+  16: 100,
+  17: 50,
+  18: 20,
+  19: 10,
+  20: 5,
+}
+const info = reactive({
+  covers: [] as MapMarker[],
+})
+const form = inject<Record<string, any>>(FORM_KEY, {})
+const current = ref(0)
+const data = ref<any[]>([])
+const getData = async () => {
+  const { data: list } = await uni.$lcb.http.post<any[]>('/productInfo/map', form.value)
+  data.value = list
+  getCurrentData(list[0], list.slice(1, list.length))
+}
+
+const getLocation = () => {
+  uni.getLocation({
+    type: 'gcj02',
+    success: (res) => {
+      form.value.userLongitude = res.longitude
+      form.value.userLatitude = res.latitude
+      form.value.mapLatitude = res.latitude
+      form.value.mapLongitude = res.longitude
+      getData()
+    },
+    fail: () => {
+      uni.showToast({
+        title: '定位失败',
+        icon: 'none',
+      })
+    },
+  })
+}
+getLocation()
+const onRegionChange = (e: {
+  type: string
+  detail: {
+    scale: number
+    centerLocation: {
+      latitude: number
+      longitude: number
+    }
+  }
+}) => {
+  if (e.type === 'end') {
+    form.value.scale = e.detail.scale
+    form.value.mapLatitude = e.detail.centerLocation.latitude
+    form.value.mapLongitude = e.detail.centerLocation.longitude
+    form.value.mapViewRadius = scaleRadius[e.detail.scale]
+    getData()
+  }
+}
+const onMarkerTap = (e: { markerId: number }) => {
+  const marker = info.covers.find((item) => item?.id === e.markerId)
+  if (marker) {
+    const item = data.value?.find((item) => item?.poiId === marker.poiId)
+    const firstMarker = info.covers[0]!
+    getCurrentData(item, [
+      {
+        ...firstMarker,
+        id: e.markerId,
+        iconPath: '../../static/images/4.png',
+        width: 26,
+        height: 26,
+      },
+      ...info.covers.filter((item) => ![1, 2, e.markerId].includes(item.id)),
+    ])
+  }
+}
+const getCurrentData = (item: any, list: MapMarker[]) => {
+  uni.downloadFile({
+    url:
+      getJsonStrFirstUrl(item.coverImg) +
+      '?x-oss-process=image/resize,m_fixed,w_64,h_64/circle,r_100/format,png',
+    success: (res) => {
+      info.covers = [
+        {
+          id: 1,
+          iconPath: '../../static/images/3.png',
+          width: 42,
+          height: 49,
+          anchor: {
+            x: 0.5,
+            y: 0.78,
+          },
+          poiId: item.poiId,
+          latitude: item.latitude,
+          longitude: item.longitude,
+        },
+        {
+          zIndex: 2,
+          iconPath: res.tempFilePath,
+          width: 34,
+          height: 34,
+          id: 2,
+          poiId: item.poiId,
+          latitude: item.latitude,
+          longitude: item.longitude,
+        },
+        ...list.map((item: any, index: number) => ({
+          id: index + 3,
+          iconPath: '../../static/images/4.png',
+          width: 26,
+          height: 26,
+          poiId: item.poiId,
+          latitude: item.latitude,
+          longitude: item.longitude,
+        })),
+      ]
+      console.log(item.poiId, data.value)
+      current.value = data.value?.findIndex?.(({ poiId }) => item.poiId === poiId) || -1
+    },
+  })
+}
+</script>
+
+<style>
+page {
+  background-color: #f7f7f7;
+}
+</style>

package/components/lcb-map/types.ts

@@ -0,0 +1,3 @@
+export interface LcbMapProps {
+  // Define the component's prop types here
+}

package/components/lcb-user-order/lcb-user-order.vue

@@ -62,7 +62,7 @@ defineOptions({
 })
 const onClick = (item: IIconList) => {
   uni.navigateTo({
-    url: `/pages/order/index?status=${item.status}`,
+    url: `/pages-sub/order/list?orderStatus=${item.status}`,
   })
 }
 const props = withDefaults(defineProps<LcbUserOrderProps>(), {

package/global.d.ts

@@ -18,6 +18,7 @@ declare module 'vue' {
     'lcb-image': (typeof import('./types/components/lcb-image/lcb-image.vue'))['default']
     'lcb-img-nav': (typeof import('./types/components/lcb-img-nav/lcb-img-nav.vue'))['default']
     'lcb-list': (typeof import('./types/components/lcb-list/lcb-list.vue'))['default']
+    'lcb-map': (typeof import('./types/components/lcb-map/lcb-map.vue'))['default']
     'lcb-nav': (typeof import('./types/components/lcb-nav/lcb-nav.vue'))['default']
     'lcb-notice': (typeof import('./types/components/lcb-notice/lcb-notice.vue'))['default']
     'lcb-product': (typeof import('./types/components/lcb-product/lcb-product.vue'))['default']

package/hooks/useAutoHeight.ts

@@ -0,0 +1,20 @@
+import { getRect, isH5 } from '@tplc/wot/components/common/util'
+import { getCurrentInstance, onMounted, ref } from 'vue'
+
+const useAutoHeight = () => {
+  const { proxy } = getCurrentInstance() as any
+  const isTabBar = uni.$lcb.getIsTabbar()
+  const viewPageHeight = uni.getSystemInfoSync().windowHeight
+  const height = ref('')
+  onMounted(() => {
+    getRect(`#pagingTop`, false, proxy).then((res) => {
+      if (!isTabBar || isH5) {
+        height.value = `${viewPageHeight - (res.top || 0)}px`
+      } else {
+        height.value = `calc(${viewPageHeight - (res.top || 0)}px - var(--window-bottom) - env(safe-area-inset-bottom))`
+      }
+    })
+  })
+  return height
+}
+export default useAutoHeight

package/iconfonts/index.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: 'lcb'; /* Project id 4710234 */
   src:
-    url('//at.alicdn.com/t/c/font_4710234_0mlehmv59ri.woff2?t=1732780214312') format('woff2'),
-    url('//at.alicdn.com/t/c/font_4710234_0mlehmv59ri.woff?t=1732780214312') format('woff'),
-    url('//at.alicdn.com/t/c/font_4710234_0mlehmv59ri.ttf?t=1732780214312') format('truetype');
+    url('//at.alicdn.com/t/c/font_4710234_c6jvaimqgn5.woff2?t=1733119653266') format('woff2'),
+    url('//at.alicdn.com/t/c/font_4710234_c6jvaimqgn5.woff?t=1733119653266') format('woff'),
+    url('//at.alicdn.com/t/c/font_4710234_c6jvaimqgn5.ttf?t=1733119653266') format('truetype');
 }
 
 .lcb {
@@ -14,6 +14,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.lcb-dingwei:before {
+  content: '\e66c';
+}
+
+.lcb-you:before {
+  content: '\e66d';
+}
+
+.lcb-youbian:before {
+  content: '\e66e';
+}
+
+.lcb-zuobian:before {
+  content: '\e66f';
+}
+
+.lcb-zuo:before {
+  content: '\e670';
+}
+
 .lcb-a-:before {
   content: '\e66b';
 }

package/package.json

@@ -1,26 +1,17 @@
 {
   "name": "@tplc/business",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "keywords": [
     "业务组件"
   ],
   "type": "module",
-  "scripts": {
-    "pub": "pnpm dts && pnpm publish --no-git-checks",
-    "dts": "rm -rf types && vue-tsc  --project ./tsconfig.dts.json && pnpm prettier --write types",
-    "release-major": "standard-version --release-as major ",
-    "release-minor": "standard-version --release-as minor",
-    "release-patch": "standard-version --release-as patch ",
-    "generateComponent": "node ./scripts/createComponent.mjs",
-    "generateGlobalDts": "node ./scripts/generateGlobalDts.mjs"
-  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "peerDependencies": {
-    "@tplc/wot": "workspace:*",
-    "vue": ">=3.2.47"
+    "vue": ">=3.2.47",
+    "@tplc/wot": "0.1.42"
   },
   "engines": {
     "node": ">=18",
@@ -33,5 +24,14 @@
   },
   "devDependencies": {
     "standard-version": "^9.5.0"
+  },
+  "scripts": {
+    "pub": "pnpm dts && pnpm publish --no-git-checks",
+    "dts": "rm -rf types && vue-tsc  --project ./tsconfig.dts.json && pnpm prettier --write types",
+    "release-major": "standard-version --release-as major ",
+    "release-minor": "standard-version --release-as minor",
+    "release-patch": "standard-version --release-as patch ",
+    "generateComponent": "node ./scripts/createComponent.mjs",
+    "generateGlobalDts": "node ./scripts/generateGlobalDts.mjs"
   }
-}
+}

package/types/components/lcb-list/lcb-list.vue.d.ts

@@ -22,6 +22,7 @@ declare const __VLS_component: import('vue').DefineComponent<
     import('vue').ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<LcbListProps>, any>>
   >,
   {
+    mode: 'map' | 'list'
     listType: 'list' | 'horizontal' | 'grid' | 'waterfall'
     pageFilterType: string
     pageListProps: import('./components/FilterList/type').PageListProps

package/types/components/lcb-list/types.d.ts

@@ -7,6 +7,7 @@ export interface LcbListProps {
   styleMode?: 'default' | 'plain'
   listType?: LcbProductProps['listType']
   isSticky?: boolean
+  mode?: 'map' | 'list'
 }
 export interface Option {
   label: string

package/types/components/lcb-map/lcb-map.vue.d.ts

@@ -0,0 +1,56 @@
+export interface MapMarker {
+  id: number
+  name?: string
+  longitude: number
+  latitude: number
+  iconPath: string
+  width: number
+  height: number
+  poiId: string
+  anchor?: {
+    x: number
+    y: number
+  }
+  callout?: {
+    content: string
+    color: string
+    fontSize: number
+    borderRadius: number
+    bgColor: string
+    padding: number
+    display: 'ALWAYS' | 'BYCLICK'
+  }
+  zIndex?: number
+}
+declare const _default: import('vue').DefineComponent<
+  Readonly<
+    import('vue').ComponentPropsOptions<{
+      [x: string]: unknown
+    }>
+  >,
+  {},
+  unknown,
+  {},
+  {},
+  import('vue').ComponentOptionsMixin,
+  import('vue').ComponentOptionsMixin,
+  {},
+  string,
+  import('vue').PublicProps,
+  | readonly string[]
+  | Readonly<
+      import('vue').ExtractPropTypes<
+        Readonly<
+          import('vue').ComponentObjectPropsOptions<{
+            [x: string]: unknown
+          }>
+        >
+      >
+    >,
+  | {
+      readonly [x: number]: string
+    }
+  | {},
+  {}
+>
+export default _default

package/types/components/lcb-map/types.d.ts

@@ -0,0 +1 @@
+export interface LcbMapProps {}

package/types/hooks/useAutoHeight.d.ts

@@ -0,0 +1,2 @@
+declare const useAutoHeight: () => import('vue').Ref<string>
+export default useAutoHeight