From 608ed6ae8348a77ca332ca44d3f5d55d6e6fdd6b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 29 八月 2025 15:01:13 +0800
Subject: [PATCH] feat: 签约
---
packages/utils/common.ts | 2 +-
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 16 ++++++++++------
apps/cMiniApp/src/constants/router.ts | 1 +
apps/cMiniApp/src/app.config.ts | 1 +
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/apps/cMiniApp/src/app.config.ts b/apps/cMiniApp/src/app.config.ts
index 8a968fd..4c97564 100644
--- a/apps/cMiniApp/src/app.config.ts
+++ b/apps/cMiniApp/src/app.config.ts
@@ -82,6 +82,7 @@
'mineCollectTask/mineCollectTask',
'mineAgreementSign/mineAgreementSign',
'mineAgreementSignDetail/mineAgreementSignDetail',
+ 'mineAgreementSignExtraPage/mineAgreementSignExtraPage',
'setting/setting',
],
},
diff --git a/apps/cMiniApp/src/constants/router.ts b/apps/cMiniApp/src/constants/router.ts
index d394882..d8b744c 100644
--- a/apps/cMiniApp/src/constants/router.ts
+++ b/apps/cMiniApp/src/constants/router.ts
@@ -38,6 +38,7 @@
mineCollectTask = '/subpackages/mine/mineCollectTask/mineCollectTask',
mineAgreementSign = '/subpackages/mine/mineAgreementSign/mineAgreementSign',
mineAgreementSignDetail = '/subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail',
+ mineAgreementSignExtraPage = '/subpackages/mine/mineAgreementSignExtraPage/mineAgreementSignExtraPage',
setting = '/subpackages/mine/setting/setting',
mineWallet = '/subpackages/wallet/mineWallet/mineWallet',
diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
index 2d3090e..db31ead 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
@@ -76,7 +76,7 @@
EnumTaskUserSignContractStatus,
EnumTaskUserSignContractStatusText,
} from '@12333/constants';
-import { format } from '@12333/utils';
+import { format, Message } from '@12333/utils';
import Taro from '@tarojs/taro';
defineOptions({
@@ -110,10 +110,14 @@
});
function checkAgreement() {
- const encodedUrl = encodeURIComponent(detail?.value?.contractUrl);
- Taro.navigateTo({
- url: `${RouterPath.mineAgreementSignDetail}?url=${encodedUrl}`,
- });
+ if (detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Wait) {
+ goToSign();
+ } else {
+ const encodedUrl = encodeURIComponent(detail?.value?.contractUrl);
+ Taro.navigateTo({
+ url: `${RouterPath.mineAgreementSignDetail}?url=${encodedUrl}`,
+ });
+ }
}
const goToSign = useAccessReal(async () => {
@@ -124,7 +128,7 @@
let res = await enterpriseEmployeeServices.personalUserElectronSign(params);
if (res) {
const encodedUrl = encodeURIComponent(res.signContractLongUrl);
- Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` });
+ Taro.navigateTo({ url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}` });
}
} catch (error) {}
});
diff --git a/packages/utils/common.ts b/packages/utils/common.ts
index 238407e..cbf1993 100644
--- a/packages/utils/common.ts
+++ b/packages/utils/common.ts
@@ -133,5 +133,5 @@
export const hiddenIDNumberForEnd6 = (realIDNumber: string) => {
if (!realIDNumber) return '';
- realIDNumber.replace(/^(\d+)(.{6})$/, '$1******');
+ return realIDNumber.replace(/^(\d+)(.{6})$/, '$1******');
};
--
Gitblit v1.9.1