From 6695ef01506e6f7de7f90b4bf47076e49d9f7eae Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 09 九月 2025 10:44:41 +0800 Subject: [PATCH] fix: bug --- apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue index 37ff142..8d607b3 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue @@ -77,7 +77,7 @@ EnumTaskUserSignContractStatus, EnumTaskUserSignContractStatusSignText, } from '@12333/constants'; -import { format, hiddenPhone, Message, setOSSLink } from '@12333/utils'; +import { format, hiddenPhone, Message, setOSSLink, openDocument } from '@12333/utils'; import Taro from '@tarojs/taro'; defineOptions({ @@ -86,8 +86,10 @@ const { userDetail } = useUser(); const router = Taro.useRouter(); +const options = Taro.getLaunchOptionsSync(); +//鐏靛伐Id const id = router.params?.id; -const code = router.params?.code; +const code = router.params?.code || options?.query?.scene; const { isLoading, @@ -118,33 +120,37 @@ detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Stop || detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Pass ) { - const encodedUrl = encodeURIComponent(setOSSLink(detail?.value?.contractUrl)); - Taro.navigateTo({ - url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}`, - }); + if (!detail?.value?.contractUrl) { + Message.warning('鍗忚鏃犳硶鏌ョ湅锛岃绋嶅悗鍐嶈瘯'); + return; + } + openDocument(setOSSLink(detail?.value?.contractUrl)); } } const goToSign = useAccessReal(async () => { try { - // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) { let params: API.PersonalUserElectronSignCommand = { - id: id, + id: detail.value?.id, }; let res = await enterpriseEmployeeServices.personalUserElectronSign(params); if (res) { - const encodedUrl = encodeURIComponent(res.signContractLongUrl); - Taro.navigateTo({ url: `${RouterPath.mineAgreementSignExtraPage}?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