diff --git a/src/api/signUp.js b/src/api/signUp.js index 33e4ee7..0aee3d3 100644 --- a/src/api/signUp.js +++ b/src/api/signUp.js @@ -13,3 +13,4 @@ export const signUpPeopleSelfListReq = params => http.get(`/train/train-sign-up- export const signUpSelfJoinReq = data => http.post(`/train/train-sign-up-people-self/join`, data) export const signUpSelfUpdateReq = data => http.put(`/train/train-sign-up-people-self`, data) export const signUpSelfIdCardHeaderReq = data => http.post(`/train/train-sign-up-people-self/idCardHeader`, data) +export const signUpSelfContractFixReq = data => http.post(`/train/train-sign-up-people-self/contractFix`, data) diff --git a/src/pages/signUp/info.vue b/src/pages/signUp/info.vue index b99d69f..46e3ea9 100644 --- a/src/pages/signUp/info.vue +++ b/src/pages/signUp/info.vue @@ -456,7 +456,7 @@ import {ref, getCurrentInstance} from 'vue' import {onLoad} from "@dcloudio/uni-app"; import {$toast, chooseImg} from "@/utils"; -import {signUpInfoReq, signUpJoinReq, signUpUpdateReq} from "@/api/signUp"; +import {signUpInfoReq, signUpJoinReq, signUpSelfContractFixReq, signUpUpdateReq} from "@/api/signUp"; import {getUserInfo} from "@/utils/user"; import {dictDataReq, orgListReq, workTypeListReq} from "@/api/common"; import {userInfoByIdCardReq, userInfoMakeBackIdCardReq, userInfoReq} from "@/api/user"; @@ -939,19 +939,57 @@ const uploadWorkTypePaper = async () => { form.value.workTypePaper = res[0] } +// const uploadContactFirstPage = async () => { +// const res = await chooseImg(1) +// form.value.contactFirstPage = res[0] +// } +// +// const uploadContactExpirePage = async () => { +// const res = await chooseImg(1) +// form.value.contactExpirePage = res[0] +// } +// +// const uploadContactSignPage = async () => { +// const res = await chooseImg(1) +// form.value.contactSignPage = res[0] +// } const uploadContactFirstPage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactFirstPage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_first` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactFirstPage = fixRes.data + console.log(form.value.contactFirstPage) + } } const uploadContactExpirePage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactExpirePage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_expire` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactExpirePage = fixRes.data + } + // form.value.contactExpirePage = res[0] } const uploadContactSignPage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactSignPage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_sign` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactSignPage = fixRes.data + } + // form.value.contactSignPage = res[0] } const uploadSocialSecurity = async () => { diff --git a/src/pages/signUp/self.vue b/src/pages/signUp/self.vue index eb3825c..43d8341 100644 --- a/src/pages/signUp/self.vue +++ b/src/pages/signUp/self.vue @@ -486,7 +486,7 @@ import {onLoad} from "@dcloudio/uni-app"; import {$toast, chooseImg} from "@/utils"; import { signUpInfoReq, - signUpJoinReq, signUpSelfIdCardHeaderReq, + signUpJoinReq, signUpSelfContractFixReq, signUpSelfIdCardHeaderReq, signUpSelfInfoReq, signUpSelfJoinReq, signUpSelfUpdateReq, @@ -1037,18 +1037,42 @@ const uploadWorkTypePaper = async () => { } const uploadContactFirstPage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactFirstPage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_first_self` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactFirstPage = fixRes.data + console.log(form.value.contactFirstPage) + } } const uploadContactExpirePage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactExpirePage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_expire_self` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactExpirePage = fixRes.data + } + // form.value.contactExpirePage = res[0] } const uploadContactSignPage = async () => { + if (!form.value.idCardNumber) return $toast('请先上传身份证') const res = await chooseImg(1) - form.value.contactSignPage = res[0] + const fixRes = await signUpSelfContractFixReq({ + url: res[0], + idCardNumber: `${form.value.idCardNumber}_${activityId.value}_sign_self` + }) + if (fixRes && fixRes.code === 0) { + form.value.contactSignPage = fixRes.data + } + // form.value.contactSignPage = res[0] } const uploadSocialSecurity = async () => {