@tplc/business 0.0.40 → 0.0.47

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, provide, useAttrs } from 'vue'
-import { LcbProductItemProps } from './types'
+import { lcbProductItemContentTypes, LcbProductItemProps } from './types'
 import ItemValue from './components/ItemValue.vue'
 
 defineOptions({
@@ -32,25 +32,59 @@ const attrs = useAttrs()
 
 provide('lcb-product-item-props', props)
 
+defineSlots<{
+  image(): any
+  title(): any
+  subTitle(): any
+  price(): any
+  priceUnit(): any
+  priceSuffix(): any
+  originPrice(): any
+  originPriceUnit(): any
+  tags(): any
+  location(): any
+  distance(): any
+}>()
+
 // console.log('attrs', attrs)
 </script>
 
 <template>
   <!-- 横向布局 -->
   <view v-if="layoutType === 'horizontal'" :class="className" class="flex gap-3 px-2 py-3 bg-white">
-    <ItemValue prop="image" className="w-1/3 h-220rpx bg-gray-100 rounded-sm overflow-hidden" />
+    <ItemValue prop="image" className="w-1/3 h-220rpx bg-gray-100 rounded-sm overflow-hidden">
+      <template
+        v-for="slotName in lcbProductItemContentTypes"
+        :key="slotName"
+        #[slotName]="slotContext"
+      >
+        <slot :name="slotName" v-bind="slotContext" />
+      </template>
+    </ItemValue>
     <view class="flex flex-col flex-1 gap-2 justify-between text-26rpx overflow-hidden">
       <view class="flex flex-col gap-2 overflow-hidden">
-        <ItemValue v-for="prop in ['title', 'location', 'tags']" :prop="prop" :key="prop" />
+        <ItemValue v-for="prop in ['title', 'location', 'tags']" :prop="prop" :key="prop">
+          <template
+            v-for="slotName in lcbProductItemContentTypes"
+            :key="slotName"
+            #[slotName]="slotContext"
+          >
+            <slot :name="slotName" v-bind="slotContext" />
+          </template>
+        </ItemValue>
       </view>
 
       <view class="flex gap-2">
         <view class="flex gap-[4rpx] items-end">
-          <ItemValue
-            v-for="prop in ['priceUnit', 'price', 'priceSuffix']"
-            :prop="prop"
-            :key="prop"
-          />
+          <ItemValue v-for="prop in ['priceUnit', 'price', 'priceSuffix']" :prop="prop" :key="prop">
+            <template
+              v-for="slotName in lcbProductItemContentTypes"
+              :key="slotName"
+              #[slotName]="slotContext"
+            >
+              <slot :name="slotName" v-bind="slotContext" />
+            </template>
+          </ItemValue>
         </view>
       </view>
     </view>
@@ -58,23 +92,43 @@ provide('lcb-product-item-props', props)
 
   <!-- 竖向布局 -->
   <view v-if="layoutType === 'vertical'" :class="className" class="flex flex-col gap-2 bg-white">
-    <ItemValue prop="image" className="overflow-hidden" />
+    <ItemValue prop="image" className="overflow-hidden">
+      <template
+        v-for="slotName in lcbProductItemContentTypes"
+        :key="slotName"
+        #[slotName]="slotContext"
+      >
+        <slot :name="slotName" v-bind="slotContext" />
+      </template>
+    </ItemValue>
     <view
       :class="'p-2'"
       class="flex flex-col flex-1 gap-2 justify-between text-26rpx overflow-hidden"
     >
       <view class="flex flex-col gap-2 overflow-hidden">
         <!-- <ItemValue prop="title"></ItemValue> -->
-        <ItemValue v-for="prop in ['title', 'location', 'tags']" :prop="prop" :key="prop" />
+        <ItemValue v-for="prop in ['title', 'location', 'tags']" :prop="prop" :key="prop">
+          <template
+            v-for="slotName in lcbProductItemContentTypes"
+            :key="slotName"
+            #[slotName]="slotContext"
+          >
+            <slot :name="slotName" v-bind="slotContext" />
+          </template>
+        </ItemValue>
       </view>
 
       <view class="flex gap-2">
         <view class="flex gap-[4rpx] items-end">
-          <ItemValue
-            v-for="prop in ['priceUnit', 'price', 'priceSuffix']"
-            :prop="prop"
-            :key="prop"
-          />
+          <ItemValue v-for="prop in ['priceUnit', 'price', 'priceSuffix']" :prop="prop" :key="prop">
+            <template
+              v-for="slotName in lcbProductItemContentTypes"
+              :key="slotName"
+              #[slotName]="slotContext"
+            >
+              <slot :name="slotName" v-bind="slotContext" />
+            </template>
+          </ItemValue>
         </view>
       </view>
     </view>

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

@@ -1,5 +1,19 @@
 import { CSSProperties } from 'vue'
 
+export const lcbProductItemContentTypes = [
+  'image',
+  'title',
+  'subTitle',
+  'price',
+  'priceUnit',
+  'priceSuffix',
+  'originPrice',
+  'originPriceUnit',
+  'tags',
+  'location',
+  'distance',
+] as const
+
 export interface LcbProductItemProps {
   // Define the component's prop types here
   className?: string

package/components/lcb-user-top/api/index.ts

@@ -0,0 +1,13 @@
+const env = import.meta as unknown as { env: Record<string, string> }
+export const getPhone = (data: { encryptedData: string; iv: string; code?: string }) =>
+  uni.$lcb.http.post('/wechatProgram/api/getPhone', {
+    ...data,
+    appId: env.env.VITE_WX_APPID,
+  })
+
+export const saveUserInfo = (data: { nickName?: string; avatarUrl?: string }) =>
+  uni.$lcb.http.post('/wechatProgram/saveUserInfo', data)
+
+// /api/login/getUserInfo
+
+export const getUserInfo = () => uni.$lcb.http.post('/login/getUserInfo')

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

@@ -14,7 +14,7 @@
     />
     <view class="flex flex-items-center">
       <wd-img
-        v-if="!!photoUrl"
+        v-if="photoUrl"
         v-bind="{
           width: transformValueUnit(photoSize),
           height: transformValueUnit(photoSize),
@@ -31,21 +31,20 @@
           borderRadius: photoRound ? '50%' : '',
         }"
         class="bg-#eee userPlace mr-40rpx"
-      >
-        <!-- flex justify-center items-center overflow-hidden relative -->
-        <!-- <wd-icon name="user" :size="transformValueUnit(photoSize * 0.9)" color="#ddd" class="absolute photoIcon"></wd-icon> -->
-      </view>
+      />
       <view class="flex-1">
-        <view
-          class="font-bold"
+        <lcb-action-view
+          custom-class="font-bold"
+          :jumpType="88"
           :style="{
             fontSize: transformValueUnit(textSize),
             color: textColor,
           }"
+          @phone="getPhone"
         >
           授权登录
-        </view>
-        <view class="flex" v-if="editBtn == true">
+        </lcb-action-view>
+        <view class="flex" v-if="editBtn">
           <view
             class="flex flex-content-center flex-items-center mt-5px border-style-solid"
             :style="{
@@ -61,26 +60,27 @@
           </view>
         </view>
       </view>
-      <div
-        v-if="moreIcon == true && iconType === 1"
-        class="overflow-hidden bg-no-repeat bg-contain"
-        :style="{
-          height: transformValueUnit(textSize),
-          width: transformValueUnit(textSize),
-          color: textColor,
-          backgroundImage: `url('${iconUpload}')`,
-        }"
-      />
-      <view v-if="moreIcon == true && iconType === 0">
+      <!-- 右边按钮 -->
+      <lcb-action-view v-if="moreIcon" v-bind="rightIconLink">
+        <img
+          v-if="iconType === 1"
+          :src="iconUpload"
+          :style="{
+            width: transformValueUnit(rightIconSize),
+            color: textColor,
+          }"
+          mode="widthFix"
+        />
         <wd-icon
           class-prefix="lcb"
+          v-else
           v-bind="{
             name: iconName,
-            size: transformValueUnit(textSize),
+            size: transformValueUnit(rightIconSize),
             color: textColor,
           }"
         />
-      </view>
+      </lcb-action-view>
     </view>
     <view
       v-if="valuesCard == true || coupons == true || presales == true || memberPoints == true"
@@ -95,18 +95,6 @@
       <Nums v-if="coupons == true" v-bind="$props" title="优惠券" />
       <Nums v-if="presales == true" v-bind="$props" title="预售券" />
       <Nums v-if="memberPoints == true" v-bind="$props" title="会员积分" />
-      <!-- <View v-if="coupons == true" class="">
-        <view class="text-22px font-bold">0</view>
-        <view class="text-12px optName">优惠券</view>
-      </View>
-      <View v-if="presales == true" class="">
-        <view class="text-22px font-bold">0</view>
-        <view class="text-12px optName">预售券</view>
-      </View>
-      <View v-if="memberPoints == true" class="">
-        <view class="text-22px font-bold">0</view>
-        <view class="text-12px optName">会员积分</view>
-      </View> -->
     </view>
   </lcb-block>
 </template>
@@ -115,9 +103,10 @@
 import { LcbUserTopProps } from './types'
 import { transformValueUnit } from '../../utils/transform'
 import Nums from './Nums/index.vue'
-import { styleText } from 'util'
-import { computed } from 'vue'
+import { computed, inject } from 'vue'
 import { addUnit } from '@tplc/wot/components/common/util'
+import { PAGE_PROVIDE_KEY } from '../../constants'
+import { getUserInfo } from './api'
 const { statusBarHeight } = uni.getSystemInfoSync()
 defineOptions({
   name: 'LcbUserTop',
@@ -127,13 +116,16 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
+const pageInfo = inject(PAGE_PROVIDE_KEY)
+const photoUrl = ''
+const editBtn = ''
 withDefaults(defineProps<LcbUserTopProps>(), {
   photoSize: 100,
   paddingLeft: 35,
   paddingRight: 35,
   paddingTop: 100,
   paddingBottom: 100,
-  photoRound: false,
+  photoRound: true,
   textSize: 32,
   textColor: '#333',
   moreIcon: true,
@@ -141,17 +133,27 @@ withDefaults(defineProps<LcbUserTopProps>(), {
   iconName: 'xiayiye',
   editText: '编辑资料',
   editSize: 28,
+  rightIconSize: 28,
   bgStyle: 1,
 })
 const padTop = computed(() => {
   return addUnit(statusBarHeight || 0)
 })
+const getPhone = async (e) => {
+  uni.login({
+    provider: 'weixin',
+    success: async (res) => {
+      await getPhone({
+        code: res.code,
+        encryptedData: e.detail.encryptedData,
+        iv: e.detail.iv,
+      })
+    },
+  })
+}
+getUserInfo()
 </script>
 <style lang="scss" scoped>
-// .optName {
-//   opacity: 0.7;
-// }
-
 .userPlace {
   background-image: url('https://lycs.eluying.com/material/icon/1/20240925185540/userPhoto.jpg');
   background-size: contain;

package/components/lcb-user-top/types.ts

@@ -1,52 +1,8 @@
-import { ActionView } from 'action'
-import { LcbBlockProps } from '.././/lcb-block/types'
+import { LcbActionViewProps } from '../lcb-action-view/types'
+import { LcbBlockProps } from '../lcb-block/types'
 
 export interface LcbUserTopProps extends LcbBlockProps {
-  // // items?: Partial<ActionView>[]
-  // // imageWidth?: number
-  // autoplay?: boolean
-  // /**  滚动方向 默认 horizontal */
-  // direction?: 'horizontal' | 'vertical'
-  // /** 同时显示的滑块数量 默认 1 */
-  // displayMultipleItems?: number
-  // /** 滑动时长 300ms */
-  // duration?: number
-  // /** 轮播图高度  默认192 */
-  // height?: number
-  // /** 轮播间隔时间 5000ms */
-  // interval?: number
-  // /** 是否循环播放 默认 true */
-  // loop?: boolean
-  // /**  后边间距 */
-  // nextMargin?: number
-  // /** 前边间距 */
-  // previousMargin?: number
-  // /** 指示器位置 bottom */
-  // indicatorPosition?:
-  // | 'left'
-  // | 'top-left'
-  // | 'top'
-  // | 'top-right'
-  // | 'bottom-left'
-  // | 'bottom'
-  // | 'bottom-right'
-  // | 'right'
-  // /** 边距是否应用到第一个、最后一个元素 */
-  // snapToEdge?: boolean
-  // // 图片之间距离
-  // itemPadding?: number
-  // /** 图片圆角 */
-  // imageRadius?: number
-  // // 整个banner圆角
-  // radius?: number
-  // customPrevImageClass?: string
-  // customNextImageClass?: string
-  // indicator?: 'dots' | 'dots-bar' | 'fraction'
-  // /** 滑动样式 1平面 2立体 */
-  // slidingStyle?: 1 | 2
-
   // paddingRight?: number
-  photoUrl?: string
   photoRound?: boolean
   photoSize?: number
   textSize?: number
@@ -58,7 +14,6 @@ export interface LcbUserTopProps extends LcbBlockProps {
   iconName?: string
   iconUpload?: string
   iconType?: 0 | 1
-  editBtn?: boolean
   editText?: string
   editBorder?: boolean
   editSize?: number
@@ -72,6 +27,8 @@ export interface LcbUserTopProps extends LcbBlockProps {
   titleColor?: string
   numsMarginTop?: number
   numsPadLR?: number
+  rightIconSize?: number
+  rightIconLink?: LcbActionViewProps
 }
 
 export interface NumsItemProps {

package/constants.ts

@@ -1 +1,3 @@
 export const FORM_KEY = 'form'
+/** 页面信息 */
+export const PAGE_PROVIDE_KEY = 'page_provide'

package/hooks/useUpload.api.ts

@@ -0,0 +1,17 @@
+interface OssUploadResponse {
+  fileUrl: string
+  ossType: string
+  uploadHeaders: UploadHeaders
+  uploadUrl: string
+}
+
+interface UploadHeaders {
+  Date: string
+}
+/** 商城文件 */
+export const uploadByUrl = async (fileName: string) => {
+  const { data } = await uni.$lcb.http.post<OssUploadResponse>('/ossUpload/uploadByUrl', {
+    fileName,
+  })
+  return data
+}

package/hooks/useUpload.ts

@@ -0,0 +1,111 @@
+import { Ref, ref } from 'vue'
+import { uploadByUrl } from './useUpload.api'
+
+/**
+ * useUpload 是一个定制化的请求钩子，用于处理上传图片。
+ * @param formData 额外传递给后台的数据，如{name: '菲鸽'}。
+ * @returns 返回一个对象{loading, data, run}，包含请求的加载状态、错误信息、响应数据和手动触发请求的函数。
+ */
+export default function useUpload(onSuccess?: (url: string) => void) {
+  const data = ref<string>('')
+  const run = () => {
+    // #ifdef MP-WEIXIN
+    uni.chooseMedia({
+      count: 1,
+      mediaType: ['image'],
+      success: (res) => {
+        const filePath = res.tempFiles[0].tempFilePath
+        const name = filePath.split('/').pop() || ''
+        uploadFile({ filePath, data, name, onSuccess })
+      },
+      fail: (err) => {
+        console.error('uni.chooseMedia err->', err)
+      },
+    })
+    // #endif
+    // #ifndef MP-WEIXIN
+    uni.chooseImage({
+      count: 1,
+      success: (res) => {
+        const name = res.tempFiles[0].name
+        const file = res.tempFiles[0]
+        uploadFile({ data, name, file, onSuccess })
+      },
+      fail: (err) => {
+        console.error('uni.chooseImage err->', err)
+      },
+    })
+    // #endif
+  }
+
+  return { data, run }
+}
+
+export async function uploadFile({
+  filePath,
+  file,
+  data,
+  name,
+  onSuccess,
+}: {
+  filePath?: string
+  file?: File
+  data?: Ref<string>
+  name: string
+  onSuccess?: (url: string) => void
+}) {
+  const pageRoute = getCurrentPages().at(-1)?.route || ''
+  uni.$lcb.loadingStore?.().changeLoading(pageRoute, true)
+  const { uploadUrl, ossType, fileUrl } = await uploadByUrl(`${new Date().getTime()}_${name}`)
+  const fun = (fileData) => {
+    uni.request({
+      url: uploadUrl,
+      method: 'PUT',
+      data: fileData,
+      header:
+        ossType === 'tyyun'
+          ? {
+              'x-amz-acl': 'public-read',
+              'Content-Type': 'image',
+            }
+          : {
+              'Content-Type': ' ',
+            },
+      success: () => {
+        onSuccess?.(fileUrl)
+        if (data) data.value = fileUrl
+        uni.$lcb.loadingStore?.().changeLoading(pageRoute, false)
+      },
+      fail: () => {
+        uni.showToast({
+          title: '上传失败',
+          icon: 'none',
+        })
+        uni.$lcb.loadingStore?.().changeLoading(pageRoute, false)
+      },
+    })
+  }
+  // #ifdef H5
+  fun(file)
+  // #endif
+
+  // #ifndef H5
+  if (filePath) {
+    const fs = uni.getFileSystemManager()
+    fs.readFile({
+      filePath,
+      success: (fileRes) => {
+        fun(fileRes.data)
+      },
+      fail: () => {
+        uni.showToast({
+          title: '上传失败',
+          icon: 'none',
+        })
+        uni.$lcb.loadingStore?.().changeLoading(pageRoute, false)
+      },
+    })
+  }
+
+  // #endif
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tplc/business",
-  "version": "0.0.40",
+  "version": "0.0.47",
   "keywords": [
     "业务组件"
   ],
@@ -11,7 +11,7 @@
   },
   "peerDependencies": {
     "vue": ">=3.2.47",
-    "@tplc/wot": "0.1.17"
+    "@tplc/wot": "0.1.20"
   },
   "engines": {
     "node": ">=18",

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

@@ -10,10 +10,30 @@ declare const __VLS_component: import('vue').DefineComponent<
   {},
   import('vue').ComponentOptionsMixin,
   import('vue').ComponentOptionsMixin,
-  {},
+  {
+    phone: (value: {
+      detail: {
+        errMsg: string
+        encryptedData: string
+        iv: string
+      }
+    }) => void
+    avatar: (value: string) => void
+  },
   string,
   import('vue').PublicProps,
-  Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToOption<LcbActionViewProps>>>,
+  Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToOption<LcbActionViewProps>>> & {
+    onPhone?:
+      | ((value: {
+          detail: {
+            errMsg: string
+            encryptedData: string
+            iv: string
+          }
+        }) => any)
+      | undefined
+    onAvatar?: ((value: string) => any) | undefined
+  },
   {},
   {}
 >

package/types/components/lcb-dynamic-data/types.d.ts

@@ -2,6 +2,6 @@ export interface LcbDynamicDataProps {
   items: {
     title: string
     unit?: string
-    key?: string
+    key: string
   }[]
 }

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

@@ -1,5 +1,8 @@
 import { LcbFilterListProps } from './type'
-declare const _default: import('vue').DefineComponent<
+declare function __VLS_template(): {
+  default?(_: { items: any[] }): any
+}
+declare const __VLS_component: import('vue').DefineComponent<
   __VLS_TypePropsToOption<LcbFilterListProps>,
   {},
   unknown,
@@ -14,7 +17,16 @@ declare const _default: import('vue').DefineComponent<
   {},
   {}
 >
+declare const _default: __VLS_WithTemplateSlots<
+  typeof __VLS_component,
+  ReturnType<typeof __VLS_template>
+>
 export default _default
+type __VLS_WithTemplateSlots<T, S> = T & {
+  new (): {
+    $slots: S
+  }
+}
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T
 type __VLS_TypePropsToOption<T> = {
   [K in keyof T]-?: {} extends Pick<T, K>

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

@@ -1,6 +1,27 @@
 import { LcbListProps } from './types'
 import './index.scss'
-declare const _default: import('vue').DefineComponent<
+declare function __VLS_template(): Partial<
+  Record<
+    NonNullable<
+      | 'image'
+      | 'title'
+      | 'location'
+      | 'subTitle'
+      | 'price'
+      | 'priceUnit'
+      | 'priceSuffix'
+      | 'originPrice'
+      | 'originPriceUnit'
+      | 'tags'
+      | 'distance'
+    >,
+    (_: any) => any
+  >
+> & {
+  list?(_: { items: any[] }): any
+  item?(_: any): any
+}
+declare const __VLS_component: import('vue').DefineComponent<
   __VLS_WithDefaults<__VLS_TypePropsToOption<LcbListProps>, any>,
   {},
   unknown,
@@ -23,6 +44,10 @@ declare const _default: import('vue').DefineComponent<
   },
   {}
 >
+declare const _default: __VLS_WithTemplateSlots<
+  typeof __VLS_component,
+  ReturnType<typeof __VLS_template>
+>
 export default _default
 type __VLS_WithDefaults<P, D> = {
   [K in keyof Pick<P, keyof P>]: K extends keyof D
@@ -36,6 +61,11 @@ type __VLS_WithDefaults<P, D> = {
 type __VLS_Prettify<T> = {
   [K in keyof T]: T[K]
 } & {}
+type __VLS_WithTemplateSlots<T, S> = T & {
+  new (): {
+    $slots: S
+  }
+}
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T
 type __VLS_TypePropsToOption<T> = {
   [K in keyof T]-?: {} extends Pick<T, K>

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

@@ -52,8 +52,8 @@ declare const _default: import('vue').DefineComponent<
     >
   >,
   {
-    fixed: boolean
     title: string
+    fixed: boolean
     styleGroup: 1 | 2 | 3 | 4
     back: boolean
     topStyle: 1 | 2