@tplc/business 0.2.33 → 0.2.35

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.35](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.34...v0.2.35) (2024-12-26)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* 修改样式错误 ([a4d5aab](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/a4d5aab85ac0e92fba75a964846eb62045b18239))
+
+### [0.2.34](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.33...v0.2.34) (2024-12-25)
+
+
+### ✨ Features | 新功能
+
+* version update ([7c02961](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/commit/7c02961426faa5f1c6628e8222777bc406bdca78))
+
 ### [0.2.33](http://gitlab888.30jia.com.cn/bhBank/zero-code-pro/compare/v0.2.32...v0.2.33) (2024-12-25)
 
 

package/components/lcb-action-view/lcb-action-view.vue

@@ -39,6 +39,7 @@ import { LcbActionViewProps } from './types'
 import { uploadFile } from '../../hooks/useUpload'
 import mpHtml from 'mp-html/src/uni-app/components/mp-html/mp-html.vue'
 import { PAGE_ANCHOR_PROVIDE_KEY } from '../../constants'
+import { getFinalUrl } from '../../utils/utils'
 defineOptions({
   name: 'LcbActionView',
   options: {
@@ -70,12 +71,14 @@ const openType = computed(() => {
   }[props.jumpType || '']
 })
 const onActionClick = async () => {
-  const { jumpUrl: url, jumpType } = props
+  const { jumpUrl, jumpType } = props
   /**
    * 跳转类型 1: 网页 2: 小程序内页 10: 跳转小程序 11: 跳转半屏小程序 12: 小程序客服
    * 13: 退出登录 14: 小程序弹框 21: 新窗口跳到页面 22: 切换TAB页 23: 重启进入某页面
    * 24: 回到上一层 25: 关闭当前页面 26: 关闭当前窗口 30: 拨打电话 88: 授权手机号
    */
+  const url = getFinalUrl(jumpUrl || '', props.urlParams)
+  console.log('url', url)
   switch (jumpType) {
     /** 网页 */
     case 1:

package/components/lcb-action-view/types.ts

@@ -1,6 +1,7 @@
 export type LcbActionViewProps = {
   /** 跳转路径 */
   jumpUrl?: string
+  urlParams?: string
 } & (
   | {
       /**

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

@@ -4,7 +4,6 @@
     @confirm="handleConfirm"
     type="daterange"
     use-default-slot
-    allow-same-day
     :formatter="formatter"
     :min-date="minDate"
     :max-date="maxDate"

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

@@ -3,7 +3,7 @@
     <view class="flex w-full search-view overflow-hidden">
       <view
         v-for="(item, index) in tabs"
-        :key="item"
+        :key="index"
         class="search-tab"
         @click="current = index"
         :class="{
@@ -18,7 +18,7 @@
               : `rgba(245,246,249,${opacity ?? 1})`,
         }"
       >
-        {{ item }}
+        {{ item.label }}
       </view>
     </view>
     <view
@@ -46,9 +46,12 @@
           :style="{
             backgroundColor: `rgba(241,241, 241, ${opacity})`,
           }"
-        ></view>
-        <view class="text-#999 text-28rpx">{{ placeholder }}</view>
-        <view class="flex-1"></view>
+        />
+        <input
+          class="text-#333 text-28rpx flex-1 mr-3"
+          :placeholder="placeholder"
+          v-model="form.keywords"
+        />
         <view class="justify-center flex flex-col items-center" @click="getLocation">
           <wd-loading size="30rpx" v-if="locationIng" />
           <img
@@ -79,9 +82,11 @@
           <view class="tag">{{ translate('共') }}{{ nightCount }}{{ translate('晚') }}</view>
         </view>
       </lcb-calendar>
-      <wd-button type="primary" customClass="!w-full my-42rpx" size="large">
-        {{ btnText }}
-      </wd-button>
+      <lcb-action-view v-bind="link" :urlParams="stringify(form)">
+        <wd-button type="primary" customClass="!w-full my-42rpx" size="large">
+          {{ btnText }}
+        </wd-button>
+      </lcb-action-view>
       <view
         class="px-50rpx flex justify-between items-center pb-42rpx text-#000 text-28rpx"
         v-if="items?.length"
@@ -101,12 +106,13 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, ref, reactive, watchEffect } from 'vue'
 import { LcbHomeSearch } from './types'
 import dayjs from 'dayjs/esm'
 import useLocation from '../../hooks/useLocation'
 import { useTranslate } from '@tplc/wot'
 import { ChildHotAddress } from '../lcb-city-select/api'
+import { stringify } from 'qs'
 const dayRange = ref([dayjs().valueOf(), dayjs().add(1, 'day').valueOf()])
 const { translate } = useTranslate()
 const { getLocation, userLocation, locationIng } = useLocation()
@@ -123,8 +129,7 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-
-withDefaults(defineProps<LcbHomeSearch>(), {
+const props = withDefaults(defineProps<LcbHomeSearch>(), {
   marginHorizontal: 24,
   backgroundColor: '#ffffff',
   radius: 16,
@@ -132,8 +137,16 @@ withDefaults(defineProps<LcbHomeSearch>(), {
   btnText: '搜索酒店',
   opacity: 1,
 })
-const tabs = ['全部', '酒店', '民宿']
+
 const current = ref(0)
+const form = reactive({
+  categoryTags: '',
+  keywords: '',
+  startDate: '',
+  endDate: '',
+  hotAddressId: '',
+})
+
 // 今天 明天 后天  周...
 const getDayName = (time: number) => {
   const day = dayjs(time).day()
@@ -147,6 +160,21 @@ const getDayName = (time: number) => {
     return `周${'日一二三四五六'[day]}`
   }
 }
+
+watchEffect(() => {
+  form.categoryTags = props.tabs[current.value].value
+})
+
+watchEffect(() => {
+  form.startDate = dayjs(dayRange.value[0]).format('YYYY-MM-DD')
+  form.endDate = dayjs(dayRange.value[1]).format('YYYY-MM-DD')
+})
+
+watchEffect(() => {
+  if (addressCity.value) {
+    form.hotAddressId = addressCity.value.hotAddressId
+  }
+})
 </script>
 <style lang="scss" scoped>
 @import '@tplc/wot/components/common/abstracts/variable';
@@ -165,14 +193,6 @@ const getDayName = (time: number) => {
   .active {
     color: $-color-theme;
     font-weight: bold;
-    // border-top-left-radius: 16rpx;
-    // border-top-right-radius: 16rpx;
-    // &-left {
-    //   border-bottom-right-radius: 16rpx;
-    // }
-    // &-right {
-    //   border-bottom-left-radius: 16rpx;
-    // }
   }
 }
 

package/components/lcb-home-search/types.ts

@@ -1,8 +1,14 @@
 import { ActionView } from 'action'
 import { LcbBlockProps } from '../lcb-block/types'
+import { LcbActionViewProps } from '../lcb-action-view/types'
 
 export interface LcbHomeSearch extends LcbBlockProps {
   placeholder?: string
   items?: ActionView[]
   btnText?: string
+  tabs: {
+    label: string
+    value: string
+  }[]
+  link?: LcbActionViewProps
 }

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

@@ -17,11 +17,11 @@ const itemProps: any = inject('lcb-product-item-props')
 const props = withDefaults(
   defineProps<{
     prop: string
-    className?: string
+    customClass?: string
   }>(),
   {},
 )
-
+console.log('itemProps', itemProps, props)
 defineSlots<{
   coverImg(props: { value: any }): any
   productName(props: { value: any }): any
@@ -49,7 +49,7 @@ const visible = computed(() => {
   return itemProps?.[`${props?.prop}Visible`] ?? true
 })
 const className = computed(() => {
-  return `${itemProps?.[`${props?.prop}Class`] ?? ''} ${props?.className}`
+  return `${itemProps?.[`${props?.prop}Class`] ?? ''} ${props?.customClass}`
 })
 const style = computed(() => {
   return itemProps?.[`${props?.prop}Style`] ?? ''
@@ -77,8 +77,16 @@ const value = computed(() => {
   >
     <!-- 图片 -->
     <slot :value="value" v-if="prop === 'coverImg'" name="coverImg">
-      <view :class="className" :style="style">
+      <view :class="`relative ${className}`" :style="style">
         <image :src="value" class="w-full h-full" mode="aspectFill" />
+        <!-- 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" />
+        </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" />
+        </view>
         <slot></slot>
       </view>
     </slot>
@@ -255,18 +263,6 @@ const value = computed(() => {
       </view>
     </slot>
 
-    <slot :value="value" v-if="prop === 'imgCornerIcon'" name="imgCornerIcon">
-      <view :class="className" :style="style" class="">
-        <view>{{ value }}</view>
-      </view>
-    </slot>
-
-    <slot :value="value" v-if="prop === 'imgBottomIcon'" name="imgBottomIcon">
-      <view :class="className" :style="style" class="">
-        <view>{{ value }}</view>
-      </view>
-    </slot>
-
     <slot :value="value" v-if="prop === 'orderTips'" name="orderTips">
       <view :class="className" :style="style" class="text-22rpx text-gray-500">
         <view>{{ value }}</view>

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

@@ -99,7 +99,7 @@ defineSlots<{
       <ItemValue
         v-if="!!$slots?.['coverImg']"
         prop="coverImg"
-        className="w-1/3 h-[360rpx] bg-gray-100 rounded-sm overflow-hidden relative"
+        customClass="w-1/3 h-[360rpx] bg-gray-100 rounded-sm overflow-hidden relative"
       >
         <template #default>
           <slot name="coverImgSection" />
@@ -111,7 +111,7 @@ defineSlots<{
       <ItemValue
         v-else
         prop="coverImg"
-        className="w-1/3 h-[360rpx] bg-gray-100 rounded-sm overflow-hidden relative"
+        customClass="w-1/3 h-[360rpx] bg-gray-100 rounded-sm overflow-hidden relative"
       >
         <template #default>
           <slot name="coverImgSection" />
@@ -159,7 +159,7 @@ defineSlots<{
             </ItemValue>
           </view>
 
-          <view className="flex gap-1 items-center">
+          <view class="flex gap-1 items-center">
             <ItemValue prop="scoreAvg">
               <!-- <template #scoreAvg="{ value }"><slot name="scoreAvg" :value="value" /></template> -->
             </ItemValue>
@@ -255,7 +255,11 @@ defineSlots<{
     <slot name="itemLeftSection" />
     <view class="flex-1 flex flex-col w-full overflow-hidden">
       <slot name="itemTopSection" />
-      <ItemValue v-if="!!$slots?.['coverImg']" prop="coverImg" className="overflow-hidden relative">
+      <ItemValue
+        v-if="!!$slots?.['coverImg']"
+        prop="coverImg"
+        customClass="overflow-hidden relative"
+      >
         <template #default>
           <slot name="coverImgSection" />
         </template>
@@ -263,7 +267,7 @@ defineSlots<{
           <slot name="coverImg" :value="value" />
         </template>
       </ItemValue>
-      <ItemValue v-else prop="coverImg" className="overflow-hidden relative">
+      <ItemValue v-else prop="coverImg" customClass="overflow-hidden relative">
         <template #default>
           <slot name="coverImgSection" />
         </template>
@@ -310,7 +314,7 @@ defineSlots<{
             </ItemValue>
           </view>
 
-          <view className="flex gap-1 items-center">
+          <view class="flex gap-1 items-center">
             <ItemValue prop="scoreAvg">
               <!-- <template #="{ value }"><slot name="scoreAvg" :value="value" /></template> -->
             </ItemValue>

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

@@ -16,7 +16,7 @@ export interface LcbProductItemProps {
   distanceUnit?: string
 
   coverImg?: any
-  title?: any
+  productName?: any
   subTitle?: any
   price?: any
   priceUnit?: any
@@ -28,7 +28,7 @@ export interface LcbProductItemProps {
   tags?: any
   addressIntro?: any
   distance?: any
-  score?: any
+  scoreAvg?: any
   scoreTips?: any
   level?: any
   imgCornerIcon?: any

package/components/lcb-tags/types.ts

@@ -15,16 +15,16 @@
 
 export interface LcbTagsProps {
   // Define the component's prop types here
-  items?: any,
-  mode?: 1 | 2 //1是不换行滚动 这是加在大部分产品里的用法 2是自然换行
+  items?: any
+  mode?: 1 | 2 // 1是不换行滚动 这是加在大部分产品里的用法 2是自然换行
   tagRadius?: number
   fontSize?: number
   tagColor?: string
 }
 
 export interface LcbTagsItemProps {
-  items: object[],
+  items: object[]
   tagRadius?: number
   fontSize?: number
   tagColor?: string
-}
+}

package/package.json

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

package/types/components/lcb-action-view/types.d.ts

@@ -1,6 +1,7 @@
 export type LcbActionViewProps = {
   /** 跳转路径 */
   jumpUrl?: string
+  urlParams?: string
 } & (
   | {
       /**

package/types/components/lcb-home-search/types.d.ts

@@ -1,7 +1,13 @@
 import { ActionView } from 'action'
 import { LcbBlockProps } from '../lcb-block/types'
+import { LcbActionViewProps } from '../lcb-action-view/types'
 export interface LcbHomeSearch extends LcbBlockProps {
   placeholder?: string
   items?: ActionView[]
   btnText?: string
+  tabs: {
+    label: string
+    value: string
+  }[]
+  link?: LcbActionViewProps
 }

package/types/components/lcb-product-item/components/ItemValue.vue.d.ts

@@ -45,7 +45,7 @@ declare const __VLS_component: import('vue').DefineComponent<
   __VLS_WithDefaults<
     __VLS_TypePropsToOption<{
       prop: string
-      className?: string
+      customClass?: string
     }>,
     {}
   >,
@@ -63,7 +63,7 @@ declare const __VLS_component: import('vue').DefineComponent<
       __VLS_WithDefaults<
         __VLS_TypePropsToOption<{
           prop: string
-          className?: string
+          customClass?: string
         }>,
         {}
       >

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

@@ -13,7 +13,7 @@ export interface LcbProductItemProps {
   tagRound?: boolean
   distanceUnit?: string
   coverImg?: any
-  title?: any
+  productName?: any
   subTitle?: any
   price?: any
   priceUnit?: any
@@ -25,7 +25,7 @@ export interface LcbProductItemProps {
   tags?: any
   addressIntro?: any
   distance?: any
-  score?: any
+  scoreAvg?: any
   scoreTips?: any
   level?: any
   imgCornerIcon?: any

package/types/utils/utils.d.ts

@@ -2,3 +2,5 @@ export declare function formatJson(str: string | object | undefined, defVal?: {}
 /** 获取上个页面Exposed */
 export declare const getExposed: () => any
 export declare const getPageOptions: () => Record<string, any>
+/** 合并url参数 url = /pages/data/index?id=1&name=2   urlParams = id=1&name=2&type=1 */
+export declare const getFinalUrl: (url: string, urlParams?: string) => string

package/utils/utils.ts

@@ -1,3 +1,4 @@
+import { parse, stringify } from 'qs'
 export function formatJson(str: string | object | undefined, defVal = {}) {
   if (!str) return defVal
   if (typeof str === 'object') return str
@@ -22,3 +23,14 @@ export const getPageOptions = () => {
   }
   return currentPage.options
 }
+/** 合并url参数 url = /pages/data/index?id=1&name=2   urlParams = id=1&name=2&type=1 */
+export const getFinalUrl = (url: string, urlParams?: string) => {
+  if (!urlParams) return url
+  const params = parse(urlParams)
+  const query = parse(url.split('?')[1])
+  const path = url.split('?')[0]
+  return `${path}?${stringify({
+    ...query,
+    ...params,
+  })}`
+}