From 92264a516c8c695c38d4cc9358c50bcfbed36f06 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 03 九月 2025 14:00:15 +0800 Subject: [PATCH] fix: bug --- apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue index db31ead..6b779fe 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue @@ -10,7 +10,7 @@ ></MineAgreementSignDetailItem> <MineAgreementSignDetailItem label="鍗忚鐘舵��" - :detail="EnumTaskUserSignContractStatusText[detail?.userSignContractStatus]" + :detail="EnumTaskUserSignContractStatusSignText[detail?.userSignContractStatus]" ></MineAgreementSignDetailItem> </template> </MineAgreementSignDetailCard> @@ -73,10 +73,11 @@ import MineAgreementSignDetailItem from './MineAgreementSignDetailItem.vue'; import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import { + EnumElectronSignAccess, EnumTaskUserSignContractStatus, - EnumTaskUserSignContractStatusText, + EnumTaskUserSignContractStatusSignText, } from '@12333/constants'; -import { format, Message } from '@12333/utils'; +import { format, hiddenPhone, Message, setOSSLink, openDocument } from '@12333/utils'; import Taro from '@tarojs/taro'; defineOptions({ @@ -85,8 +86,10 @@ const { userDetail } = useUser(); const router = Taro.useRouter(); +const launchOption = useLaunchOptions(); +//鐏靛伐Id const id = router.params?.id; -const code = router.params?.code; +const code = launchOption?.query?.scene || router.params?.code; const { isLoading, @@ -112,16 +115,22 @@ function checkAgreement() { if (detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Wait) { goToSign(); - } else { - const encodedUrl = encodeURIComponent(detail?.value?.contractUrl); - Taro.navigateTo({ - url: `${RouterPath.mineAgreementSignDetail}?url=${encodedUrl}`, - }); + } + if ( + detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Stop || + detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Pass + ) { + 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, }; @@ -130,8 +139,20 @@ const encodedUrl = encodeURIComponent(res.signContractLongUrl); Taro.navigateTo({ url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}` }); } + // } + // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) { + // Message.confirm({ + // message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone( + // detail.value?.contactPhoneNumber + // )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`, + // showCancelBtn: false, + // }); + // } } catch (error) {} }); +Taro.useDidShow(() => { + refetch(); +}); </script> <style lang="scss"> -- Gitblit v1.9.1