From e75076815db5ab6870353d0760b962b671e7c56f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 23 十二月 2025 17:50:28 +0800
Subject: [PATCH] fix: 甲方小程序
---
apps/housekeepingMiniApp/src/pages/mine/index.vue | 160 ++++++++++++-----------------------------------------
1 files changed, 37 insertions(+), 123 deletions(-)
diff --git a/apps/housekeepingMiniApp/src/pages/mine/index.vue b/apps/housekeepingMiniApp/src/pages/mine/index.vue
index 68cc1c8..ce4e369 100644
--- a/apps/housekeepingMiniApp/src/pages/mine/index.vue
+++ b/apps/housekeepingMiniApp/src/pages/mine/index.vue
@@ -11,44 +11,12 @@
<img :src="OssAssets.mine.Bg" class="mine-page-bg" :style="{ height: `${bgHeight}px` }" />
</template>
<ContentView>
- <UserHomeTopView :showUserHomePageBtn="isLogin" :showOperation="isLogin">
+ <UserHomeTopView :showOperation="isLogin">
<template #avatar>
<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-auth">
- <div class="user-info-auth-item">
- <div class="user-info-unCertified">
- <div
- class="user-info-unCertified-text"
- v-if="userDetail?.realStatus === EnumPersonalUserRealStatus.UnReal"
- >
- 鏈璇�
- </div>
- <div class="user-info-unCertified-text" v-else>
- {{ EnumUserRealMethodText[userDetail?.realMethod]
- }}{{ EnumPersonalUserRealStatusText[userDetail?.realStatus] }}
- </div>
- <div
- class="user-info-unCertified-btn"
- @click.stop="goAuthentication"
- v-if="
- userDetail?.realStatus === EnumPersonalUserRealStatus.UnReal ||
- userDetail?.realStatus === EnumPersonalUserRealStatus.Fail
- "
- >
- 绔嬪嵆璁よ瘉
- </div>
- </div>
- <!-- <div class="user-info-unCertified" v-else>
- <img :src="IconAuth" class="user-info-unCertified-icon" />
- <div class="user-info-unCertified-text">
- {{ EnumUserRealMethodText[userDetail?.realMethod] }}{{ EnumPersonalUserRealStatusText[userDetail?.realStatus] }}
- </div>
- </div> -->
- </div>
- </div>
+ <div class="user-info-item">{{ displayName }}</div>
</div>
<div class="mine-go-login" v-else>鍘荤櫥褰�</div>
</div>
@@ -56,94 +24,67 @@
</UserHomeTopView>
</ContentView>
<ContentScrollView v-if="isLogin" class="mine-content-scroll-view">
- <List class="mine-list-wrapper mine-balance">
- <div class="mine-balance-content">
- <div class="mine-balance-content-item">
- <div class="mine-balance-content-item-title">鎴戠殑鏀剁泭</div>
- <div class="mine-balance-content-item-money income">
- 锟{ toThousand(userDetail?.incomeCount ?? 0) }}
- </div>
- </div>
- <div class="mine-balance-content-item">
- <div class="mine-balance-content-item-title">寰呯粨绠�</div>
- <div class="mine-balance-content-item-money settlement">
- 锟{ toThousand(userDetail?.waitSettlement ?? 0) }}
- </div>
- </div>
- <div class="mine-balance-content-item">
- <div class="mine-balance-content-item-title">宸插彂鏀�</div>
- <div class="mine-balance-content-item-money withdraw">
- 锟{ toThousand(userDetail?.releaseedCount ?? 0) }}
- </div>
- </div>
- </div>
- <div class="mine-balance-btn" @click="goMineWallet">
- 杩涘叆鎴戠殑閽卞寘
- <img :src="IconArrow" class="mine-balance-btn-icon" />
- </div>
- </List>
<List class="mine-list-wrapper mine-order-list">
<div class="mine-order-list-title">
- <div class="mine-order-list-title-text">鎴戠殑璁㈠崟</div>
- <img :src="IconArrow" class="mine-order-list-title-icon" />
+ <div class="mine-order-list-title-text">鎴戠殑棰勭害</div>
+ <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>
</div>
<div class="mine-order-list-content">
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.taskCount > 0"
- @click="goMineSign"
+ :dot="false"
+ @click="goMineReserveService"
>
<img :src="IconOrderSign" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸叉姤鍚�</div>
+ <div class="mine-order-list-text">寰呯‘璁�</div>
</nut-badge>
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.hirePassTaskCount > 0"
- @click="goMineHired"
+ :dot="false"
+ @click="goMineReserveService"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸插綍鐢�</div>
+ <div class="mine-order-list-text">寰呮湇鍔�</div>
</nut-badge>
<nut-badge
class="mine-order-list-item"
top="8"
- :dot="userDetail?.arrangeCompleteTaskCount > 0"
- @click="goMineHire"
+ :dot="false"
+ @click="goMineReserveService"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸插畨鎺�</div>
- </nut-badge>
-
- <!-- <nut-badge
- class="mine-order-list-item"
- top="8"
- :value="userDetail?.hirePassTaskCount ?? 0"
- @click="goMineHire"
- >
- <img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸插畨鎺�</div>
+ <div class="mine-order-list-text">宸插畬鎴�</div>
</nut-badge>
<nut-badge
class="mine-order-list-item"
top="8"
- :value="userDetail?.hireRefuseTaskCount ?? 0"
- @click="goMineCancel"
+ :dot="false"
+ @click="goMineReserveService"
>
<img :src="IconOrderCancel" class="mine-order-list-icon" />
<div class="mine-order-list-text">宸插彇娑�</div>
- </nut-badge> -->
+ </nut-badge>
</div>
</List>
<List class="mine-list-wrapper mine-setting-list">
- <ListItem :icon="IconCollect" title="鎴戞敹钘忕殑浠诲姟" @click="goMineCollectTask"></ListItem>
- <ListItem :icon="IconAgreement" title="鍗忚绛剧害" @click="goMineAgreementSign"></ListItem>
+ <ListItem :icon="IconAgreement" title="璁㈠崟绠＄悊" @click="goMineOrderManage"></ListItem>
+ <ListItem :icon="IconCollect" title="鏀惰棌澶�" @click="goMineCollectTask"></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>
</ContentScrollView>
- <CustomerServiceButton />
+ <!-- <CustomerServiceButton /> -->
</PageLayoutWithBg>
</template>
@@ -157,37 +98,20 @@
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 {
- EnumUserRealMethodText,
- EnumPersonalUserRealStatusText,
- 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';
-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();
@@ -222,30 +146,20 @@
};
});
-function goAuthentication() {
- goPage(RouterPath.authenticationHome);
+function goCompanyInfo() {
+ goPage(RouterPath.companyInfo);
}
-function goMineSign() {
- goPage(RouterPath.mineSign);
-}
-function goMineHire() {
- goPage(RouterPath.mineHire);
-}
-function goMineCancel() {
- goPage(RouterPath.mineCancel);
-}
-function goMineHired() {
- goPage(RouterPath.mineHired);
-}
+
function goMineCollectTask() {
goPage(RouterPath.mineCollectTask);
}
-function goMineAgreementSign() {
- goPage(RouterPath.mineAgreementSign);
+
+function goMineReserveService() {
+ goPage(RouterPath.mineReserveService);
}
-function goMineWallet() {
- goPage(RouterPath.mineWallet);
+function goMineOrderManage() {
+ goPage(RouterPath.mineOrderManage);
}
</script>
--
Gitblit v1.10.0