From 0e2cd06ac9a66da506a23002799cf2a398ff7c4c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 30 十二月 2025 18:12:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cStandardMiniApp/src/constants/tabBar.ts | 4 +-
apps/housekeepingMiniApp/project.private.config.json | 4 +-
packages/hooks/standardOrder.ts | 8 ++--
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue | 21 ++++++----
apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue | 4 +
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue | 1
apps/cStandardMiniApp/src/stores/modules/system.ts | 2
apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue | 1
apps/cStandardMiniApp/src/utils/page.ts | 4 +-
apps/cStandardMiniApp/src/constants/router.ts | 2
apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue | 2
apps/cStandardMiniApp/src/custom-tab-bar/index.tsx | 24 +++---------
apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue | 6 +++
apps/cStandardMiniApp/src/app.config.ts | 16 ++++----
apps/housekeepingMiniApp/src/pages/home/index.vue | 2
15 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
index 38cc784..c6c3cd2 100644
--- a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManage/InnerPage.vue
@@ -40,6 +40,7 @@
:supplierEnterpriseName="item.supplierEnterpriseName"
:address-detail="item.addressDetail"
:appointmentStatus="item.appointmentStatus"
+ :payAmount="item.payAmount"
@click="goDetail(item)"
>
<template #serviceCustome>
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue
index 93df367..a5f22ba 100644
--- a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue
@@ -21,16 +21,21 @@
</template>
</MineServiceDetailView>
</ContentScrollView>
- <PageFooter
- v-if="
- detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
- detail?.payStatus !== EnumStandardOrderPayStatus.Completed
- "
- >
- <PageFooterBtn class="business-card-btn" @click="cancelStandardOrderAppointment"
+ <PageFooter>
+ <PageFooterBtn
+ v-if="detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure"
+ class="business-card-btn"
+ @click="cancelStandardOrderAppointment"
>鍙栨秷棰勭害</PageFooterBtn
>
- <PageFooterBtn type="primary" class="business-card-btn" @click="handleSubmit"
+ <PageFooterBtn
+ v-if="
+ detail?.appointmentStatus === EnumStandardOrderAppointmentStatus.WaitSure &&
+ detail?.payStatus === EnumStandardOrderPayStatus.Completed
+ "
+ type="primary"
+ class="business-card-btn"
+ @click="handleSubmit"
>纭棰勭害</PageFooterBtn
>
</PageFooter>
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
index 263d9ad..9cbf73f 100644
--- a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
@@ -31,6 +31,7 @@
:end-time="item.endTime"
:supplierEnterpriseName="item.supplierEnterpriseName"
:address-detail="item.addressDetail"
+ :payAmount="item.payAmount"
@click="goOrderDetail(item)"
>
<template #status>
diff --git a/apps/cStandardMiniApp/src/app.config.ts b/apps/cStandardMiniApp/src/app.config.ts
index 87461fc..f215c3e 100644
--- a/apps/cStandardMiniApp/src/app.config.ts
+++ b/apps/cStandardMiniApp/src/app.config.ts
@@ -1,6 +1,6 @@
export default defineAppConfig({
- entryPagePath: 'pages/home/index',
- pages: ['pages/home/index', 'pages/task/task', 'pages/mine/index'],
+ entryPagePath: 'pages/mine/index',
+ pages: ['pages/task/task', 'pages/mine/index'],
requiredPrivateInfos: ['getLocation', 'chooseLocation'],
permission: {
'scope.userLocation': {
@@ -19,12 +19,12 @@
},
tabBar: {
list: [
- {
- pagePath: 'pages/home/index',
- iconPath: 'assets/tabbar/icon-home.png',
- selectedIconPath: 'assets/tabbar/icon-home-active.png',
- text: '棣栭〉',
- },
+ // {
+ // pagePath: 'pages/home/index',
+ // iconPath: 'assets/tabbar/icon-home.png',
+ // selectedIconPath: 'assets/tabbar/icon-home-active.png',
+ // text: '棣栭〉',
+ // },
{
pagePath: 'pages/task/task',
iconPath: 'assets/tabbar/icon-task.png',
diff --git a/apps/cStandardMiniApp/src/constants/router.ts b/apps/cStandardMiniApp/src/constants/router.ts
index 66ded17..06f74a1 100644
--- a/apps/cStandardMiniApp/src/constants/router.ts
+++ b/apps/cStandardMiniApp/src/constants/router.ts
@@ -5,7 +5,7 @@
privacyPolicy = '/subpackages/login/privacyPolicy/privacyPolicy',
loginByForm = '/subpackages/login/loginByForm/loginByForm',
registerForm = '/subpackages/login/registerForm/registerForm',
- home = '/pages/home/index',
+ // home = '/pages/home/index',
task = '/pages/task/task',
mine = '/pages/mine/index',
editRichContent = '/subpackages/editRichContent/editRichContent',
diff --git a/apps/cStandardMiniApp/src/constants/tabBar.ts b/apps/cStandardMiniApp/src/constants/tabBar.ts
index aec3007..98dcba2 100644
--- a/apps/cStandardMiniApp/src/constants/tabBar.ts
+++ b/apps/cStandardMiniApp/src/constants/tabBar.ts
@@ -1,11 +1,11 @@
export const TabBarPageRouter = {
- Home: '/pages/home/index',
+ // Home: '/pages/home/index',
Task: '/pages/task/task',
Mine: '/pages/mine/index',
};
export const TabBarPageRouterList = [
- TabBarPageRouter.Home,
+ // TabBarPageRouter.Home,
TabBarPageRouter.Task,
TabBarPageRouter.Mine,
];
diff --git a/apps/cStandardMiniApp/src/custom-tab-bar/index.tsx b/apps/cStandardMiniApp/src/custom-tab-bar/index.tsx
index 44fb564..7c2772b 100644
--- a/apps/cStandardMiniApp/src/custom-tab-bar/index.tsx
+++ b/apps/cStandardMiniApp/src/custom-tab-bar/index.tsx
@@ -49,7 +49,7 @@
click: (url: string, index: number) => typeof url === 'string',
};
-const whitePageList = [RouterPath.home, RouterPath.mine];
+const whitePageList = [RouterPath.task, RouterPath.mine];
export default {
name: 'CustomTabBar',
@@ -104,7 +104,7 @@
Message.confirm({ message: '璇峰墠寰�鐧诲綍' })
.then(() => {
Taro.navigateTo({
- url: `${RouterPath.authorization}?redirect=${RouterPath.home}`,
+ url: `${RouterPath.authorization}?redirect=${RouterPath.task}`,
});
})
.finally(() => {
@@ -129,27 +129,15 @@
}}
>
<TarBarItem
- text={'鎵惧伐浣�'}
- icon="../assets/tabbar/icon-home.png"
- activeIcon="../assets/tabbar/icon-home-active.png"
- pagePath={TabBarPageRouter.Home}
- currentPath={_router.path}
- index={0}
- active={system.activeTab === 0}
- className="home"
- onClick={switchTab}
- ></TarBarItem>
-
- <TarBarItem
text="浠诲姟"
icon="../assets/tabbar/icon-task.png"
activeIcon="../assets/tabbar/icon-task-active.png"
pagePath={TabBarPageRouter.Task}
currentPath={_router.path}
- active={system.activeTab === 1}
+ active={system.activeTab === 0}
className="task"
onClick={switchTab}
- index={1}
+ index={0}
></TarBarItem>
<TarBarItem
text="鎴戠殑"
@@ -157,10 +145,10 @@
activeIcon="../assets/tabbar/icon-mine-active.png"
pagePath={TabBarPageRouter.Mine}
currentPath={_router.path}
- active={system.activeTab === 2}
+ active={system.activeTab === 1}
className="mine"
onClick={switchTab}
- index={2}
+ index={1}
></TarBarItem>
</View>
);
diff --git a/apps/cStandardMiniApp/src/stores/modules/system.ts b/apps/cStandardMiniApp/src/stores/modules/system.ts
index 8fdd047..63ce4ea 100644
--- a/apps/cStandardMiniApp/src/stores/modules/system.ts
+++ b/apps/cStandardMiniApp/src/stores/modules/system.ts
@@ -25,7 +25,7 @@
state: () => ({
options: {} as Options,
- activeTab: 0,
+ activeTab: 1,
info: {} as Taro.getSystemInfoSync.Result,
diff --git a/apps/cStandardMiniApp/src/utils/page.ts b/apps/cStandardMiniApp/src/utils/page.ts
index 067f334..d5bb3cf 100644
--- a/apps/cStandardMiniApp/src/utils/page.ts
+++ b/apps/cStandardMiniApp/src/utils/page.ts
@@ -18,8 +18,8 @@
export function goHome() {
const systemStore = useSystemStoreWithOut();
- systemStore.setTabIndex(0);
+ systemStore.setTabIndex(1);
Taro.switchTab({
- url: '/pages/home/index',
+ url: '/pages/mine/index',
});
}
diff --git a/apps/housekeepingMiniApp/project.private.config.json b/apps/housekeepingMiniApp/project.private.config.json
index 9630c7a..dbdbe55 100644
--- a/apps/housekeepingMiniApp/project.private.config.json
+++ b/apps/housekeepingMiniApp/project.private.config.json
@@ -26,8 +26,8 @@
"name": "璁㈠崟璇︽儏",
"pathName": "subpackages/mine/mineOrderDetail/mineOrderDetail",
"query": "id=d16809d3-e6b9-4b5f-2e87-08de443f2678",
- "scene": null,
- "launchMode": "default"
+ "launchMode": "default",
+ "scene": null
},
{
"name": "鍙栨秷鍘熷洜",
diff --git a/apps/housekeepingMiniApp/src/pages/home/index.vue b/apps/housekeepingMiniApp/src/pages/home/index.vue
index d3b2bee..049abfa 100644
--- a/apps/housekeepingMiniApp/src/pages/home/index.vue
+++ b/apps/housekeepingMiniApp/src/pages/home/index.vue
@@ -1,5 +1,5 @@
<template>
- <PageLayoutWithBg class="index-page-wrapper" :title="'棣栭〉'" :need-auth="false">
+ <PageLayoutWithBg class="index-page-wrapper" :title="'娣橀棯宸�'" :need-auth="false">
<!-- <template #left>
<div class="menu-btn-wrapper menu-logo">
<img :src="IconLogo" class="logo" />
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue
index e11803c..0059a37 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/editAddress/InnerPage.vue
@@ -55,6 +55,7 @@
});
const router = Taro.useRouter();
+const { userDetail } = useUser();
const id = router.params?.id ?? '';
const isCopy = router.params?.isCopy === 'true';
const isEdit = !!id;
@@ -73,7 +74,7 @@
});
const rules = reactive<FormRules>({
- // name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
+ name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
contactPhoneNumber: [
{ required: true, message: '璇疯緭鍏ユ墜鏈哄彿' },
{ validator: FormValidator.validatorPhoneNumber, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙�' },
@@ -113,6 +114,7 @@
countyCode: data.areaCode,
latitude: data.latitude,
longitude: data.longitude,
+ addressName: data.addressName,
address: data.addressName,
};
form.addressDetail = data.addressDetail;
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index 820d4ca..3bbd1fa 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
@@ -313,7 +313,7 @@
} catch (error) {
} finally {
Taro.redirectTo({
- url: `${RouterPath.mineOrderDetail}?id=${orderId}`,
+ url: `${RouterPath.serciceDetail}?id=${id}`,
});
}
}
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
index 7f7375d..0c8d328 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/serciceDetail/serciceDetail.vue
@@ -237,5 +237,11 @@
.serciceDetail-content-list {
margin-bottom: 20px;
}
+
+ .serciceDetail-recommend-list {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ grid-gap: 20px;
+ }
}
</style>
diff --git a/packages/hooks/standardOrder.ts b/packages/hooks/standardOrder.ts
index ecdb491..caf5ab1 100644
--- a/packages/hooks/standardOrder.ts
+++ b/packages/hooks/standardOrder.ts
@@ -124,16 +124,16 @@
},
};
- if (queryState.appointmentStatus) {
+ if (Number(queryState.appointmentStatus)) {
params.appointmentStatus = queryState.appointmentStatus;
}
- if (queryState.payStatus) {
+ if (Number(queryState.payStatus)) {
params.payStatus = queryState.payStatus;
}
- if (queryState.partAEnterpriseOrderStatus) {
+ if (Number(queryState.partAEnterpriseOrderStatus)) {
params.partAEnterpriseOrderStatus = queryState.partAEnterpriseOrderStatus;
}
- if (queryState.supplierEnterpriseOrderStatus) {
+ if (Number(queryState.supplierEnterpriseOrderStatus)) {
params.supplierEnterpriseOrderStatus = queryState.supplierEnterpriseOrderStatus;
}
--
Gitblit v1.10.0