@tplc/business 0.0.48 → 0.0.50

package/components/lcb-list/types.ts

@@ -24,16 +24,3 @@ export interface FilterItemProps {
   options?: Option[]
   test?: 1
 }
-
-export const defaultLcbListProps: LcbListProps = {
-  pageFilterType: 'hotelTravelFilter',
-  border: true,
-  styleMode: 'default',
-  listType: 'list',
-  // @ts-ignore
-  pageListProps: () => ({
-    productProps: {
-      // listType: 'list',
-    },
-  }),
-}

package/components/lcb-nav/lcb-nav.vue

@@ -305,7 +305,7 @@ const toBack = () => {
   background: transparent;
 
   .navbar-header {
-    color: rgb(0, 0, 0) !important;
+    color: rgb(0, 0, 0);
     background-repeat: no-repeat;
     background-size: contain;
   }

package/components/lcb-notice/api/index.ts

@@ -0,0 +1,21 @@
+export interface AdvertItem {
+  adContent: string
+  advertId: string
+  closeTime: number
+  closeType: string
+  createDate: string
+  jumpType: number
+  lastModifyDate: string
+  pageType: string
+  type: number
+  title?: string
+  weightSort: string
+}
+/** 获取公告 */
+export const getAdvertList = (data: {
+  pageType: string
+  /** 1: 文字 2: 图片 */
+  type: 1 | 2
+}) => {
+  return uni.$lcb.http.post<AdvertItem[]>('/advert/list', data)
+}

package/components/lcb-notice/lcb-notice.vue

@@ -1,32 +1,49 @@
 <template>
-  <lcb-block v-bind="$props" custom-class="border-solid border-1">
-    <swiper
-      class="swiper"
-      circular
-      :autoplay="true"
-      :disableTouch="true"
-      :interval="interval"
-      :vertical="direction == 'up'"
-      @change="onSwiperChange"
+  <lcb-block v-bind="$props" custom-class="border-solid border-1" v-if="adverts.length">
+    <wd-notice-bar
+      :text="textArray"
+      backgroundColor="transparent"
+      :color="color"
+      :direction="direction"
+      :speed="speed"
+      @click="handleClick"
+      custom-class="!p-0 !rounded-none"
     >
-      <swiper-item v-for="(item, idx) in items" :key="item.id">
-        <Item
-          :idx="idx"
-          :current="current"
-          :lens="items?.length"
-          :iconType="iconType"
-          :item="item"
-          :textSpeed="textSpeed"
-          :textColor="textColor"
-        />
-      </swiper-item>
-    </swiper>
+      <template #prefix v-if="iconType !== -1 && icon">
+        <view class="mr-12rpx">
+          <image
+            :src="icon"
+            class="h-auto"
+            mode="widthFix"
+            v-if="iconType === 1"
+            :style="{
+              width: transformValueUnit(iconSize),
+            }"
+          />
+          <wd-icon :name="icon" :size="transformValueUnit(iconSize)" class-prefix="lcb" v-else />
+        </view>
+      </template>
+      <template #suffix v-if="rightArrow">
+        <wd-icon name="arrow-right" size="32rpx" />
+      </template>
+    </wd-notice-bar>
   </lcb-block>
+  <wd-popup v-model="popup.show" position="bottom" custom-class="!bg-transparent" closable>
+    <view class="text-#333 px-3 pb-3 box-border bg-#fff rounded-t-20rpx">
+      <view class="py-3 text-center font-500 text-4">{{ popup.item.title || '公告' }}</view>
+      <view class="min-h-30vh max-h-50vh overflow-y-auto text-28rpx">
+        {{ popup.item.adContent }}
+      </view>
+    </view>
+  </wd-popup>
 </template>
 
 <script setup lang="ts">
 import { LcbNoticeBarProps } from './types'
-import Item from './Item/index.vue'
+import { inject, watch, ref, computed } from 'vue'
+import { AdvertItem, getAdvertList } from './api'
+import { PAGE_TYPE_PROVIDE_KEY } from '../../constants'
+import { transformValueUnit } from '../../utils/transform'
 
 defineOptions({
   name: 'LcbNotice',
@@ -36,37 +53,36 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-
+const adverts = ref<AdvertItem[]>([])
 const props = withDefaults(defineProps<LcbNoticeBarProps>(), {
-  textSpeed: 1,
+  speed: 50,
   borderColor: 'transparent',
+  direction: 'vertical',
+  backgroundColor: '#fff',
+  paddingVertical: 16,
+  rightArrow: true,
+  color: '#333',
+  iconSize: 40,
 })
-console.log(props, 'props')
-
-function getTime(text: string | undefined) {
-  const len = text?.length || 0
-  // console.log('props.textSpeed', len, props.textSpeed)
-  return len > 25 ? ((50 - len) / 10) * props.textSpeed * 1000 + 3000 : 3000
-}
-// const params = ref<number>(0)
-// const model = defineModel<number>()
-const current = defineModel({ type: Number, default: 0 })
-const interval = defineModel('interval', { type: Number, default: 3000 })
-function onSwiperChange(item: any) {
-  // console.log('current.value', current.value)
-  current.value = item?.detail?.current
-  interval.value = getTime(props.items?.[current.value]?.noticeContent)
-  // console.log('onSwiperChange item', item)
-  // console.log('interval.value', interval.value)
+const popup = ref({
+  show: false,
+  item: {} as AdvertItem,
+})
+const pageType = inject(PAGE_TYPE_PROVIDE_KEY, props.pageType) as string
+const getData = async () => {
+  const { data } = await getAdvertList({
+    type: 1,
+    pageType,
+  })
+  adverts.value = data
 }
+watch(() => pageType, getData, { immediate: true })
 
-// function onSetInterval(val: number) {
-//   interval.value = val;
-// }
-</script>
-
-<style lang="scss" scoped>
-.swiper {
-  height: 72rpx;
+const textArray = computed(() => adverts.value.map((item) => item.adContent))
+const handleClick = (data: { text: string; index: number }) => {
+  popup.value = {
+    show: true,
+    item: adverts.value[data.index],
+  }
 }
-</style>
+</script>

package/components/lcb-notice/types.ts

@@ -1,30 +1,15 @@
-import { LcbActionViewProps } from '../../components/lcb-action-view/types'
-interface NoticeItem {
-  id?: number
-  noticeContent?: string
-  icon?: string
-  link?: LcbActionViewProps
-}
+import { NoticeBarScrollDirection } from '@tplc/wot/types/components/wd-notice-bar/types'
+import { LcbBlockProps } from '../lcb-block/types'
 
-export interface LcbNoticeBarProps {
-  // Define the component's prop types here
-  items?: Partial<NoticeItem>[]
+export interface LcbNoticeBarProps extends LcbBlockProps {
   vertical?: boolean
-  iconType?: number
-  direction?: string
-  textSpeed?: number
-  textColor?: string
-  borderColor?: string
-}
-
-export interface NoticeBarItemProps {
-  idx?: number
-  current?: number
-  text?: string
-  lens?: number
-  iconType?: number
-  item?: NoticeItem
-  textSpeed?: number
+  /** -1 无  0 图标 1 自定义 */
+  iconType?: -1 | 0 | 1
+  direction?: NoticeBarScrollDirection
+  speed?: number
   textColor?: string
-  // setInterval?: Function
+  pageType?: string
+  rightArrow?: boolean
+  icon?: string
+  iconSize?: number
 }

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

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue'
 import { LcbProductProps } from './types'
-import { lcbProductItemContentTypes } from '../lcb-product-item/types'
 
 const attrs = useAttrs()
 defineOptions({
@@ -20,17 +19,7 @@ const props = withDefaults(defineProps<LcbProductProps>(), {
   itemHeight: 560,
 } as any)
 defineSlots<{
-  image(): any
-  title(): any
-  subTitle(): any
-  price(): any
-  priceUnit(): any
-  priceSuffix(): any
-  originPrice(): any
-  originPriceUnit(): any
-  tags(): any
-  location(): any
-  distance(): any
+  item(props: { item: any }): any
 }>()
 </script>
 
@@ -43,13 +32,31 @@ defineSlots<{
             v-bind="{ ...item, ...attrs }"
             :imageStyle="{ width: `${imageWidthPercent}%` }"
           >
-            <template
-              v-for="slotName in lcbProductItemContentTypes"
-              :key="slotName"
-              #[slotName]="slotContext"
-            >
-              <slot :name="slotName" v-bind="slotContext" />
+            <!-- <template #itemTopSection>
+              <view class="min-w-10 min-h-10 bg-red-500/50"></view>
             </template>
+            <template #itemBottomSection>
+              <view class="min-w-10 min-h-10 bg-yellow-500/50"></view>
+            </template>
+            <template #itemLeftSection>
+              <view class="min-w-10 min-h-10 bg-blue-500/50"></view>
+            </template>
+            <template #itemRightSection>
+              <view class="min-w-10 min-h-10 bg-green-500/50"></view>
+            </template> -->
+
+            <!-- <template #imageSection>
+              <view class="min-w-5 min-h-5 bg-yellow-400 right-1 top-1 absolute z-10"></view>
+            </template>
+
+            <template #itemSection>
+              <view class="min-w-10 min-h-10 bg-blue-500/50 right-0 top-0 absolute z-10"></view>
+            </template>
+            <template #contentSection>
+              <view
+                class="min-w-15 min-h-15 bg-gray-500/20 right-10 top-10 absolute z-10 rounded-full"
+              ></view>
+            </template> -->
           </lcb-product-item>
         </slot>
       </view>
@@ -66,13 +73,18 @@ defineSlots<{
                 className="!h-full"
                 :imageStyle="{ height: `${imageHeightPercent}%` }"
               >
-                <template
-                  v-for="slotName in lcbProductItemContentTypes"
-                  :key="slotName"
-                  #[slotName]="slotContext"
-                >
-                  <slot :name="slotName" v-bind="slotContext" />
+                <!-- <template #itemTopSection>
+                  <view class="min-w-10 min-h-10 bg-red-500/50"></view>
+                </template>
+                <template #itemBottomSection>
+                  <view class="min-w-10 min-h-10 bg-yellow-500/50"></view>
                 </template>
+                <template #itemLeftSection>
+                  <view class="min-w-10 min-h-10 bg-blue-500/50"></view>
+                </template>
+                <template #itemRightSection>
+                  <view class="min-w-10 min-h-10 bg-green-500/50"></view>
+                </template> -->
               </lcb-product-item>
             </slot>
           </view>
@@ -88,15 +100,7 @@ defineSlots<{
           class="!w-66vw flex-shrink-0"
         >
           <slot name="item" :item="item">
-            <lcb-product-item v-bind="item" imageClass="!w-1/2">
-              <template
-                v-for="slotName in lcbProductItemContentTypes"
-                :key="slotName"
-                #[slotName]="slotContext"
-              >
-                <slot :name="slotName" v-bind="slotContext" />
-              </template>
-            </lcb-product-item>
+            <lcb-product-item v-bind="item" imageClass="!w-1/2"></lcb-product-item>
           </slot>
         </view>
       </view>

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

@@ -4,7 +4,7 @@ import { isArray } from '@tplc/wot/components/common/util'
 
 // const attrs = useAttrs()
 
-const itemProps = inject('lcb-product-item-props')
+const itemProps: any = inject('lcb-product-item-props')
 
 const props = withDefaults(
   defineProps<{
@@ -14,19 +14,20 @@ const props = withDefaults(
   {},
 )
 
-// defineSlots<{
-//   image(): any
-//   title(): any
-//   subTitle(): any
-//   price(): any
-//   priceUnit(): any
-//   priceSuffix(): any
-//   originPrice(): any
-//   originPriceUnit(): any
-//   tags(): any
-//   location(): any
-//   distance(): any
-// }>()
+defineSlots<{
+  image(props: { value: any }): any
+  title(props: { value: any }): any
+  subTitle(props: { value: any }): any
+  price(props: { value: any }): any
+  priceUnit(props: { value: any }): any
+  priceSuffix(props: { value: any }): any
+  originPrice(props: { value: any }): any
+  originPriceUnit(props: { value: any }): any
+  originPriceSuffix(props: { value: any }): any
+  tags(props: { value: any }): any
+  location(props: { value: any }): any
+  distance(props: { value: any }): any
+}>()
 
 const visible = computed(() => {
   return itemProps?.[`${props?.prop}Visible`] ?? true
@@ -43,17 +44,44 @@ const value = computed(() => {
 </script>
 
 <template>
-  <template v-if="visible && !!value && (isArray(value) ? value?.length > 0 : true)">
+  <template
+    v-if="visible && (prop === 'image' || (!!value && (isArray(value) ? value?.length > 0 : true)))"
+  >
     <!-- 图片 -->
     <slot :value="value" v-if="prop === 'image'" name="image">
       <view :value="value" :class="className" :style="style">
         <image :src="value" class="w-full h-full" mode="aspectFill" />
+        <slot></slot>
       </view>
     </slot>
 
     <!-- 标题 -->
     <slot :value="value" v-if="prop === 'title'" name="title">
-      <view :class="className" :style="style" :value="value" class="text-ellipsis line-clamp-1">
+      <view
+        :class="[
+          className,
+          'text-ellipsis',
+          {
+            'line-clamp-1': itemProps?.titleLineClamp === 1,
+            'line-clamp-2': itemProps?.titleLineClamp === 2,
+            'line-clamp-3': itemProps?.titleLineClamp === 3,
+          },
+        ]"
+        :style="style"
+        :value="value"
+      >
+        <view>{{ value }}</view>
+      </view>
+    </slot>
+
+    <!-- 副标题 -->
+    <slot :value="value" v-if="prop === 'subTitle'" name="subTitle">
+      <view
+        :class="className"
+        :style="style"
+        :value="value"
+        class="text-22rpx text-gray-500 text-ellipsis line-clamp-1"
+      >
         <view>{{ value }}</view>
       </view>
     </slot>
@@ -67,17 +95,35 @@ const value = computed(() => {
         class="text-gray-500 text-22rpx flex gap-3rpx items-center"
       >
         <wd-icon name="location" size="32rpx"></wd-icon>
-        <view>{{ value }}</view>
+        <view class="text-ellipsis line-clamp-1">{{ value }}</view>
       </view>
     </slot>
 
-    <!-- 标签 -->
-    <slot :value="value" v-if="prop === 'tags'" name="tags">
+    <!-- 距离 -->
+    <slot :value="value" v-if="prop === 'distance'" name="distance">
       <view
         :class="className"
         :style="style"
         :value="value"
-        class="flex gap-1 whitespace-nowrap overflow-auto"
+        class="text-gray-500 text-22rpx flex gap-3rpx items-center"
+      >
+        <wd-icon name="location" size="32rpx"></wd-icon>
+        <view class="text-ellipsis line-clamp-1">
+          距您{{ value }}{{ itemProps?.distanceUnit ?? 'km' }}
+        </view>
+      </view>
+    </slot>
+
+    <!-- 标签 -->
+    <slot :value="value" v-if="prop === 'tags'" name="tags">
+      <view
+        :class="[
+          'flex gap-1',
+          {
+            'whitespace-nowrap overflow-auto': !itemProps?.tagOverflowWrap,
+            'flex-wrap': itemProps?.tagOverflowWrap,
+          },
+        ]"
       >
         <wd-tag
           v-for="tag in value"
@@ -85,8 +131,12 @@ const value = computed(() => {
           class="!text-20rpx"
           :class="className"
           :style="style"
-          plain
-          type="primary"
+          :color="itemProps?.tagContentColor"
+          :bg-color="itemProps?.tagBgColor"
+          :plain="itemProps?.tagPlain ?? true"
+          :mark="itemProps?.tagMark ?? false"
+          :round="itemProps?.tagRound ?? false"
+          :type="itemProps?.tagType ?? 'primary'"
         >
           {{ tag }}
         </wd-tag>
@@ -123,5 +173,36 @@ const value = computed(() => {
         <view>{{ value }}</view>
       </view>
     </slot>
+
+    <!-- 原始价格单位 -->
+    <slot :value="value" v-if="prop === 'originPriceUnit'" name="originPriceUnit">
+      <view
+        :class="className"
+        :style="style"
+        :value="value"
+        class="text-gray-500 font-bold text-19rpx"
+      >
+        <view>{{ value }}</view>
+      </view>
+    </slot>
+
+    <!-- 原始价格 -->
+    <slot :value="value" v-if="prop === 'originPrice'" name="originPrice">
+      <view
+        :class="className"
+        :style="style"
+        :value="value"
+        class="text-gray-500 font-bold text-20rpx"
+      >
+        <view>{{ value }}</view>
+      </view>
+    </slot>
+
+    <!-- 原始价格后缀 -->
+    <slot :value="value" v-if="prop === 'originPriceSuffix'" name="originPriceSuffix">
+      <view :class="className" :style="style" :value="value" class="text-gray-500 text-20rpx">
+        <view>{{ value }}</view>
+      </view>
+    </slot>
   </template>
 </template>