diff --git a/app/config/index.js b/app/config/index.js index a14a5ce..a7a8a50 100644 --- a/app/config/index.js +++ b/app/config/index.js @@ -1,3 +1,3 @@ export const useAppFooterRouteNames= ['index', 'profile'] -export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine','payment-result'] +export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine','payment-result','collectCode-signature-personal-Info'] diff --git a/app/pages/collectCode/signature/panel/index.vue b/app/pages/collectCode/signature/panel/index.vue index c3f7297..33ebb19 100644 --- a/app/pages/collectCode/signature/panel/index.vue +++ b/app/pages/collectCode/signature/panel/index.vue @@ -1,18 +1,109 @@ \ No newline at end of file diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue index a551fd6..952b086 100644 --- a/app/pages/collectCode/signature/personal-Info/index.vue +++ b/app/pages/collectCode/signature/personal-Info/index.vue @@ -58,22 +58,30 @@ const nextClick=async ()=>{ message.warning('请填写完整信息') return } - const res=await fddInfo({ - phone:formData.value.phone - }) - if (res.status===0){ -if (res.data.status===2){ - router.push('/collectCode/signature/protocol') -}else { - const res1=await signOffline({ - userInfo:formData.value, - signOrder:Number(number.value), - }) - if (res1.status===0){ - window.location.href=res1.data.fddVerifyUrl - } -} + //国内签署要用法大大 + if (formData.value.countryCode==='86'&&formData.value.cardType===1){ + const res=await fddInfo({ + phone:formData.value.phone + }) + if (res.status===0){ + if (res.data.status===2){ + router.push('/collectCode/signature/protocol') + }else { + const res1=await signOffline({ + userInfo:formData.value, + signOrder:Number(number.value), + }) + if (res1.status===0){ + window.location.href=res1.data.fddVerifyUrl + } + + } + } + //国外签署直接去确认然后签字版 + }else { + router.push('/collectCode/signature/protocol') } + // /* if (formData.value.countryCode==='86'&&formData.value.cardType===1){ diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue index 3c044a6..28d0723 100644 --- a/app/pages/collectCode/signature/protocol/index.vue +++ b/app/pages/collectCode/signature/protocol/index.vue @@ -1,19 +1,26 @@ diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue index 95c9583..fb0ba2c 100644 --- a/app/pages/signature/protocol/index.vue +++ b/app/pages/signature/protocol/index.vue @@ -1,9 +1,12 @@