From 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 12 九月 2025 17:36:56 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
index ccbb0d1..8d607b3 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue
@@ -86,10 +86,10 @@
const { userDetail } = useUser();
const router = Taro.useRouter();
-const launchOption = useLaunchOptions();
+const options = Taro.getLaunchOptionsSync();
//鐏靛伐Id
const id = router.params?.id;
-const code = launchOption?.query?.scene || router.params?.code;
+const code = router.params?.code || options?.query?.scene;
const {
isLoading,
@@ -130,24 +130,27 @@
const goToSign = useAccessReal(async () => {
try {
- // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) {
let params: API.PersonalUserElectronSignCommand = {
id: detail.value?.id,
};
let res = await enterpriseEmployeeServices.personalUserElectronSign(params);
if (res) {
- const encodedUrl = encodeURIComponent(res.signContractLongUrl);
- Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` });
+ if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) {
+ try {
+ await Message.confirm({
+ message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone(
+ detail.value?.contactPhoneNumber
+ )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`,
+ cancelText: '鏈敹鍒扮煭淇�',
+ });
+ } catch (error) {
+ goToSign();
+ }
+ } else {
+ const encodedUrl = encodeURIComponent(res.signContractLongUrl);
+ Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` });
+ }
}
- // }
- // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) {
- // Message.confirm({
- // message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone(
- // detail.value?.contactPhoneNumber
- // )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`,
- // showCancelBtn: false,
- // });
- // }
} catch (error) {}
});
Taro.useDidShow(() => {
--
Gitblit v1.9.1