@tplc/business 0.1.1 → 0.1.3

package/action.d.ts

@@ -25,12 +25,16 @@ export interface LcbGlobal {
     post<T>(
       url: string,
       data?: Record<string, any> | undefined,
-      query?: Record<string, any> | undefined,
+      hideLoadingToast?: boolean,
     ): Promise<IResData<T>>
   }
   loadingStore?: () => {
     changeLoading: (path: string, loading: boolean) => void
   }
+  userStore?: () => {
+    userInfo: Record<string, any>
+    updateUser: (data: Record<string, any>) => void
+  }
 }
 
 global {

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

@@ -2,9 +2,9 @@ export interface LcbActionViewProps {
   /**
    * 跳转类型 1: 网页 2: 小程序内页 10: 跳转小程序 11: 跳转半屏小程序 12: 小程序客服
    * 13: 退出登录 14: 小程序弹框 21: 新窗口跳到页面 22: 切换TAB页 23: 重启进入某页面
-   * 24: 回到上一层 25: 关闭当前页面 26: 关闭当前窗口 30: 拨打电话 88: 授权手机号
+   * 24: 回到上一层 25: 关闭当前页面 26: 关闭当前窗口 30: 拨打电话 88: 授权手机号 101 用户头像
    */
-  jumpType?: 1 | 2 | 10 | 11 | 12 | 13 | 14 | 21 | 22 | 23 | 24 | 25 | 26 | 30 | 88
+  jumpType?: 1 | 2 | 10 | 11 | 12 | 13 | 14 | 21 | 22 | 23 | 24 | 25 | 26 | 30 | 88 | 101
   /** 跳转路径 */
   jumpUrl?: string
   /** 小程序appid */

package/components/lcb-city-select/components/lcb-city-letter/index.vue

@@ -44,7 +44,7 @@
 
 <script setup lang="ts">
 import { LcbCitySelectProps } from '../../../lcb-city-select/types'
-import { ChildHotAddress, getHotAddress, HotAddress } from '../../../lcb-city-select/api'
+import { ChildHotAddress, getHotAddress, HotAddress } from '../../api'
 import { computed, onMounted, ref, watch } from 'vue'
 
 defineOptions({

package/components/lcb-city-select/components/lcb-city-list/index.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import { LcbAddress } from '../../../lcb-city-select/api'
+import { LcbAddress } from '../../api'
 import { LcbCityListProps } from './types'
 import { ref } from 'vue'
 

package/components/lcb-city-select/components/lcb-city-list/types.ts

@@ -1,4 +1,4 @@
-import { LcbAddress } from '../../../lcb-city-select/api'
+import { LcbAddress } from '../../api'
 
 export interface LcbCityListProps {
   list: LcbAddress[]

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

@@ -71,7 +71,7 @@
     <FilterList v-bind="{ ...info.listInfo, listType, filter, ...attrs }">
       <template #default="{ items }">
         <slot name="list" :items="items">
-          <lcb-product v-bind="{ ...attrs }" :listType="listType" :items="items">
+          <!-- <lcb-product v-bind="{ ...attrs }" :listType="listType" :items="items">
             <template #item="slotContext">
               <slot name="item" v-bind="slotContext" />
             </template>
@@ -82,7 +82,7 @@
             >
               <slot :name="slotName" v-bind="slotContext" />
             </template>
-          </lcb-product>
+          </lcb-product> -->
         </slot>
       </template>
     </FilterList>

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

@@ -1,13 +1,23 @@
 <template>
   <View class="">
-    <view class="font-bold leading-none" :style="{
-      fontSize: transformValueUnit(numsSize),
-      color: numsColor,
-    }">0</view>
-    <view class="mt-15rpx" :style="{
-      fontSize: transformValueUnit(titleSize),
-      color: titleColor,
-    }">{{ title }}</view>
+    <view
+      class="font-bold leading-none"
+      :style="{
+        fontSize: transformValueUnit(numsSize),
+        color: numsColor,
+      }"
+    >
+      0
+    </view>
+    <view
+      class="mt-15rpx"
+      :style="{
+        fontSize: transformValueUnit(titleSize),
+        color: titleColor,
+      }"
+    >
+      {{ title }}
+    </view>
   </View>
 </template>
 
@@ -16,5 +26,4 @@ import { NumsItemProps } from '../types'
 import { transformValueUnit } from '../../../utils/transform'
 
 defineProps<NumsItemProps>()
-
-</script>
+</script>

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

@@ -1,13 +1,10 @@
-const env = import.meta as unknown as { env: Record<string, string> }
 export const getUserPhone = (data: { encryptedData: string; iv: string; code?: string }) =>
   uni.$lcb.http.post('/wechatProgram/api/getPhone', {
     ...data,
-    appId: env.env.VITE_WX_APPID,
+    appId: (import.meta as any).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

@@ -13,27 +13,29 @@
       }"
     />
     <view class="flex flex-items-center">
-      <wd-img
-        v-if="photoUrl"
-        v-bind="{
-          width: transformValueUnit(photoSize),
-          height: transformValueUnit(photoSize),
-          round: photoRound,
-          src: photoUrl,
-        }"
-        class="mr-20rpx"
-      />
-      <view
-        v-if="!photoUrl"
-        :style="{
-          width: transformValueUnit(photoSize),
-          height: transformValueUnit(photoSize),
-          borderRadius: photoRound ? '50%' : '',
-        }"
-        class="bg-#eee userPlace mr-40rpx"
-      />
+      <lcb-action-view :jump-type="101" @avatar="onAvatar">
+        <wd-img
+          v-if="userStore?.userInfo?.avatarUrl"
+          v-bind="{
+            width: transformValueUnit(photoSize),
+            height: transformValueUnit(photoSize),
+            round: photoRound,
+            src: userStore?.userInfo?.avatarUrl,
+          }"
+          class="mr-20rpx"
+        />
+        <view
+          v-if="!userStore?.userInfo?.avatarUrl"
+          :style="{
+            width: transformValueUnit(photoSize),
+            height: transformValueUnit(photoSize),
+            borderRadius: photoRound ? '50%' : '',
+          }"
+          class="bg-#eee userPlace mr-40rpx"
+        />
+      </lcb-action-view>
       <view class="flex-1">
-        <lcb-action-view :jumpType="88" @phone="getPhone">
+        <lcb-action-view :jumpType="88" @phone="getPhone" v-if="!userStore?.userInfo?.phone">
           <view
             class="font-bold"
             :style="{
@@ -44,7 +46,7 @@
             授权登录
           </view>
         </lcb-action-view>
-        <view class="flex" v-if="editBtn">
+        <view class="flex" v-else>
           <view
             class="flex flex-content-center flex-items-center mt-5px border-style-solid"
             :style="{
@@ -103,10 +105,9 @@
 import { LcbUserTopProps } from './types'
 import { transformValueUnit } from '../../utils/transform'
 import Nums from './Nums/index.vue'
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { addUnit } from '@tplc/wot/components/common/util'
-import { PAGE_PROVIDE_KEY } from '../../constants'
-import { getUserInfo, getUserPhone } from './api'
+import { getUserPhone } from './api'
 const { statusBarHeight } = uni.getSystemInfoSync()
 defineOptions({
   name: 'LcbUserTop',
@@ -116,9 +117,7 @@ defineOptions({
     styleIsolation: 'shared',
   },
 })
-const pageInfo = inject(PAGE_PROVIDE_KEY)
-const photoUrl = ''
-const editBtn = ''
+const userStore = uni.$lcb.userStore?.()
 withDefaults(defineProps<LcbUserTopProps>(), {
   photoSize: 100,
   paddingLeft: 35,
@@ -140,9 +139,22 @@ const padTop = computed(() => {
   return addUnit(statusBarHeight || 0)
 })
 const getPhone = async (e) => {
-  await getUserPhone(e.detail)
+  uni.login({
+    provider: 'weixin',
+    success: async (res) => {
+      const { code } = res
+      await getUserPhone({
+        ...e.detail,
+        code,
+      })
+    },
+  })
+}
+const onAvatar = (avatarUrl) => {
+  userStore?.updateUser({
+    avatarUrl,
+  })
 }
-getUserInfo()
 </script>
 <style lang="scss" scoped>
 .userPlace {

package/index.ts

@@ -1,4 +1,4 @@
-import { LcbGlobal } from 'action'
+import { LcbGlobal } from './action'
 
 export const $lcb: LcbGlobal = {} as LcbGlobal
 uni.$lcb = $lcb

package/package.json

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

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

@@ -2,9 +2,9 @@ export interface LcbActionViewProps {
   /**
    * 跳转类型 1: 网页 2: 小程序内页 10: 跳转小程序 11: 跳转半屏小程序 12: 小程序客服
    * 13: 退出登录 14: 小程序弹框 21: 新窗口跳到页面 22: 切换TAB页 23: 重启进入某页面
-   * 24: 回到上一层 25: 关闭当前页面 26: 关闭当前窗口 30: 拨打电话 88: 授权手机号
+   * 24: 回到上一层 25: 关闭当前页面 26: 关闭当前窗口 30: 拨打电话 88: 授权手机号 101 用户头像
    */
-  jumpType?: 1 | 2 | 10 | 11 | 12 | 13 | 14 | 21 | 22 | 23 | 24 | 25 | 26 | 30 | 88
+  jumpType?: 1 | 2 | 10 | 11 | 12 | 13 | 14 | 21 | 22 | 23 | 24 | 25 | 26 | 30 | 88 | 101
   /** 跳转路径 */
   jumpUrl?: string
   /** 小程序appid */

package/types/components/lcb-city-select/components/lcb-city-letter/index.vue.d.ts

@@ -1,5 +1,5 @@
 import { LcbCitySelectProps } from '../../../lcb-city-select/types'
-import { ChildHotAddress } from '../../../lcb-city-select/api'
+import { ChildHotAddress } from '../../api'
 declare let __VLS_typeProps: LcbCitySelectProps
 type __VLS_PublicProps = {
   modelValue?: ChildHotAddress

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

@@ -1,4 +1,4 @@
-import { LcbAddress } from '../../../lcb-city-select/api'
+import { LcbAddress } from '../../api'
 export interface LcbCityListProps {
   list: LcbAddress[]
   keyword: string

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

@@ -1,25 +1,7 @@
 import { LcbListProps } from './types'
 import './index.scss'
-declare function __VLS_template(): Partial<
-  Record<
-    NonNullable<
-      | 'image'
-      | 'title'
-      | 'location'
-      | 'subTitle'
-      | 'price'
-      | 'priceUnit'
-      | 'priceSuffix'
-      | 'originPrice'
-      | 'originPriceUnit'
-      | 'tags'
-      | 'distance'
-    >,
-    (_: any) => any
-  >
-> & {
+declare function __VLS_template(): {
   list?(_: { items: any[] }): any
-  item?(_: any): any
 }
 declare const __VLS_component: import('vue').DefineComponent<
   __VLS_WithDefaults<__VLS_TypePropsToOption<LcbListProps>, any>,

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

@@ -1,4 +1,4 @@
-export declare const getPhone: (data: {
+export declare const getUserPhone: (data: {
   encryptedData: string
   iv: string
   code?: string
@@ -7,4 +7,3 @@ export declare const saveUserInfo: (data: {
   nickName?: string
   avatarUrl?: string
 }) => Promise<import('../../../action').IResData<unknown>>
-export declare const getUserInfo: () => Promise<import('../../../action').IResData<unknown>>

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

@@ -1,67 +0,0 @@
-import { FilterTabsProps } from '../components/FilterTabs/type'
-import { Option } from '../types'
-export interface LcbListInfo {
-  url: string
-  baseParam: Record<string, unknown>
-}
-export interface LcbFilterResult {
-  btnComponent: BtnComponent
-  filterTags: FilterTags
-  filterComponent: FilterComponent[]
-  listInfo: LcbListInfo
-  filterTabs?: {
-    componentProps: FilterTabsProps
-    valueName: string
-    defaultValue?: string
-  }
-}
-
-export interface FilterComponent {
-  filterName?: string
-  component: string
-  defaultValue?: string
-  defaultName?: string
-  valueName: string
-  componentProps: FilterComponentProps
-}
-
-interface FilterComponentProps {
-  mode?: 'multiple' | 'single'
-  apiPath?: string
-  options?: Option[]
-  componentList?: ComponentList[]
-}
-
-export interface ComponentList {
-  filterName: string
-  component: string
-  valueName: string
-  defaultValue?: string | string[] | number[]
-  componentProps: FilterTagsProps
-}
-
-export interface FilterTags {
-  component: string
-  valueName: string
-  defaultValue?: string
-  defaultName?: string
-  componentProps: FilterTagsProps
-}
-
-export interface FilterTagsProps {
-  mode?: 'multiple' | 'single'
-  max: number
-  min: number
-  apiPath: string
-  options: Option[]
-  unit?: string
-}
-
-interface BtnComponent {
-  postRequest: string
-}
-
-export const getFilterDetail = (val: string) =>
-  uni.$lcb.http.post<LcbFilterResult>('/pageDecoration/list/detail', {
-    pageListType: val,
-  })

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

@@ -1,60 +0,0 @@
-import { FilterTabsProps } from '../components/FilterTabs/type'
-import { Option } from '../types'
-export interface LcbListInfo {
-  url: string
-  baseParam: Record<string, unknown>
-}
-export interface LcbFilterResult {
-  btnComponent: BtnComponent
-  filterTags: FilterTags
-  filterComponent: FilterComponent[]
-  listInfo: LcbListInfo
-  filterTabs?: {
-    componentProps: FilterTabsProps
-    valueName: string
-    defaultValue?: string
-  }
-}
-export interface FilterComponent {
-  filterName?: string
-  component: string
-  defaultValue?: string
-  defaultName?: string
-  valueName: string
-  componentProps: FilterComponentProps
-}
-interface FilterComponentProps {
-  mode?: 'multiple' | 'single'
-  apiPath?: string
-  options?: Option[]
-  componentList?: ComponentList[]
-}
-export interface ComponentList {
-  filterName: string
-  component: string
-  valueName: string
-  defaultValue?: string | string[] | number[]
-  componentProps: FilterTagsProps
-}
-export interface FilterTags {
-  component: string
-  valueName: string
-  defaultValue?: string
-  defaultName?: string
-  componentProps: FilterTagsProps
-}
-export interface FilterTagsProps {
-  mode?: 'multiple' | 'single'
-  max: number
-  min: number
-  apiPath: string
-  options: Option[]
-  unit?: string
-}
-interface BtnComponent {
-  postRequest: string
-}
-export declare const getFilterDetail: (
-  val: string,
-) => Promise<import('../../../action').IResData<LcbFilterResult>>
-export {}