@tplc/business 0.2.38 → 0.2.40

package/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 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.40](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.38...v0.2.40) (2024-12-27)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.2.39 ([188053e](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/188053edc4e98d208740c6a364aba343fa146f18))
+
+
+### ✨ Features | 新功能
+
+* 支持头像昵称 ([a1061f0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/a1061f0646637c797cdd2f5d9dbadd0862256398))
+* 新增测试waterfall ([34b352d](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/34b352dffc3fcc852a658e34ac673bd5d1c77a4d))
+* 更新product ([3fb575b](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/3fb575b7be9ec92b10c3cd36d19ee9593999bb4a))
+
+### [0.2.39](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.46...v0.2.39) (2024-12-27)
+
+
+### 🚀 Chore | 构建/工程依赖/工具
+
+* **release:** 0.1.47 ([b785621](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/b78562141021c6b4ed0568765004f6e4bc55fa32))
+* **release:** 0.2.37 ([19d81b9](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/19d81b9d3f6022e1c8523b258bf7793a6d3b133a))
+* **release:** 0.2.38 ([5acc214](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/5acc214f80be26f5f80bdfe282918019b43315ae))
+
+
+### ✨ Features | 新功能
+
+* calendar 尺寸 ([5670ca5](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/5670ca5fa482d9d0e57d32f15b9f7ab369210c3d))
+* 图片支持渐进式 ([08523e0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/08523e0eb244da1da3b46dca4d999360600edcf5))
+* 增加 lcb-product-item 图片展示类型选择 ([24706b3](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/24706b3e87aee2fc6d02961e35a82147974199c4))
+* 支持头像昵称 ([a1061f0](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/a1061f0646637c797cdd2f5d9dbadd0862256398))
+* 更新product ([3fb575b](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/3fb575b7be9ec92b10c3cd36d19ee9593999bb4a))
+
 ### [0.2.38](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.1.47...v0.2.38) (2024-12-26)
 
 

package/components/lcb-list/api.ts

@@ -2,7 +2,7 @@ import { FilterTabsProps } from './components/FilterTabs/type'
 import { Option } from './types'
 export interface LcbListInfo {
   url: string
-  baseParam: Record<string, unknown>
+  baseParam?: Record<string, unknown>
 }
 export interface LcbFilterResult {
   btnComponent: BtnComponent

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

@@ -18,7 +18,7 @@
 import { inject, Ref, ref, watch, watchEffect } from 'vue'
 import useZPaging from 'z-paging/components/z-paging/js/hooks/useZPaging'
 import { FORM_KEY } from '../../../../constants'
-import { formatJson, getPageOptions } from '../../../../utils/utils'
+import { getPageOptions } from '../../../../utils/utils'
 import { LcbFilterListProps } from './type'
 import useAutoHeight from '../../../../hooks/useAutoHeight'
 
@@ -40,33 +40,7 @@ const modelValue = defineModel<unknown[]>({
   default: [],
 })
 watchEffect(() => {
-  const list = dataList.value?.map?.((item: any) => {
-    return item
-    // // 以下假数据无效
-    // // const imgArr = formatJson(item.coverImg, [])
-    // // const tags = formatJson(item.tags, [])
-    // // eslint-disable-next-line no-unreachable
-    // return {
-    //   title: item?.productName,
-    //   addressIntro: item?.address,
-    //   price: item?.price,
-    //   priceSuffix: item?.behindUnit,
-    //   subTitle: '专用通道接送8分钟到候机楼',
-    //   score: 4.7,
-    //   scoreTips: '很好',
-    //   level: 4,
-    //   // imgCornerIcon: 'test',
-    //   // imgBottomIcon: 'test',
-    //   titleIcon: 'I',
-    //   userInteractionInfo: '2991点评 · 8039收藏',
-    //   orderTips: '18分钟前有人预定',
-    //   priceTips: '白银贵宾价 | 十亿豪补 | 2项优惠',
-    //   ...item,
-    //   // coverImg: imgArr?.[1] || imgArr?.[0],
-    //   // tags,
-    // }
-  })
-  modelValue.value = list
+  modelValue.value = dataList.value
 })
 
 watch(

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

@@ -45,6 +45,7 @@
         <lcb-product v-bind="{ ...attrs, form }" :listType="listType" :items="items" v-else />
       </template>
     </FilterList>
+    <lcb-map v-else-if="mode === 'map'" v-bind="{ ...info.listInfo, ...attrs }" />
   </template>
 </template>
 
@@ -116,10 +117,6 @@ watch(
     immediate: true,
   },
 )
-defineSlots<{
-  list(props: { items: any }): any
-  item(props: { item: any }): any
-}>()
 </script>
 
 <style lang="scss" scoped>

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

@@ -1,25 +1,45 @@
 <template>
-  <view class="flex-col flex h-full w-full">
+  <view class="flex-col flex h-180 w-full">
     <view class="flex-1 h-0 relative">
       <map
-        style="width: 100%; height: 100%"
-        :latitude="form.latitude"
-        :longitude="form.longitude"
+        :latitude="form.mapLatitude"
+        :longitude="form.mapLongitude"
         :markers="info.covers"
         show-location
         show-compass
         show-scale
+        class="w-full h-full"
         @regionchange="onRegionChange"
-        @markertap="onMarkerTap"
+        @callouttap="onCalloutTap"
       />
       <image
         src="./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 class="absolute bottom-0 left-0 p-3 box-border z-1 w-full h-fit" v-if="list[current]">
+        <lcb-product-item
+          v-bind="{
+            ...list[current],
+            ...attrs,
+          }"
+        />
+        <wd-icon
+          class-prefix="lcb"
+          size="28"
+          name="youbian"
+          custom-class="icon right-0"
+          @click="onCurrentChange(1)"
+          v-if="list[current + 1]"
+        />
+        <wd-icon
+          class-prefix="lcb"
+          size="28"
+          name="zuobian"
+          custom-class="icon left-0"
+          @click="onCurrentChange(-1)"
+          v-if="list[current - 1]"
+        />
       </view>
     </view>
   </view>
@@ -27,33 +47,11 @@
 
 <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
-}
+import { reactive, inject, ref, useAttrs } from 'vue'
+import { LcbListInfo } from '../lcb-list/api'
+import { getPageOptions } from '../../utils/utils'
+import { MapItem, MapMarker } from './types'
+
 defineOptions({
   name: 'LcbMap',
   options: {
@@ -62,7 +60,8 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-defineProps<LcbMapProps>()
+const attrs = useAttrs()
+const props = defineProps<LcbListInfo>()
 const scaleRadius: Record<string, number> = {
   3: 1_000_000,
   4: 500_000,
@@ -83,19 +82,41 @@ const scaleRadius: Record<string, number> = {
   19: 10,
   20: 5,
 }
+const callout: MapMarker['callout'] = {
+  content: '腾讯总部大楼',
+  padding: 10,
+  display: 'ALWAYS',
+  fontSize: 14,
+  textAlign: 'center',
+  borderRadius: 2,
+  borderWidth: 2,
+  borderColor: '#3875FF',
+  bgColor: '#ffffff',
+  color: '#3875FF',
+}
 const info = reactive({
   covers: [] as MapMarker[],
 })
-const form = inject<Record<string, any>>(FORM_KEY, {})
+const form = inject<Record<string, any>>(FORM_KEY, {
+  mapViewRadius: scaleRadius[16],
+})
 const current = ref(0)
-const data = ref<any[]>([])
+const list = ref<MapItem[]>([])
+
 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))
+  // || props.url
+  const { data } = (await uni.$lcb.http.post('/productInfo/map', {
+    ...props.baseParam,
+    ...form?.value,
+    ...getPageOptions(),
+  })) as {
+    data: MapItem[]
+  }
+  list.value = data
+  getCurrentData(data)
 }
-
 const getLocation = () => {
+  getData()
   uni.getLocation({
     type: 'gcj02',
     success: (res) => {
@@ -132,72 +153,60 @@ const onRegionChange = (e: {
     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: './images/4.png',
-        width: 26,
-        height: 26,
-      },
-      ...info.covers.filter((item) => ![1, 2, e.markerId].includes(item.id)),
-    ])
+const onCurrentChange = (p: number) => {
+  onCalloutTap({
+    detail: {
+      markerId: current.value + p,
+    },
+  })
+}
+const onCalloutTap = (e: { detail: { markerId: number } }) => {
+  const pre = info.covers[e.detail.markerId].callout
+  const old = info.covers[current.value].callout
+  info.covers[e.detail.markerId].callout = {
+    ...pre,
+    borderColor: '#eeeeee',
+    bgColor: '#3875FF',
+    color: '#fff',
+  }
+  info.covers[current.value].callout = {
+    ...old,
+    borderColor: '#eeeeee',
+    bgColor: '#ffffff',
+    color: '#3875FF',
   }
+  current.value = e.detail.markerId
 }
-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: './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: './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
-    },
+const getCurrentData = (markers: MapItem[]) => {
+  info.covers = markers.map((current, index: number) => {
+    const isCurrent = index === 0
+    return {
+      id: index,
+      iconPath: 'https://lycs.eluying.com/default/1319653665276882944/20241226142012/饭店竖图.png',
+      width: 1,
+      height: 1,
+      poiId: current.productId,
+      latitude: current.latitude,
+      longitude: current.longitude,
+      callout: {
+        ...callout,
+        content: current.mapPriceTips,
+        borderColor: '#eeeeee',
+        bgColor: isCurrent ? '#3875FF' : '#ffffff',
+        color: isCurrent ? '#ffffff' : '#3875FF',
+      },
+    }
   })
+  current.value = 0
 }
 </script>
-
-<style>
-page {
-  background-color: #f7f7f7;
+<style lang="scss" scoped>
+.icon {
+  position: absolute;
+  top: 0;
+  height: fit-content;
+  bottom: 0;
+  margin: auto;
+  color: #666;
 }
 </style>

package/components/lcb-map/types.ts

@@ -1,3 +1,34 @@
-export interface LcbMapProps {
-  // Define the component's prop types here
+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: {
+    textAlign: string
+    borderWidth: number
+    borderColor: string
+    content: string
+    color: string
+    fontSize: number
+    borderRadius: number
+    bgColor: string
+    padding: number
+    display: 'ALWAYS' | 'BYCLICK'
+  }
+  zIndex?: number
+}
+export interface MapItem {
+  mapPriceTips: string
+  latitude: number
+  longitude: number
+  productId: string
 }

package/components/lcb-product-item/components/ItemValue.vue

@@ -23,6 +23,8 @@ const props = withDefaults(
 )
 defineSlots<{
   coverImg(props: { value: any }): any
+  headImg(props: { value: any }): any
+  userName(props: { value: any }): any
   productName(props: { value: any }): any
   subTitle(props: { value: any }): any
   price(props: { value: any }): any
@@ -76,7 +78,7 @@ const value = computed(() => {
 </script>
 
 <template>
-  <template
+  <block
     v-if="
       visible && (prop === 'coverImg' || (!!value && (isArray(value) ? value?.length > 0 : true)))
     "
@@ -84,14 +86,26 @@ const value = computed(() => {
     <!-- 图片 -->
     <slot :value="value" v-if="prop === 'coverImg'" name="coverImg">
       <view :class="`relative ${className}`" :style="style">
-        <image :src="value" class="w-full h-full" mode="aspectFill" />
+        <wd-img :src="value" mode="aspectFill" width="100%" height="100%" />
         <!-- imgBottomIcon -->
         <view class="absolute bottom-0 left-0 w-full z-1" v-if="itemProps.imgBottomIcon">
-          <image :src="itemProps.imgBottomIcon" class="w-full h-auto block" mode="widthFix" />
+          <wd-img
+            :src="itemProps.imgBottomIcon"
+            custom-class="block"
+            mode="widthFix"
+            width="100%"
+            height="auto"
+          />
         </view>
         <!-- imgCornerIcon -->
         <view class="absolute top-0 left-0 h-8 z-1" v-if="itemProps.imgCornerIcon">
-          <image :src="itemProps.imgCornerIcon" class="w-auto h-full block" mode="heightFix" />
+          <wd-img
+            :src="itemProps.imgCornerIcon"
+            width="auto"
+            height="100%"
+            custom-class="block"
+            mode="heightFix"
+          />
         </view>
         <slot></slot>
       </view>
@@ -274,5 +288,15 @@ const value = computed(() => {
         <view>{{ value }}</view>
       </view>
     </slot>
-  </template>
+    <slot :value="value" v-if="prop === 'headImg'" name="headImg">
+      <view :class="className" :style="style" class="w-4 h-4">
+        <wd-img :src="value" width="100%" height="100%" radius="50%" mode="aspectFill" />
+      </view>
+    </slot>
+    <slot :value="value" v-if="prop === 'userName'" name="userName">
+      <view :class="className" :style="style" class="text-20rpx text-#333 truncate">
+        <view>{{ value }}</view>
+      </view>
+    </slot>
+  </block>
 </template>

package/components/lcb-product-item/lcb-product-item.vue

@@ -28,6 +28,7 @@ const props = withDefaults(defineProps<LcbProductItemProps>(), {
   titleVisible: true,
   subTitleVisible: true,
   priceVisible: true,
+  userInfoVisible: false,
   priceTipsVisible: true,
   priceUnitVisible: true,
   priceSuffixVisible: true,
@@ -47,11 +48,12 @@ const props = withDefaults(defineProps<LcbProductItemProps>(), {
   distanceVisible: true,
 })
 const attrs = useAttrs()
-
 provide('lcb-product-item-props', props)
 
 defineSlots<{
   coverImg(props: { value: any }): any
+  userName(props: { value: any }): any
+  headImg(props: { value: any }): any
   productName(props: { value: any }): any
   subTitle(props: { value: any }): any
   price(props: { value: any }): any
@@ -238,11 +240,15 @@ defineSlots<{
             </view>
           </view>
           <ItemValue prop="priceTips">
-            <template #priceTips="{ value }">
+            <!-- <template #priceTips="{ value }">
               <slot name="priceTips" :value="value" />
-            </template>
+            </template> -->
           </ItemValue>
         </view>
+        <view class="flex gap-2 items-center" v-if="userInfoVisible">
+          <ItemValue prop="headImg"></ItemValue>
+          <ItemValue prop="userName"></ItemValue>
+        </view>
       </view>
       <slot name="itemRightSection" />
     </view>
@@ -398,7 +404,12 @@ defineSlots<{
             </template>
           </ItemValue>
         </view>
+        <view class="flex gap-2 items-center" v-if="userInfoVisible">
+          <ItemValue prop="headImg"></ItemValue>
+          <ItemValue prop="userName"></ItemValue>
+        </view>
       </view>
+
       <slot name="itemBottomSection" />
     </view>
     <slot name="itemRightSection" />

package/components/lcb-product-item/types.ts

@@ -18,6 +18,8 @@ export interface LcbProductItemProps {
 
   coverImg?: any
   productName?: any
+  headImg?: string
+  userName?: string
   subTitle?: any
   price?: any
   priceUnit?: any
@@ -41,6 +43,7 @@ export interface LcbProductItemProps {
   coverImgVisible?: boolean
   titleVisible?: boolean
   subTitleVisible?: boolean
+  userInfoVisible?: boolean
   priceVisible?: boolean
   priceUnitVisible?: boolean
   priceSuffixVisible?: boolean