From b681f3a466bb51b3cf066e4c4d5167422adbe5c6 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 10 二月 2025 16:42:49 +0800 Subject: [PATCH] feat: init --- /dev/null | 79 --------------------------------------- apps/cMiniApp/src/components/index.ts | 1 packages/hooks/index.ts | 1 apps/cMiniApp/src/utils/request/index.ts | 10 ---- 4 files changed, 1 insertions(+), 90 deletions(-) diff --git a/apps/cMiniApp/src/assets/friends/icon-add.png b/apps/cMiniApp/src/assets/friends/icon-add.png deleted file mode 100644 index 1c2312a..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-add.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-comment.png b/apps/cMiniApp/src/assets/friends/icon-comment.png deleted file mode 100644 index 4fae071..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-comment.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-delete.png b/apps/cMiniApp/src/assets/friends/icon-delete.png deleted file mode 100644 index 86d3b68..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-delete.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-forward.png b/apps/cMiniApp/src/assets/friends/icon-forward.png deleted file mode 100644 index 6a9a82e..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-forward.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-like-active.png b/apps/cMiniApp/src/assets/friends/icon-like-active.png deleted file mode 100644 index 3732c48..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-like-active.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-like-heart.png b/apps/cMiniApp/src/assets/friends/icon-like-heart.png deleted file mode 100644 index aabc877..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-like-heart.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-like.png b/apps/cMiniApp/src/assets/friends/icon-like.png deleted file mode 100644 index 1bf5d87..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-like.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-order.png b/apps/cMiniApp/src/assets/friends/icon-order.png deleted file mode 100644 index c22cc70..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-order.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/friends/icon-resource.png b/apps/cMiniApp/src/assets/friends/icon-resource.png deleted file mode 100644 index ec5189c..0000000 --- a/apps/cMiniApp/src/assets/friends/icon-resource.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-attention-active.png b/apps/cMiniApp/src/assets/information/icon-attention-active.png deleted file mode 100644 index b1c6265..0000000 --- a/apps/cMiniApp/src/assets/information/icon-attention-active.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-attention-lg-active.png b/apps/cMiniApp/src/assets/information/icon-attention-lg-active.png deleted file mode 100644 index 08f2982..0000000 --- a/apps/cMiniApp/src/assets/information/icon-attention-lg-active.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-attention-lg.png b/apps/cMiniApp/src/assets/information/icon-attention-lg.png deleted file mode 100644 index 34a1588..0000000 --- a/apps/cMiniApp/src/assets/information/icon-attention-lg.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-attention.png b/apps/cMiniApp/src/assets/information/icon-attention.png deleted file mode 100644 index eba95ca..0000000 --- a/apps/cMiniApp/src/assets/information/icon-attention.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-delete.png b/apps/cMiniApp/src/assets/information/icon-delete.png deleted file mode 100644 index 86d3b68..0000000 --- a/apps/cMiniApp/src/assets/information/icon-delete.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-float-thumbsup-active.png b/apps/cMiniApp/src/assets/information/icon-float-thumbsup-active.png deleted file mode 100644 index 78f2da9..0000000 --- a/apps/cMiniApp/src/assets/information/icon-float-thumbsup-active.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-float-thumbsup.png b/apps/cMiniApp/src/assets/information/icon-float-thumbsup.png deleted file mode 100644 index 824d68c..0000000 --- a/apps/cMiniApp/src/assets/information/icon-float-thumbsup.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-list-view.png b/apps/cMiniApp/src/assets/information/icon-list-view.png deleted file mode 100644 index e03d194..0000000 --- a/apps/cMiniApp/src/assets/information/icon-list-view.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-share-lg.png b/apps/cMiniApp/src/assets/information/icon-share-lg.png deleted file mode 100644 index 546e699..0000000 --- a/apps/cMiniApp/src/assets/information/icon-share-lg.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-share.png b/apps/cMiniApp/src/assets/information/icon-share.png deleted file mode 100644 index c6219a3..0000000 --- a/apps/cMiniApp/src/assets/information/icon-share.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-thumbsup-active.png b/apps/cMiniApp/src/assets/information/icon-thumbsup-active.png deleted file mode 100644 index d3140c4..0000000 --- a/apps/cMiniApp/src/assets/information/icon-thumbsup-active.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/information/icon-thumbsup.png b/apps/cMiniApp/src/assets/information/icon-thumbsup.png deleted file mode 100644 index 9368f40..0000000 --- a/apps/cMiniApp/src/assets/information/icon-thumbsup.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/message/icon-arrow.png b/apps/cMiniApp/src/assets/message/icon-arrow.png deleted file mode 100644 index ffb29dc..0000000 --- a/apps/cMiniApp/src/assets/message/icon-arrow.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/message/icon-menu-attention.png b/apps/cMiniApp/src/assets/message/icon-menu-attention.png deleted file mode 100644 index 16b1449..0000000 --- a/apps/cMiniApp/src/assets/message/icon-menu-attention.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/message/icon-menu-like.png b/apps/cMiniApp/src/assets/message/icon-menu-like.png deleted file mode 100644 index 04d4c98..0000000 --- a/apps/cMiniApp/src/assets/message/icon-menu-like.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/message/icon-stranger-avatar.png b/apps/cMiniApp/src/assets/message/icon-stranger-avatar.png deleted file mode 100644 index a4e92e0..0000000 --- a/apps/cMiniApp/src/assets/message/icon-stranger-avatar.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/message/icon-system-avatar.png b/apps/cMiniApp/src/assets/message/icon-system-avatar.png deleted file mode 100644 index a2be8b5..0000000 --- a/apps/cMiniApp/src/assets/message/icon-system-avatar.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/order/icon-more.png b/apps/cMiniApp/src/assets/order/icon-more.png deleted file mode 100644 index 18d5d44..0000000 --- a/apps/cMiniApp/src/assets/order/icon-more.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/order/icon-note.png b/apps/cMiniApp/src/assets/order/icon-note.png deleted file mode 100644 index 0555ae9..0000000 --- a/apps/cMiniApp/src/assets/order/icon-note.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/order/icon-publish.png b/apps/cMiniApp/src/assets/order/icon-publish.png deleted file mode 100644 index 1611c26..0000000 --- a/apps/cMiniApp/src/assets/order/icon-publish.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/order/icon-safe.png b/apps/cMiniApp/src/assets/order/icon-safe.png deleted file mode 100644 index 0addf65..0000000 --- a/apps/cMiniApp/src/assets/order/icon-safe.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/assets/order/icon-share.png b/apps/cMiniApp/src/assets/order/icon-share.png deleted file mode 100644 index 546e699..0000000 --- a/apps/cMiniApp/src/assets/order/icon-share.png +++ /dev/null Binary files differ diff --git a/apps/cMiniApp/src/components/Avatar/CardAvatar.vue b/apps/cMiniApp/src/components/Avatar/CardAvatar.vue deleted file mode 100644 index ede89c0..0000000 --- a/apps/cMiniApp/src/components/Avatar/CardAvatar.vue +++ /dev/null @@ -1,112 +0,0 @@ -<template> - <div class="card-avatar-wrapper"> - <Avatar - class="card-avatar" - :size="30" - :src="src ? setOSSLink(src) : ''" - @click.stop="goUserHomePage" - /> - <div class="card-avatar-name-wrapper"> - <div class="card-avatar-name"> - {{ name }} - <template v-if="jobTitle">路{{ jobTitle }}</template> - </div> - <!-- <template v-if="jobTitle"> - <div class="card-avatar-dot"></div> - <div class="card-avatar-jobTitle">{{ jobTitle }}</div> - </template> --> - <div :class="['card-avatar-certified', { isCertified }]"> - {{ isCertified ? '宸茶璇�' : '鏈璇�' }} - </div> - </div> - </div> -</template> - -<script setup lang="ts"> -import { Avatar } from '@12333/components'; -import { setOSSLink } from '@12333/utils'; -import Taro from '@tarojs/taro'; - -defineOptions({ - name: 'CardAvatar', -}); - -type Props = { - src?: string; - name?: string; - jobTitle?: string; - userId?: string; - isCertified?: boolean; -}; - -const props = withDefaults(defineProps<Props>(), {}); - -function goUserHomePage() { - if (props.userId) { - Taro.navigateTo({ - url: `${RouterPath.userHomePage}?userId=${props.userId}`, - }); - } -} -</script> - -<style lang="scss"> -@import '@/styles/common.scss'; - -.card-avatar-wrapper { - flex: 1; - min-width: 0; - display: flex; - align-items: center; - - .card-avatar { - margin-right: 16px; - } - - .card-avatar-name-wrapper { - color: boleGetCssVar('text-color', 'primary'); - line-height: 40px; - font-size: 0; - display: flex; - align-items: center; - flex: 1; - min-width: 0; - } - - .card-avatar-name { - font-weight: bold; - font-size: 28px; - vertical-align: middle; - @include ellipsis; - } - - .card-avatar-dot { - width: 4px; - height: 4px; - background: boleGetCssVar('text-color', 'primary'); - vertical-align: middle; - border-radius: 50%; - margin: 0 8px; - flex-shrink: 0; - } - - .card-avatar-jobTitle { - font-weight: 400; - font-size: 28px; - vertical-align: middle; - flex-shrink: 0; - } - - .card-avatar-certified { - font-weight: 400; - font-size: 28px; - vertical-align: middle; - flex-shrink: 0; - margin-left: 8px; - - &.isCertified { - color: boleGetCssVar('color', 'success'); - } - } -} -</style> diff --git a/apps/cMiniApp/src/components/Button/FloatButton.vue b/apps/cMiniApp/src/components/Button/FloatButton.vue deleted file mode 100644 index 46374e8..0000000 --- a/apps/cMiniApp/src/components/Button/FloatButton.vue +++ /dev/null @@ -1,67 +0,0 @@ -<template> - <nut-button class="bole-float-button" plain type="primary" :style="{ bottom: `${bottom}px` }"> - <img :src="icon" class="bole-float-button-icon" /> - <div class="bole-float-button-text">{{ text }}</div> - </nut-button> -</template> - -<script setup lang="ts"> -import IconAdd from '@/assets/order/icon-note.png'; -import { useSystemStore } from '@/stores/modules/system'; - -defineOptions({ - name: 'FloatButton', -}); - -type Props = { - text?: string; - icon?: string; -}; - -const props = withDefaults(defineProps<Props>(), { - icon: IconAdd, -}); - -const systemStore = useSystemStore(); - -const bottom = computed(() => systemStore.bottomNavHeight + systemStore.IPhoneXPadding + 60); -</script> - -<style lang="scss"> -@import '@/styles/common.scss'; - -:root, -page { - .bole-float-button { - position: fixed; - height: 56px; - right: 20px; - font-size: 0; - padding: 0 20px; - background-color: #484d61 !important; - border: none; - - .nut-button__warp { - & > div { - font-size: 0; - } - } - - .bole-float-button-icon { - width: 28px; - height: 28px; - display: inline-block; - vertical-align: middle; - margin-right: 4px; - } - - .bole-float-button-text { - display: inline-block; - font-size: 24px; - line-height: 1; - vertical-align: middle; - color: #fff; - } - } -} -</style> diff --git a/apps/cMiniApp/src/components/index.ts b/apps/cMiniApp/src/components/index.ts index 88976c9..b185311 100644 --- a/apps/cMiniApp/src/components/index.ts +++ b/apps/cMiniApp/src/components/index.ts @@ -5,7 +5,6 @@ export { default as PageLayoutWithBg } from './Layout/PageLayoutWithBg.vue'; export { default as LoadingLayout } from './Layout/LoadingLayout.vue'; export { default as Policy } from './Policy/Policy.vue'; -export { default as FloatButton } from './Button/FloatButton.vue'; export { default as Menu } from './Menu/Menu.vue'; export { default as MenuItem } from './Menu/MenuItem.vue'; export { default as InfiniteLoading } from './InfiniteLoading/InfiniteLoading.vue'; diff --git a/apps/cMiniApp/src/subpackages/user/userHomePage/InnerPage.vue b/apps/cMiniApp/src/subpackages/user/userHomePage/InnerPage.vue deleted file mode 100644 index 827641e..0000000 --- a/apps/cMiniApp/src/subpackages/user/userHomePage/InnerPage.vue +++ /dev/null @@ -1,219 +0,0 @@ -<template> - <ContentView> - <div class="user-home-page-top-view"> - <div class="user-home-page-avatar"> - <UserInfoAvatar - :src="userSimpleInfo.avatarUrl ? setOSSLink(userSimpleInfo.avatarUrl) : ''" - :name="userSimpleInfo.contact ?? ''" - :company="userSimpleInfo.enterpriseName ?? ''" - ></UserInfoAvatar> - <template v-if="userDetail && userId !== userDetail.userId"> - <nut-button - type="primary" - v-if="userTotalInfo.isFollow" - plain - class="follow-btn" - @click="handleFollowUser()" - >宸插叧娉�</nut-button - > - <nut-button type="primary" v-else class="follow-btn" @click="handleFollowUser()" - >鍏虫敞</nut-button - > - </template> - </div> - <div class="user-home-page-info-wrapper"> - <div class="user-home-page-info"> - <div class="user-home-page-info-item" v-if="userSimpleInfo?.phoneNumber"> - <img :src="IconPhone" class="user-home-page-info-item-icon" /> - <div class="user-home-page-info-item-text">{{ userSimpleInfo?.phoneNumber ?? '' }}</div> - </div> - <div class="user-home-page-info-item" v-if="userSimpleInfo?.userInfoEmailAddress"> - <img :src="IconEmail" class="user-home-page-info-item-icon" /> - <div class="user-home-page-info-item-text"> - {{ userSimpleInfo?.userInfoEmailAddress ?? '' }} - </div> - </div> - <div class="user-home-page-info-item" v-if="address"> - <img :src="IconAddress" class="user-home-page-info-item-icon" /> - <div class="user-home-page-info-item-text">{{ address }}</div> - </div> - </div> - <img - v-if="!!userSimpleInfo?.wxQrCodeUrl" - :src="setOSSLink(userSimpleInfo?.wxQrCodeUrl)" - class="user-home-page-qrcode" - /> - </div> - </div> - </ContentView> - <div class="user-home-tabs-wrapper"> - <ProTabs v-model="tab" name="user-home-tabs" class="user-home-tabs" flexTitle fullHeight> - <ProTabPane title="鍔ㄦ��" pane-key="1"> - <FriendView :userId="userId" /> - </ProTabPane> - <ProTabPane title="渚涗汉" pane-key="3"> - <UserResourceList :userId="userId" /> - </ProTabPane> - <ProTabPane title="鎷涜仒" pane-key="4"> - <UserOrderList :userId="userId" /> - </ProTabPane> - </ProTabs> - </div> -</template> - -<script setup lang="ts"> -import { ProTabs, ProTabPane } from '@12333/components'; -import IconPhone from '@/assets/user/icon-phone.png'; -import IconEmail from '@/assets/user/icon-email.png'; -import IconAddress from '@/assets/user/icon-address.png'; -import { useUser, useFollowUser, useUserTotalInfo, useUserSimpleInfo } from '@/hooks'; -import Taro from '@tarojs/taro'; -import { RouterPath } from '@/constants'; -import { Message, setOSSLink, filterJoin } from '@12333/utils'; -import FriendView from '../../friendCircle/components/FriendView/FriendView.vue'; -import UserOrderList from './UserOrderList.vue'; -import UserResourceList from './UserResourceList.vue'; - -defineOptions({ - name: 'InnerPage', -}); - -const router = Taro.useRouter(); - -const userId = router.params?.userId ?? ''; - -const tab = ref('1'); - -const { userTotalInfo, refetch } = useUserTotalInfo({ - userId: userId, -}); - -const { userSimpleInfo } = useUserSimpleInfo({ - userId: userId, -}); - -const { userDetail } = useUser(); - -const isSelf = computed(() => userDetail.value?.userId == userId); - -const { followUser, unFollowUser } = useFollowUser({ - onFollowSuccess: () => { - Message.success('宸插叧娉�'); - refetch({ type: 'inactive' }); - }, - onUnFollowSuccess: () => { - Message.success('宸插彇娑堝叧娉�'); - refetch({ type: 'inactive' }); - }, -}); - -const handleFollowUser = async () => { - try { - if (userTotalInfo.value.isFollow) { - await unFollowUser({ - userId: userDetail.value?.userId, - followUserId: userId, - }); - } else { - await followUser({ - userId: userDetail.value?.userId, - followUserId: userId, - }); - } - } catch (error) {} -}; - -function goChatRoom() { - Taro.navigateTo({ - url: `${RouterPath.chatRoom}?chatId=${userId}`, - }); -} - -const address = computed(() => - filterJoin( - [ - userSimpleInfo.value.provinceName ?? '', - userSimpleInfo.value.cityName ?? '', - userSimpleInfo.value.countyName ?? '', - ], - '' - ) -); -</script> - -<style lang="scss"> -@import '@/styles/common.scss'; - -.user-page-wrapper { - .user-home-page-top-view { - .user-home-page-avatar { - display: flex; - margin-bottom: 36px; - align-items: center; - - .follow-btn { - height: 56px; - } - } - } - - .user-home-page-info-wrapper { - display: flex; - margin-bottom: 40px; - - .user-home-page-info { - flex: 1; - min-width: 0; - margin-right: 12px; - - .user-home-page-info-item { - display: flex; - align-items: center; - margin-bottom: 6px; - - &:last-child { - margin-bottom: 0; - } - - .user-home-page-info-item-icon { - width: 32px; - height: 32px; - margin-right: 16px; - } - - .user-home-page-info-item-text { - font-weight: 400; - font-size: 28px; - color: #ffffff; - line-height: 40px; - flex: 1; - min-width: 0; - @include ellipsis; - } - } - } - - .user-home-page-qrcode { - width: 144px; - height: 144px; - border-radius: 8px; - margin-right: 28px; - } - } - - .user-home-tabs-wrapper { - background: #f9f9fb; - flex: 1; - min-height: 0; - border-radius: 40px 40px 0px 0px; - - .user-home-tabs { - border-radius: 40px 40px 0px 0px; - - .pro-tabs__titles_wrapper { - margin-bottom: 24px; - } - } - } -} -</style> diff --git a/apps/cMiniApp/src/subpackages/user/userHomePage/UserOrderList.vue b/apps/cMiniApp/src/subpackages/user/userHomePage/UserOrderList.vue deleted file mode 100644 index 7d08e38..0000000 --- a/apps/cMiniApp/src/subpackages/user/userHomePage/UserOrderList.vue +++ /dev/null @@ -1,87 +0,0 @@ -<template> - <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps"> - <template #renderItem="{ item }"> - <OrderCard - :title="item.orderName" - :hireType="item.hireType" - :hireNumber="item.hireNumber" - :hireEndNumber="item.hireEndNumber" - :ageStart="item.ageStart" - :ageEnd="item.ageEnd" - :provinceName="item.provinceName" - :cityName="item.cityName" - :orderSupplierRefundInfo="item.orderSupplierRefundInfo" - :src="item.avatarUrl" - :name="item.contact" - :jobTitle="item.jobTitle" - :time="item.lastShelfTime" - :integratedSalary="item.integratedSalary" - @click="handleClick(item)" - :showActionBtn="false" - > - </OrderCard> - </template> - </InfiniteLoading> -</template> - -<script setup lang="ts"> -import { useInfiniteLoading } from '@12333/hooks'; -import * as orderServices from '@12333/services/api/Order'; -import { OrderInputType, IndustryCategoryType } from '@12333/constants'; -import { useAccessPersonalInfo, useCategoryMenu } from '@/hooks'; -import { CategoryUtils } from '@12333/utils'; -import Taro from '@tarojs/taro'; - -type Props = { - userId?: string; -}; - -const props = withDefaults(defineProps<Props>(), {}); - -const queryState = reactive({ - categoryId: '', - userId: props.userId, -}); - -const { ensureCategoryMenu, categoryMenuList: industryServicesCategoryList } = useCategoryMenu({ - type: IndustryCategoryType.IndustryServices, -}); - -onMounted(async () => { - await ensureCategoryMenu(); - queryState.categoryId = industryServicesCategoryList.value.find((x) => - CategoryUtils.isIHasOrder(x.name) - ).id; -}); - -const { infiniteLoadingProps } = useInfiniteLoading( - ({ pageParam }) => { - let params: API.FrontOrderListInput = { - pageModel: { - rows: 20, - page: pageParam, - orderInput: [ - { property: 'isRecommend', order: OrderInputType.Desc }, - { property: 'lastShelfTime', order: OrderInputType.Desc }, - ], - }, - categoryId: queryState.categoryId, - userId: queryState.userId, - }; - - return orderServices.getFrontOrderList(params, { - showLoading: false, - }); - }, - { - queryKey: ['orderServices/getFrontOrderList', queryState], - enabled: computed(() => !!queryState.categoryId), - } -); - -function handleClick(item: API.FrontOrderList) { - Taro.navigateTo({ - url: `${RouterPath.orderDetail}?id=${item.id}`, - }); -} -</script> diff --git a/apps/cMiniApp/src/subpackages/user/userHomePage/UserResourceList.vue b/apps/cMiniApp/src/subpackages/user/userHomePage/UserResourceList.vue deleted file mode 100644 index 1aa3b09..0000000 --- a/apps/cMiniApp/src/subpackages/user/userHomePage/UserResourceList.vue +++ /dev/null @@ -1,64 +0,0 @@ -<template> - <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps"> - <template #renderItem="{ item }"> - <ResourceCard - :title="item.title" - :src="item.avatarUrl" - :name="item.contact" - :jobTitle="item.jobTitle" - :time="item.lastShelfTime" - :resourceCount="item.resourceCount" - :intendedDeliveryCities="item.intendedDeliveryCities" - @click="handleClick(item)" - :showActionBtn="false" - > - </ResourceCard> - </template> - </InfiniteLoading> -</template> - -<script setup lang="ts"> -import { useInfiniteLoading } from '@12333/hooks'; -import * as resourceServices from '@12333/services/api/Resource'; -import { OrderInputType } from '@12333/constants'; -import Taro from '@tarojs/taro'; - -type Props = { - userId?: string; -}; - -const props = withDefaults(defineProps<Props>(), {}); - -const queryState = reactive({ - userId: props.userId, -}); - -const { infiniteLoadingProps } = useInfiniteLoading( - ({ pageParam }) => { - let params: API.GetFrontResourceListInput = { - pageModel: { - rows: 20, - page: pageParam, - orderInput: [ - { property: 'isRecommend', order: OrderInputType.Desc }, - { property: 'lastShelfTime', order: OrderInputType.Desc }, - ], - }, - userId: queryState.userId, - }; - - return resourceServices.getFrontResourceList(params, { - showLoading: false, - }); - }, - { - queryKey: ['resourceServices/getFrontResourceList', queryState], - } -); - -function handleClick(item: API.GetFrontResourceList) { - Taro.navigateTo({ - url: `${RouterPath.resourceDetail}?id=${item.id}`, - }); -} -</script> diff --git a/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.config.ts b/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.config.ts deleted file mode 100644 index 305fdb1..0000000 --- a/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default definePageConfig({ - disableScroll: true, -}); diff --git a/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.vue b/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.vue deleted file mode 100644 index 5ceaa0b..0000000 --- a/apps/cMiniApp/src/subpackages/user/userHomePage/userHomePage.vue +++ /dev/null @@ -1,40 +0,0 @@ -<template> - <PageLayout class="user-page-wrapper" :need-auth="false"> - <template #navigationBar> - <TransparentNavigationBar - title="鎴戠殑涓婚〉" - :is-absolute="false" - navigationArrowWhite - mode="dark" - ></TransparentNavigationBar> - </template> - <template #bg> - <img :src="OssAssets.user.Bg" class="user-page-bg" /> - </template> - <InnerPage /> - </PageLayout> -</template> - -<script setup lang="ts"> -import { PageLayout, TransparentNavigationBar } from '@/components'; -import InnerPage from './InnerPage.vue'; -import { OssAssets } from '@/constants'; - -defineOptions({ - name: 'userHomePage', -}); -</script> - -<style lang="scss"> -@import '@/styles/common.scss'; - -.user-page-bg { - position: fixed; - z-index: -1; - top: 0; - left: 0; - width: 100%; - height: 678px; - object-fit: cover; -} -</style> diff --git a/apps/cMiniApp/src/utils/request/index.ts b/apps/cMiniApp/src/utils/request/index.ts index 326b6a5..0693296 100644 --- a/apps/cMiniApp/src/utils/request/index.ts +++ b/apps/cMiniApp/src/utils/request/index.ts @@ -3,7 +3,7 @@ import qs from 'qs'; import Taro from '@tarojs/taro'; import { getToken } from '@/utils'; -import { tokenIsExpired, Message, SensitiveManage, LocationUtils } from '@12333/utils'; +import { tokenIsExpired, Message, SensitiveManage } from '@12333/utils'; import * as accountServices from '@12333/services/api/Account'; import { useUserStoreWithOut } from '@/stores/modules/user'; @@ -226,14 +226,6 @@ (error: AxiosError) => { endLoading(); return Promise.reject(error); - }, - ], - [ - (config) => { - return LocationUtils.getBaseUrlByLocation().then((res) => { - config.baseURL = res; - return config; - }); }, ], ], diff --git a/packages/components/src/Avatar/FriendAvatar.vue b/packages/components/src/Avatar/FriendAvatar.vue deleted file mode 100644 index c514a89..0000000 --- a/packages/components/src/Avatar/FriendAvatar.vue +++ /dev/null @@ -1,94 +0,0 @@ -<template> - <div :class="['friend-avatar-wrapper', { large: size === 'large' }]"> - <Avatar class="friend-avatar" :src="src" :imgClass="imgClass" :size="45" /> - <div class="friend-avatar-info"> - <div class="friend-avatar-name"> - {{ name }} - </div> - <div class="friend-avatar-company">{{ company }}</div> - </div> - </div> -</template> - -<script setup lang="ts"> -import { Avatar } from '@12333/components'; - -defineOptions({ - name: 'FriendAvatar', -}); - -type Props = { - name?: string; - company?: string; - size?: 'normal' | 'large'; - imgClass?: string; - src?: string; -}; - -const props = withDefaults(defineProps<Props>(), {}); -</script> - -<style lang="scss"> -@import '@/styles/common.scss'; - -.friend-avatar-wrapper { - display: flex; - - .friend-avatar { - margin-right: 20px; - - /* .my-avatar { - width: 90px; - height: 90px; - display: block; - - .nut-img { - width: 90rpx; - height: 90rpx; - } - } */ - } - - .friend-avatar-info { - flex: 1; - min-width: 0; - - .friend-avatar-name { - @include ellipsis; - line-height: 1; - padding-top: 8px; - font-size: 34px; - color: #5b6998; - margin-bottom: 16px; - } - - .friend-avatar-company { - @include ellipsis; - line-height: 1; - font-size: 26px; - color: boleGetCssVar('text-color', 'regular'); - } - } - - &.large { - .friend-avatar { - .my-avatar { - width: 110px; - height: 110px; - - .nut-img { - width: 110rpx; - height: 110rpx; - } - } - } - - .friend-avatar-info { - .friend-avatar-name { - padding-top: 25px; - margin-bottom: 14px; - } - } - } -} -</style> diff --git a/packages/hooks/index.ts b/packages/hooks/index.ts index c031800..20402e6 100644 --- a/packages/hooks/index.ts +++ b/packages/hooks/index.ts @@ -1,7 +1,6 @@ export * from './area'; export * from './file'; export * from './infiniteLoading'; -export * from './message'; export * from './dic'; export * from './setting'; export * from './identify'; diff --git a/packages/hooks/message.ts b/packages/hooks/message.ts deleted file mode 100644 index ae02522..0000000 --- a/packages/hooks/message.ts +++ /dev/null @@ -1,79 +0,0 @@ -import * as messageServices from '@12333/services/api/Message'; -import { useQuery, useQueryClient } from '@tanstack/vue-query'; -import { MessageChatTypeEnum } from '@12333/constants'; -import { MaybeRef, unref } from 'vue'; - -type UseMyMessageCountOptions = { - messageChatType?: MaybeRef<MessageChatTypeEnum>; - enabled?: MaybeRef<boolean>; - isContainLikeFavoriteAddFollowMessageCount?: MaybeRef<boolean>; -}; - -export function useMyMessageCount(options: UseMyMessageCountOptions = {}) { - const { - messageChatType, - enabled = true, - isContainLikeFavoriteAddFollowMessageCount = true, - } = options; - - const { data } = useQuery({ - queryKey: [ - 'messageCount', - 'messageServices/getMyMessageCount', - messageChatType, - isContainLikeFavoriteAddFollowMessageCount, - ], - queryFn: async () => { - return await messageServices.getMyMessageCount( - { - messageChatType: unref(messageChatType), - isContainLikeFavoriteAddFollowMessageCount: unref( - isContainLikeFavoriteAddFollowMessageCount - ), - }, - { showLoading: false } - ); - }, - placeholderData: () => ({} as API.MyMessageCountOutput), - enabled: enabled, - }); - - return { - myMessageCount: data, - }; -} - -export function useSetMessageIsRead() { - const queryClient = useQueryClient(); - - async function setAllMessageIsRead(params: API.APIsetAllMessageIsReadParams) { - try { - let res = await messageServices.setAllMessageIsRead(params, { - showLoading: false, - }); - if (res) { - queryClient.invalidateQueries({ - queryKey: ['messageCount'], - }); - } - } catch (error) {} - } - - async function setAllMessageIsReadByChatType(params: API.MessageChatTypeEnum) { - try { - let res = await messageServices.setAllMessageIsReadByChatType(params, { - showLoading: false, - }); - if (res) { - queryClient.invalidateQueries({ - queryKey: ['messageCount'], - }); - } - } catch (error) {} - } - - return { - setAllMessageIsRead, - setAllMessageIsReadByChatType, - }; -} -- Gitblit v1.9.1