From fe71482bb61c4852ad515dd95d9cb93a4726a5d4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 30 十二月 2025 19:13:35 +0800
Subject: [PATCH] fix: 甲方小程序
---
apps/bStandardMiniApp/project.config.json | 2
apps/housekeepingMiniApp/project.config.json | 2
apps/bStandardMiniApp/ci/upload.js | 3 +
apps/housekeepingMiniApp/ci/upload.js | 3 +
apps/cStandardMiniApp/ci/upload.js | 3 +
packages/services/apiV2/typings.d.ts | 4 ++
apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceConfirm/InnerPage.vue | 84 +++++++++++++++++++++++++++++++++--------
packages/constants/apiEnum.ts | 2 +
apps/cStandardMiniApp/project.config.json | 2
9 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/apps/bStandardMiniApp/ci/upload.js b/apps/bStandardMiniApp/ci/upload.js
index af792f3..e6ee456 100644
--- a/apps/bStandardMiniApp/ci/upload.js
+++ b/apps/bStandardMiniApp/ci/upload.js
@@ -27,7 +27,8 @@
return {
weapp: {
appid: config.appid,
- privateKeyPath: `${projectPath}/ci/private.wx670e93d737a59ba4.key`,
+ privateKeyPath: `${projectPath}/ci/private.wxc47d6f255e7d0566.key`,
+ // privateKeyPath: `${projectPath}/ci/private.wx670e93d737a59ba4.key`,
robot: robot,
setting: {
minify: false,
diff --git a/apps/bStandardMiniApp/project.config.json b/apps/bStandardMiniApp/project.config.json
index 1451a57..79cf68e 100644
--- a/apps/bStandardMiniApp/project.config.json
+++ b/apps/bStandardMiniApp/project.config.json
@@ -55,7 +55,7 @@
"ignore": [],
"include": []
},
- "appid": "wx670e93d737a59ba4",
+ "appid": "wxc47d6f255e7d0566",
"projectname": "bStandardMiniApp",
"simulatorPluginLibVersion": {}
}
diff --git a/apps/cStandardMiniApp/ci/upload.js b/apps/cStandardMiniApp/ci/upload.js
index f0abc00..85ded07 100644
--- a/apps/cStandardMiniApp/ci/upload.js
+++ b/apps/cStandardMiniApp/ci/upload.js
@@ -27,7 +27,8 @@
return {
weapp: {
appid: config.appid,
- privateKeyPath: `${projectPath}/ci/private.wx319472d08e4b0fe1.key`,
+ privateKeyPath: `${projectPath}/ci/private.wxb9e0baf4f87aa0de.key`,
+ // privateKeyPath: `${projectPath}/ci/private.wx319472d08e4b0fe1.key`,
robot: robot,
setting: {
minify: false,
diff --git a/apps/cStandardMiniApp/project.config.json b/apps/cStandardMiniApp/project.config.json
index 736e24b..fee997e 100644
--- a/apps/cStandardMiniApp/project.config.json
+++ b/apps/cStandardMiniApp/project.config.json
@@ -51,7 +51,7 @@
"srcMiniprogramRoot": "dist/",
"condition": {},
"simulatorPluginLibVersion": {},
- "appid": "wx319472d08e4b0fe1",
+ "appid": "wxb9e0baf4f87aa0de",
"packOptions": {
"ignore": [],
"include": []
diff --git a/apps/housekeepingMiniApp/ci/upload.js b/apps/housekeepingMiniApp/ci/upload.js
index 2f82e76..8127852 100644
--- a/apps/housekeepingMiniApp/ci/upload.js
+++ b/apps/housekeepingMiniApp/ci/upload.js
@@ -27,7 +27,8 @@
return {
weapp: {
appid: config.appid,
- privateKeyPath: `${projectPath}/ci/private.wxb9fd8132fa327c85.key`,
+ privateKeyPath: `${projectPath}/ci/private.wx3669dd12a0915f7d.key`,
+ // privateKeyPath: `${projectPath}/ci/private.wxb9fd8132fa327c85.key`,
robot: robot,
setting: {
minify: false,
diff --git a/apps/housekeepingMiniApp/project.config.json b/apps/housekeepingMiniApp/project.config.json
index 68fe378..783e3b1 100644
--- a/apps/housekeepingMiniApp/project.config.json
+++ b/apps/housekeepingMiniApp/project.config.json
@@ -51,7 +51,7 @@
"srcMiniprogramRoot": "dist/",
"condition": {},
"simulatorPluginLibVersion": {},
- "appid": "wxb9fd8132fa327c85",
+ "appid": "wx3669dd12a0915f7d",
"packOptions": {
"ignore": [],
"include": []
diff --git a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceConfirm/InnerPage.vue b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceConfirm/InnerPage.vue
index 7458357..6d53dee 100644
--- a/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceConfirm/InnerPage.vue
+++ b/apps/housekeepingMiniApp/src/subpackages/mine/mineReserveServiceConfirm/InnerPage.vue
@@ -1,14 +1,17 @@
<template>
- <ContentScrollView style="background-color: transparent" has-padding-top>
+ <ContentScrollView style="background-color: #fff" has-padding-top>
+ <div class="taskCheckFileCard-status-title">楠屾敹鐓х墖</div>
<TaskCheckFileCard
- :created-time="'2025-12-12 12:12:12'"
- :userCheckInTime="'2025-12-12 12:12:12'"
- :userCheckOutTime="'2025-12-12 12:12:12'"
- :checkReceiveStatus="10"
- :checkReceiveMethods="[10]"
- :files="list"
+ :created-time="detail.createdTime"
+ :files="detail?.files?.map?.((x) => setOSSLink(x))"
></TaskCheckFileCard>
- <nut-form :model-value="form" ref="formRef" :rules="rules" label-position="top">
+ <nut-form
+ :model-value="form"
+ ref="formRef"
+ :rules="rules"
+ label-position="top"
+ class="mineReserveServiceConfirm-page-form"
+ >
<nut-form-item class="bole-form-item" prop="remark" label="澶囨敞">
<nut-textarea v-model="form.remark" rows="4" placeholder="璇疯緭鍏�"> </nut-textarea>
</nut-form-item>
@@ -21,25 +24,38 @@
<script setup lang="ts">
import Taro from '@tarojs/taro';
-import * as standardServiceServices from '@12333/services/apiV2/standardService';
+import * as standardOrderServices from '@12333/services/apiV2/standardOrder';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { TaskCheckFileCard } from '@12333/components';
-import { setOSSLink } from '@12333/utils';
+import { Message, setOSSLink } from '@12333/utils';
+import { useQuery } from '@tanstack/vue-query';
+import { goBack } from '@/utils';
defineOptions({
name: 'InnerPage',
});
-const list = ref([
- 'https://storage.360buyimg.com/jdc-article/NutUItaro34.jpg',
- 'https://storage.360buyimg.com/jdc-article/NutUItaro2.jpg',
- 'https://storage.360buyimg.com/jdc-article/welcomenutui.jpg',
- 'https://storage.360buyimg.com/jdc-article/fristfabu.jpg',
-]);
-
const route = Taro.useRouter();
const id = route.params?.id as string;
+const {
+ isLoading,
+ isError,
+ data: detail,
+ refetch,
+} = useQuery({
+ queryKey: ['standardOrderServices/getSureStandardOrder', id],
+ queryFn: async () => {
+ const params: API.APIgetSureStandardOrderParams = {
+ id: id,
+ };
+ return await standardOrderServices.getSureStandardOrder(params, {
+ showLoading: false,
+ });
+ },
+ placeholderData: () => ({} as API.GetSureStandardOrderQueryResult),
+});
+
const form = reactive({
remark: '',
});
@@ -58,10 +74,44 @@
async function confirm() {
try {
+ let params: API.SureStandardOrderCommand = {
+ id: id,
+ appointmentCompletedRemark: form.remark,
+ };
+ let res = await standardOrderServices.sureStandardOrder(params);
+ if (res) {
+ Message.success('宸茬‘璁�', {
+ onClosed() {
+ goBack();
+ },
+ });
+ }
} catch (error) {}
}
</script>
<style lang="scss">
@import '@/styles/common.scss';
+
+.mineReserveServiceConfirm-page-wrapper {
+ .taskCheckFileCard-status-title {
+ font-weight: 600;
+ font-size: 28px;
+ line-height: 32px;
+ margin-bottom: 16px;
+ color: boleGetCssVar('text-color', 'primary');
+ }
+
+ .mineReserveServiceConfirm-page-form {
+ margin-top: 20px;
+
+ .nut-cell-group__wrap {
+ box-shadow: none;
+ }
+
+ .bole-form-item {
+ padding: 0 !important;
+ }
+ }
+}
</style>
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 69697f3..d19f469 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -269,6 +269,8 @@
Income = 11,
/**杞处 */
Transfer = 20,
+ /**鍒嗚处 */
+ ProfitSaring = 21,
}
/** 娌″啓娉ㄩ噴 */
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index da9fa72..2d0a458 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -1231,6 +1231,8 @@
Income = 11,
/**杞处 */
Transfer = 20,
+ /**鍒嗚处 */
+ ProfitSaring = 21,
}
enum EnumGetArrangeTaskUsersQueryApplyStatus {
@@ -8655,6 +8657,8 @@
id?: string;
/** 楠屾敹瀹屾垚鏃堕棿 */
checkReceiveTime?: string;
+ /** 鍒涘缓鏃堕棿 */
+ createdTime?: string;
/** 闄勪欢 */
files?: string[];
/** 澶囨敞 */
--
Gitblit v1.10.0