From 50a6acc57bc79c99e0f24b4983cceffa77d878a2 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 25 十二月 2025 14:01:50 +0800
Subject: [PATCH] feat: init
---
apps/bStandardMiniApp/project.config.json | 2
apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue | 2
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.config.ts | 3
packages/components/src/Card/MineServiceDetailView.vue | 0
apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.vue | 13 ++
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue | 2
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue | 37 +++++++
apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.vue | 17 +++
apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/InnerPage.vue | 49 +++++++++
apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.vue | 13 ++
apps/bStandardMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue | 7
apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue | 93 ++++++++++++++++++
apps/bStandardMiniApp/src/pages/workbenches/InnerPage.vue | 4
apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue | 2
apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.config.ts | 3
packages/components/src/index.ts | 1
apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.config.ts | 3
apps/bStandardMiniApp/src/app.config.ts | 11 ++
18 files changed, 253 insertions(+), 9 deletions(-)
diff --git a/apps/bStandardMiniApp/project.config.json b/apps/bStandardMiniApp/project.config.json
index 9eaf623..6ab9404 100644
--- a/apps/bStandardMiniApp/project.config.json
+++ b/apps/bStandardMiniApp/project.config.json
@@ -55,7 +55,7 @@
"ignore": [],
"include": []
},
- "appid": "wx3669dd12a0915f7d",
+ "appid": "wxc47d6f255e7d0566",
"projectname": "bStandardMiniApp",
"simulatorPluginLibVersion": {}
}
\ No newline at end of file
diff --git a/apps/bStandardMiniApp/src/app.config.ts b/apps/bStandardMiniApp/src/app.config.ts
index d02c9a8..781569c 100644
--- a/apps/bStandardMiniApp/src/app.config.ts
+++ b/apps/bStandardMiniApp/src/app.config.ts
@@ -99,6 +99,17 @@
],
},
{
+ root: 'subpackages/appointmentManage',
+ pages: [
+ 'appointmentManage/appointmentManage',
+ 'appointmentManageDetail/appointmentManageDetail',
+ ],
+ },
+ {
+ root: 'subpackages/orderManage',
+ pages: ['orderManage/orderManage', 'orderManageDetail/orderManageDetail'],
+ },
+ {
root: 'subpackages/jobApplicationManage',
pages: [
'jobApplicationManage/jobApplicationManage',
diff --git a/apps/bStandardMiniApp/src/pages/workbenches/InnerPage.vue b/apps/bStandardMiniApp/src/pages/workbenches/InnerPage.vue
index c13d0bb..08825b9 100644
--- a/apps/bStandardMiniApp/src/pages/workbenches/InnerPage.vue
+++ b/apps/bStandardMiniApp/src/pages/workbenches/InnerPage.vue
@@ -6,7 +6,7 @@
<TaskDetailWelfareItem
:icon="IconFlexjobManage"
text="棰勭害绠＄悊"
- @click="goPage(RouterPath.flexJobManage)"
+ @click="goPage(RouterPath.appointmentManage)"
/>
<TaskDetailWelfareItem
:icon="IconAcceptManage"
@@ -16,7 +16,7 @@
<TaskDetailWelfareItem
:icon="IconTaskManage"
text="璁㈠崟绠＄悊"
- @click="goPage(RouterPath.taskManage)"
+ @click="goPage(RouterPath.orderManage)"
/>
</div>
</CellChunk>
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue
new file mode 100644
index 0000000..20f5aae
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/InnerPage.vue
@@ -0,0 +1,37 @@
+<template>
+ <!-- <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> -->
+ <ContentScrollView hasPaddingTop>
+ <MineServiceDetailView />
+ </ContentScrollView>
+ <PageFooter>
+ <PageFooterBtn type="primary" class="business-card-btn" @click="goCancel"
+ >鍙栨秷棰勭害</PageFooterBtn
+ >
+ <PageFooterBtn type="primary" class="business-card-btn" @click="goConfirm"
+ >纭棰勭害</PageFooterBtn
+ >
+ </PageFooter>
+ <!-- </LoadingLayout> -->
+</template>
+
+<script setup lang="ts">
+import { MineServiceDetailView } from '@12333/components';
+import Taro from '@tarojs/taro';
+import * as standardServiceServices from '@12333/services/apiV2/standardService';
+import { RouterPath } from '@/constants';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const route = Taro.useRouter();
+const id = route.params?.id as string;
+
+function goCancel() {}
+
+function goConfirm() {}
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.config.ts b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.vue b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.vue
new file mode 100644
index 0000000..bdf4f89
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/appointmentManage/appointmentManageDetail/appointmentManageDetail.vue
@@ -0,0 +1,13 @@
+<template>
+ <PageLayout class="appointmentManageDetail-page-wrapper" title="棰勭害璇︽儏" has-border>
+ <InnerPage />
+ </PageLayout>
+</template>
+
+<script setup lang="ts">
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'appointmentManageDetail',
+});
+</script>
diff --git a/apps/bStandardMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/bStandardMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
index 95ebb0d..9687fdf 100644
--- a/apps/bStandardMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/bStandardMiniApp/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -105,6 +105,7 @@
async function handleLogin() {
try {
+ let code = await Taro.login();
if (props.policyChecked) {
const { valid } = await formRef.value.validate();
if (valid) {
@@ -112,7 +113,7 @@
await userStore.loginByPassword({
userName: form.userName,
password: form.userPassword,
- code: loginRes.value?.code,
+ code: code.code,
});
handleLoginSuccess();
}
@@ -120,7 +121,7 @@
noAccess();
}
} catch (error) {
- loginRes.value = await Taro.login();
+ // loginRes.value = await Taro.login();
} finally {
form.loading = false;
}
@@ -186,7 +187,7 @@
isAccount.value = false;
}
} finally {
- loginRes.value = await Taro.login();
+ // loginRes.value = await Taro.login();
}
});
</script>
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
new file mode 100644
index 0000000..ca9d581
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/InnerPage.vue
@@ -0,0 +1,93 @@
+<template>
+ <ProTabs
+ v-model="queryState.status"
+ name="home-tab"
+ :showPaneContent="false"
+ class="home-tabs"
+ isTransparent
+ title-gutter="12"
+ title-scroll
+ >
+ <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
+ <ProTabPane
+ :title="`寰呮敮浠榒"
+ :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitHire"
+ ></ProTabPane>
+ <ProTabPane
+ :title="`宸叉敮浠榒"
+ :pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitSignContract"
+ ></ProTabPane>
+ <ProTabPane
+ :title="`宸插畬鎴恅"
+ :pane-key="GetPersonalApplyTaskInfosQueryStatus.HireRefuse"
+ ></ProTabPane>
+ </ProTabs>
+ <InfiniteLoading
+ scrollViewClassName="common-infinite-scroll-list home-list"
+ v-bind="infiniteLoadingProps"
+ :key="queryState.status"
+ >
+ <template #renderItem="{ item }">
+ <ReserveServiceCard
+ :name="item.name"
+ :begin-time="item.beginTime"
+ :end-time="item.endTime"
+ :billing-method="item.billingMethod"
+ :benefits="item.benefits"
+ :service-fee="item.serviceFee"
+ :settlement-cycle="item.settlementCycle"
+ :address-name="item.addressName"
+ @click="goOrderDetail(item)"
+ >
+ </ReserveServiceCard>
+ </template>
+ </InfiniteLoading>
+</template>
+
+<script setup lang="ts">
+import { ProTabs, ProTabPane, ReserveServiceCard } from '@12333/components';
+import { useUserStore } from '@/stores/modules/user';
+import { useInfiniteLoading } from '@12333/hooks';
+import { EnumPagedListOrder, GetPersonalApplyTaskInfosQueryStatus } from '@12333/constants';
+import * as taskServices from '@12333/services/apiV2/task';
+import Taro from '@tarojs/taro';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const queryState = reactive({
+ status: 0 as any as GetPersonalApplyTaskInfosQueryStatus,
+});
+
+const userStore = useUserStore();
+
+const { infiniteLoadingProps } = useInfiniteLoading(
+ ({ pageParam }) => {
+ let params: API.GetTaskInfosQuery = {
+ pageModel: {
+ rows: 20,
+ page: pageParam,
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ },
+ };
+
+ return taskServices.getOpenTaskInfos(params, {
+ showLoading: false,
+ });
+ },
+ {
+ queryKey: ['taskServices/getOpenTaskInfos', queryState],
+ }
+);
+
+function goOrderDetail(item: any) {
+ Taro.navigateTo({
+ url: `${RouterPath.orderManageDetail}?id=${item.id}`,
+ });
+}
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.config.ts b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.vue
new file mode 100644
index 0000000..9212d49
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManage/orderManage.vue
@@ -0,0 +1,17 @@
+<template>
+ <PageLayoutWithBg class="orderManage-page-wrapper" :title="'璁㈠崟绠＄悊'">
+ <InnerPage></InnerPage>
+ </PageLayoutWithBg>
+</template>
+
+<script setup lang="ts">
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'orderManage',
+});
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+</style>
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/InnerPage.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/InnerPage.vue
new file mode 100644
index 0000000..637daf2
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/InnerPage.vue
@@ -0,0 +1,49 @@
+<template>
+ <!-- <LoadingLayout :loading="isLoading" :error="isError" :loadError="refetch"> -->
+ <ContentScrollView hasPaddingTop>
+ <MineServiceDetailView />
+ </ContentScrollView>
+ <PageFooter class="order-settle-bar">
+ <div class="order-settle-price-wrapper">
+ <div class="order-settle-price-label">鏀粯锛�</div>
+ <nut-price :price="155" size="large" />
+ </div>
+ <PageFooterBtn type="primary" class="business-card-btn">绔嬪嵆涓嬪崟</PageFooterBtn>
+ </PageFooter>
+ <!-- </LoadingLayout> -->
+</template>
+
+<script setup lang="ts">
+import { MineServiceDetailView } from '@12333/components';
+import Taro from '@tarojs/taro';
+import * as standardServiceServices from '@12333/services/apiV2/standardService';
+import { useCheckReceiveTaskUserSubmit } from '@12333/hooks';
+
+defineOptions({
+ name: 'InnerPage',
+});
+
+const route = Taro.useRouter();
+const id = route.params?.id as string;
+</script>
+
+<style lang="scss">
+@import '@/styles/common.scss';
+
+.orderManageDetail-page-wrapper {
+ .order-settle-bar {
+ .order-settle-price-wrapper {
+ height: 100%;
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ margin-left: 28px;
+
+ .order-settle-price-label {
+ color: boleGetCssVar('text-color', 'primary');
+ }
+ }
+ }
+}
+</style>
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.config.ts b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.config.ts
new file mode 100644
index 0000000..305fdb1
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.config.ts
@@ -0,0 +1,3 @@
+export default definePageConfig({
+ disableScroll: true,
+});
diff --git a/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.vue b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.vue
new file mode 100644
index 0000000..a555cdb
--- /dev/null
+++ b/apps/bStandardMiniApp/src/subpackages/orderManage/orderManageDetail/orderManageDetail.vue
@@ -0,0 +1,13 @@
+<template>
+ <PageLayout class="orderManageDetail-page-wrapper" title="璁㈠崟璇︽儏" has-border>
+ <InnerPage />
+ </PageLayout>
+</template>
+
+<script setup lang="ts">
+import InnerPage from './InnerPage.vue';
+
+defineOptions({
+ name: 'orderManageDetail',
+});
+</script>
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
index e3a0202..854e72e 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineOrderDetail/InnerPage.vue
@@ -14,7 +14,7 @@
</template>
<script setup lang="ts">
-import MineServiceDetailView from '../../components/MineServiceDetailView.vue';
+import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
import * as standardServiceServices from '@12333/services/apiV2/standardService';
import { useCheckReceiveTaskUserSubmit } from '@12333/hooks';
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
index 045d716..6165adf 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceDetail/InnerPage.vue
@@ -15,7 +15,7 @@
</template>
<script setup lang="ts">
-import MineServiceDetailView from '../../components/MineServiceDetailView.vue';
+import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
import * as standardServiceServices from '@12333/services/apiV2/standardService';
import { RouterPath } from '@/constants';
diff --git a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
index 045d716..6165adf 100644
--- a/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/sercice/addStandardOrder/InnerPage.vue
@@ -15,7 +15,7 @@
</template>
<script setup lang="ts">
-import MineServiceDetailView from '../../components/MineServiceDetailView.vue';
+import { MineServiceDetailView } from '@12333/components';
import Taro from '@tarojs/taro';
import * as standardServiceServices from '@12333/services/apiV2/standardService';
import { RouterPath } from '@/constants';
diff --git a/apps/housekeepingMiniApp/src/subpackages/components/MineServiceDetailView.vue b/packages/components/src/Card/MineServiceDetailView.vue
similarity index 100%
rename from apps/housekeepingMiniApp/src/subpackages/components/MineServiceDetailView.vue
rename to packages/components/src/Card/MineServiceDetailView.vue
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index adf47d1..4090e5b 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -34,6 +34,7 @@
export { default as TaskPrice } from './Card/TaskPrice.vue';
export { default as TaskDetailWelfareItem } from './Card/TaskDetailWelfareItem.vue';
export { default as TaskCheckPersonalView } from './Card/TaskCheckPersonalView.vue';
+export { default as MineServiceDetailView } from './Card/MineServiceDetailView.vue';
export { default as TaskCheckHistoryCard } from './Card/TaskCheckHistoryCard.vue';
export { default as FlexJobTopView } from './Card/FlexJobTopView.vue';
export { default as PayrollManageDetailCard } from './Card/PayrollManageDetailCard.vue';
--
Gitblit v1.10.0