diff --git a/pages.json b/pages.json index d70932c..91b31e2 100644 --- a/pages.json +++ b/pages.json @@ -72,6 +72,12 @@ "navigationBarTitleText": "选择护理单元" } }, + { + "path": "pages/addjigou/all", + "style": { + "navigationBarTitleText": "审核详情" + } + }, { "path": "pages/addjigou/where", "style": { diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue new file mode 100644 index 0000000..9a22e3a --- /dev/null +++ b/pages/addjigou/all.vue @@ -0,0 +1,442 @@ + + + + + \ No newline at end of file diff --git a/pages/addjigou/api/addjigou.js b/pages/addjigou/api/addjigou.js index f8d821d..7f889b1 100644 --- a/pages/addjigou/api/addjigou.js +++ b/pages/addjigou/api/addjigou.js @@ -17,4 +17,20 @@ export function getMessageList(tel){ url: `/api/orgApplyInfo/queryAuditInfo?tel=${tel}`, method: 'get', }) +} + +//获取省市区 +export function getdate(id){ + return request({ + url: `/api/common/queryAreaDict?id=${id}`, + method: 'get', + }) +} + +//将地址id转换成汉字 +export function getrel(id){ + return request({ + url: `/api/common/queryAreaNameById?id=${id}`, + method: 'get', + }) } \ No newline at end of file diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 1d3d0e4..eb4b408 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -103,10 +103,11 @@ const headImge = ref(""); const backImge = ref(""); - + const uping = ref(true); // 上传图片到服务器 function uploadImage(filePath) { uni.showLoading() + uping.value = false; uni.uploadFile({ url: `${base_url}/api/ocr/businessLicense`, // 替换为你的POST接口地址 filePath, @@ -175,7 +176,8 @@ biz: `temp` }, success: uploadRes => { - fontphoto.value = JSON.parse(uploadRes.data).message + fontphoto.value = JSON.parse(uploadRes.data).message; + uping.value = true; }, fail: err => { uni.showToast({ @@ -193,11 +195,10 @@ } } const next = () => { - - const allNonEmpty = textArray.every(item => { - // 如果想忽略前后空格,可用 item.trim() !== '' - return item !== ''; - }); + if(!uping.value){ + return + } + const allNonEmpty = textArray[0]; if (allNonEmpty) { let pushMessage = { id: uni.getStorageSync('specicalid') || "", @@ -235,6 +236,21 @@ }) } } + onLoad(() => { + if(uni.getStorageSync('baddata')){ + let data = uni.getStorageSync('baddata'); + if(data.comName){ + textArray[0] = data.comName; + textArray[1] = data.comRegisterAddress; + textArray[2] = data.comCreditCode; + textArray[3] = data.comLegalPerson; + if(data.comBusinessLicense){ + headImge.value = `${base_url}/sys/common/static/${data.comBusinessLicense}`; + fontphoto.value = data.comBusinessLicense + } + } + } + }) const goBack = () => { uni.navigateBack() } diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index b212556..18f8e93 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -162,6 +162,7 @@ } // 上传图片到服务器 function uploadImage(filePath) { + uping.value = false; uni.showLoading() uni.uploadFile({ url: `${base_url}/api/ocr/idCard`, // 替换为你的POST接口地址 @@ -218,6 +219,7 @@ } }) } + const uping = ref(true) const savephoto = (filePath, type) => { uni.uploadFile({ url: `${base_url}/sys/common/upload`, // 替换为你的POST接口地址 @@ -235,6 +237,7 @@ } else { endphoto.value = JSON.parse(uploadRes.data).message } + uping.value = true; }, fail: err => { uni.showToast({ @@ -257,6 +260,9 @@ // 如果想忽略前后空格,可用 item.trim() !== '' return item !== ''; }); + if(!uping.value){ + return + } if (allNonEmpty) { const range = textArray[7]; const [start, end] = range.split('-'); @@ -356,8 +362,21 @@ uni.navigateBack() } onLoad(() => { - // loadWxJSSDK() - // 后端接口要接受当前页面 URL(不能带 # 后面),用于计算 signature + if(uni.getStorageSync('baddata')){ + let data = uni.getStorageSync('baddata'); + textArray[0] = data.name; + textArray[1] = data.sex; + textArray[2] = data.idCard; + textArray[3] = data.national; + textArray[4] = data.birthDate; + textArray[5] = data.idCardAddress; + textArray[6] = data.issuingAuthority; + textArray[7] = `${data.startTime}-${data.endTime}`; + headImge.value = `${base_url}/sys/common/static/${data.cardZmPath}`; + backImge.value = `${base_url}/sys/common/static/${data.cardFmPath}`; + fontphoto.value = data.cardZmPath + endphoto.value = data.cardFmPath + } }) diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index a158479..05fd586 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -1,21 +1,66 @@