From eae59b2d0c6f23529b4ab22c0bc4ed528e4d64f5 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 31 十二月 2025 10:03:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/housekeepingMiniApp/src/pages/mine/index.vue | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/pages/mine/index.vue b/apps/housekeepingMiniApp/src/pages/mine/index.vue
index fe669fe..3f9743d 100644
--- a/apps/housekeepingMiniApp/src/pages/mine/index.vue
+++ b/apps/housekeepingMiniApp/src/pages/mine/index.vue
@@ -16,7 +16,7 @@
<div class="mine-avatar-wrapper" @click="goLogin">
<UserAvatar :size="52" class="mine-avatar" />
<div class="user-info" v-if="isLogin">
- <div class="user-info-item">{{ userDetail?.name ?? '' }}</div>
+ <div class="user-info-item">{{ displayName }}</div>
</div>
<div class="mine-go-login" v-else>鍘荤櫥褰�</div>
</div>
@@ -27,7 +27,7 @@
<List class="mine-list-wrapper mine-order-list">
<div class="mine-order-list-title">
<div class="mine-order-list-title-text">鎴戠殑棰勭害</div>
- <div class="mine-order-list-title-arrow-wrapper" @click="goMineReserveService">
+ <div class="mine-order-list-title-arrow-wrapper" @click="goMineReserveService()">
<div class="mine-order-list-title-sub-text">鍏ㄩ儴棰勭害</div>
<img :src="IconArrow" class="mine-order-list-title-icon" />
</div>
@@ -36,8 +36,8 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.taskCount > 0"
- @click="goMineReserveService"
+ :dot="false"
+ @click="goMineReserveService(EnumStandardOrderAppointmentStatus.WaitSure)"
>
<img :src="IconOrderSign" class="mine-order-list-icon" />
<div class="mine-order-list-text">寰呯‘璁�</div>
@@ -45,8 +45,8 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.hirePassTaskCount > 0"
- @click="goMineReserveService"
+ :dot="false"
+ @click="goMineReserveService(EnumStandardOrderAppointmentStatus.WaitServe)"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
<div class="mine-order-list-text">寰呮湇鍔�</div>
@@ -54,8 +54,8 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.arrangeCompleteTaskCount > 0"
- @click="goMineReserveService"
+ :dot="false"
+ @click="goMineReserveService(EnumStandardOrderAppointmentStatus.Completed)"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
<div class="mine-order-list-text">宸插畬鎴�</div>
@@ -63,18 +63,23 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.arrangeCompleteTaskCount > 0"
- @click="goMineReserveService"
+ :dot="false"
+ @click="goMineReserveService(EnumStandardOrderAppointmentStatus.Cancelled)"
>
- <img :src="IconOrderHire" class="mine-order-list-icon" />
+ <img :src="IconOrderCancel" class="mine-order-list-icon" />
<div class="mine-order-list-text">宸插彇娑�</div>
</nut-badge>
</div>
</List>
<List class="mine-list-wrapper mine-setting-list">
- <ListItem :icon="IconCollect" title="璁㈠崟绠＄悊" @click="goMineOrderManage"></ListItem>
+ <ListItem :icon="IconAgreement" title="璁㈠崟绠＄悊" @click="goMineOrderManage"></ListItem>
<ListItem :icon="IconCollect" title="鏀惰棌澶�" @click="goMineCollectTask"></ListItem>
- <ListItem :icon="IconAgreement" title="鍗囩骇浼佷笟鐗�" @click="goCompanyInfo"></ListItem>
+ <ListItem
+ :icon="IconRecruit"
+ v-if="!userDetail?.enterpriseIsReal"
+ title="鍗囩骇浼佷笟鐗�"
+ @click="goCompanyInfo"
+ ></ListItem>
<ListItem :icon="IconSetting" title="璁剧疆" @click="goSetting"></ListItem>
<!-- <ListItem :icon="IconRecruit" title="鎴戣鎷涗汉/鐢ㄤ汉" @click="goSetting"></ListItem> -->
</List>
@@ -93,33 +98,21 @@
import IconOrderSign from '@/assets/mine/icon-order-sign.png';
import IconOrderHire from '@/assets/mine/icon-order-hire.png';
import IconOrderCancel from '@/assets/mine/icon-order-cancel.png';
-import IconAuth from '@/assets/mine/icon-auth.png';
import { useUser, useIsLogin, useGoLogin } from '@/hooks';
import Taro from '@tarojs/taro';
import { RouterPath, OssAssets } from '@/constants';
-import { EnumPersonalUserRealStatus } from '@12333/constants';
import { List, ListItem, CustomerServiceButton } from '@12333/components';
import { useSystemStore } from '@/stores/modules/system';
import PageLayoutWithBg from '@/components/Layout/PageLayoutWithBg.vue';
-import { toThousand } from '@12333/utils';
-import { useIntervalFn } from 'senin-mini/hooks';
import { useQuery } from '@tanstack/vue-query';
+import { EnumStandardOrderAppointmentStatus } from '@12333/constants';
-const { userDetail, isCertified, updateUserInfo } = useUser();
+const { userDetail, updateUserInfo, displayName } = useUser();
const isLogin = useIsLogin();
const systemStore = useSystemStore();
const { goLoginFn } = useGoLogin();
const bgHeight = computed(() => 133 + systemStore.navHeight);
-useQuery({
- queryKey: ['updateUserInfo'],
- queryFn: () => {},
- enabled: computed(
- () => isLogin.value && userDetail.value?.realStatus === EnumPersonalUserRealStatus.Checking
- ),
- refetchInterval: 5000,
-});
-
Taro.useDidShow(() => {
if (isLogin.value) {
updateUserInfo();
@@ -162,8 +155,8 @@
goPage(RouterPath.mineCollectTask);
}
-function goMineReserveService() {
- goPage(RouterPath.mineReserveService);
+function goMineReserveService(status: EnumStandardOrderAppointmentStatus = 0 as any) {
+ goPage(`${RouterPath.mineReserveService}?status=${status}`);
}
function goMineOrderManage() {
--
Gitblit v1.10.0