From 6b52b66b853342ae77d582e976454793b40c5445 Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Wed, 11 Feb 2026 14:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/addjigou/all.vue | 4 ++-- pages/addjigou/card.vue | 10 ++++---- pages/addjigou/name.vue | 35 ++++++++++++++++++++++++---- pages/addjigou/where.vue | 27 ++++++++++++++------- pages/addoldman/IDcard.vue | 22 ++++++++--------- pages/addoldman/hukou.vue | 2 +- pages/addoldman/oldIDcard.vue | 14 +++++------ pages/addoldman/yibao.vue | 2 +- pages/addstaff/IDcard.vue | 16 ++++++------- pages/addstaff/bankcard.vue | 8 +++---- pages/addstaff/healthcertificate.vue | 16 ++++++------- pages/addstaff/information.vue | 18 +++++++------- pages/addsupplier/information.vue | 10 ++++---- pages/oldmanindex/account.vue | 10 ++++---- pages/pay/index.vue | 2 +- 15 files changed, 115 insertions(+), 81 deletions(-) diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue index d527d29..fbfb977 100644 --- a/pages/addjigou/all.vue +++ b/pages/addjigou/all.vue @@ -9,13 +9,13 @@ 机构加盟 - + 待审核 审核驳回 审核通过 - + 编辑 diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 7ba6e40..62c7e34 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -187,7 +187,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -205,7 +205,7 @@ } else { uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -215,7 +215,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uping.value = true; uni.hideLoading() @@ -264,7 +264,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -299,7 +299,7 @@ } else { uni.showToast({ title: '请上传清晰的营业执照', - icon: 'error' + icon: 'none' }) } } diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index f9149de..dbcf5ae 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -14,6 +14,16 @@ + + + 审核驳回 + 审核通过 + + + + 驳回原因:{{alldata.contentred}} + + @@ -248,7 +258,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -277,7 +287,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -286,7 +296,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -355,7 +365,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -366,7 +376,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -647,4 +657,19 @@ .line { margin: 10rpx 0; } + .contentred{ + width: 90%; + border-radius: 15rpx; + margin: 15rpx 0; + margin-left: 5%; + padding: 5rpx; + .contentred-bgc{ + background-color: rgb(240,228,228); + border-radius: 15rpx; + color: red; + padding: 20rpx; + padding-bottom: 30rpx; + + } + } \ No newline at end of file diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index 7df0924..fc475dd 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -285,7 +285,7 @@ } else if (!form.orgBuildingArea) { uni.showToast({ title: '请输入建筑面积', - icon: 'error' + icon: 'none' }) return } @@ -303,11 +303,11 @@ data.orgPropertyType = form.orgPropertyType data.orgBuildingArea = form.orgBuildingArea - if (data.id === null) { - data.status = `4` - } else { - data.status = form.status - } + // if (data.id === null) { + // data.status = `4` + // } else { + // data.status = form.status + // } uni.setStorageSync("backhuancun", data) if (allNonEmpty) { @@ -316,11 +316,20 @@ if (data.endTime == '长期') { data.endTime = swapLongTerm(data.endTime); } - if((data.orgStatus != '3' && data.orgStatus != '4') && (data.optType == 'rz' || (data.optType == 'bg' && (data.status == '2' || data.status == '3' )))){ + console.log(data.optType,data.status ,data.orgStatus) + if(data.optType == 'rz' && data.status == '3' && !data.orgStatus){ + // 入驻重新提交 + console.log(111111111111) + data.status = `1` + data.optType = "rz" + } + if((data.orgStatus != '3' && data.orgStatus != '4' && data.orgStatus) && (data.optType == 'rz' || (data.optType == 'bg' && (data.status == '2' || data.status == '3' )))){ + // 变更提交 + console.log(222222222222) data.status = `4` data.optType = "bg" } - + console.log(data.optType,data.status ,data.orgStatus) uni.setStorageSync("backhuancun", data) changemessage(uni.getStorageSync('backhuancun'), ukey.value).then(res => { if (res.success && res.result != '重复提交' && res.result != '未做变更') { @@ -353,7 +362,7 @@ } else { uni.showToast({ title: '请完善信息', - icon: 'error' + icon: 'none' }) } } diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue index e53ad07..9ad8364 100644 --- a/pages/addoldman/IDcard.vue +++ b/pages/addoldman/IDcard.vue @@ -203,18 +203,18 @@ // if (!form.relationship) { // uni.showToast({ // title: '请输入与长者关系', - // icon: 'error' + // icon: 'none' // }) // } else if (!form.name) { uni.showToast({ title: '请输入姓名', - icon: 'error' + icon: 'none' }) } else if (!form.tel) { uni.showToast({ title: '请输入电话号', - icon: 'error' + icon: 'none' }) } else if (!isValid11DigitNumber(form.tel)) { uni.showToast({ @@ -225,7 +225,7 @@ } else if (!form.idCard) { uni.showToast({ title: '请输入身份证号', - icon: 'error' + icon: 'none' }) } else if (!isValid18DigitNumber(form.idCard)) { uni.showToast({ @@ -236,12 +236,12 @@ } else if (!form.homeAddress) { uni.showToast({ title: '请输入家庭住址', - icon: 'error' + icon: 'none' }) } else if (!form.workUnit) { uni.showToast({ title: '请输入工作单位', - icon: 'error' + icon: 'none' }) } else { if (uni.getStorageSync('allinfo').name) { @@ -267,7 +267,7 @@ if (res.data.result == '重复提交') { uni.showToast({ title: `重复提交`, - icon: 'error' + icon: 'none' }) return } @@ -314,7 +314,7 @@ if (res.data.result == '重复提交') { uni.showToast({ title: `重复提交`, - icon: 'error' + icon: 'none' }) return } @@ -444,7 +444,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -466,7 +466,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -514,7 +514,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } diff --git a/pages/addoldman/hukou.vue b/pages/addoldman/hukou.vue index e35075c..4d97390 100644 --- a/pages/addoldman/hukou.vue +++ b/pages/addoldman/hukou.vue @@ -86,7 +86,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) } diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue index ab52e30..2da1446 100644 --- a/pages/addoldman/oldIDcard.vue +++ b/pages/addoldman/oldIDcard.vue @@ -353,7 +353,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -390,7 +390,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -401,7 +401,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -473,7 +473,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -484,7 +484,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -691,7 +691,7 @@ if (res.data.result == '重复提交') { uni.showToast({ title: `重复提交`, - icon: 'error' + icon: 'none' }) return } @@ -774,7 +774,7 @@ } else { uni.showToast({ title: '请上传清晰的身份证', - icon: 'error' + icon: 'none' }) } } diff --git a/pages/addoldman/yibao.vue b/pages/addoldman/yibao.vue index 3ed435b..36c0928 100644 --- a/pages/addoldman/yibao.vue +++ b/pages/addoldman/yibao.vue @@ -96,7 +96,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) } diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue index 1c7441e..a6a864e 100644 --- a/pages/addstaff/IDcard.vue +++ b/pages/addstaff/IDcard.vue @@ -241,7 +241,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -268,7 +268,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -277,7 +277,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -346,7 +346,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -357,7 +357,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -378,13 +378,13 @@ if (!fontphoto.value) { uni.showToast({ title: '请上传身份证正面', - icon: 'error' + icon: 'none' }) return } else if (!endphoto.value) { uni.showToast({ title: '请上传身份证背面', - icon: 'error' + icon: 'none' }) return } @@ -420,7 +420,7 @@ } else { uni.showToast({ title: '请上传清晰的身份证', - icon: 'error' + icon: 'none' }) } } diff --git a/pages/addstaff/bankcard.vue b/pages/addstaff/bankcard.vue index aae31d1..3b23496 100644 --- a/pages/addstaff/bankcard.vue +++ b/pages/addstaff/bankcard.vue @@ -245,7 +245,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -316,7 +316,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -327,7 +327,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -379,7 +379,7 @@ // } else { // uni.showToast({ // title: '请上传清晰的身份证', - // icon: 'error' + // icon: 'none' // }) // } } diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue index e141b2c..faa5d4f 100644 --- a/pages/addstaff/healthcertificate.vue +++ b/pages/addstaff/healthcertificate.vue @@ -267,7 +267,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -289,7 +289,7 @@ const next = () => { // uni.showToast({ // title: "999999999999999999", - // icon: 'error' + // icon: 'none' // }) if (!uping.value) { @@ -297,7 +297,7 @@ } // uni.showToast({ // title: "888888888888", - // icon: 'error' + // icon: 'none' // }) let data = uni.getStorageSync('backhuancun'); data.healthZmPath = imgArray[0] @@ -312,24 +312,24 @@ // uni.showToast({ // title: "888888888888", - // icon: 'error' + // icon: 'none' // }) console.log("AAAA", data, ukey.value) changemessage(data, ukey.value).then(res => { console.log("BBBB", res) // uni.showToast({ // title: res, - // // icon: 'error' + // // icon: 'none' // }) // uni.showToast({ // title: res.result, - // // icon: 'error' + // // icon: 'none' // }) // return if (res.result == '重复提交') { uni.showToast({ title: `重复提交`, - icon: 'error' + icon: 'none' }) return } @@ -364,7 +364,7 @@ // } else { // uni.showToast({ // title: res.message, - // icon: 'error' + // icon: 'none' // }) // } }) diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue index d4a1b71..bf3db5b 100644 --- a/pages/addstaff/information.vue +++ b/pages/addstaff/information.vue @@ -301,38 +301,38 @@ if (!form.maritalStatus) { uni.showToast({ title: '请输入婚否', - icon: 'error' + icon: 'none' }) } else if (!form.tel) { uni.showToast({ title: '请输入联系电话', - icon: 'error' + icon: 'none' }) } else if (!isValid11DigitNumber(form.tel)) { uni.showToast({ title: '手机号格式错误', - icon: 'error' + icon: 'none' }) return } else if (!form.height) { uni.showToast({ title: '请输入身高', - icon: 'error' + icon: 'none' }) } else if (!form.weight) { uni.showToast({ title: '请输入体重', - icon: 'error' + icon: 'none' }) } else if (!form.healthStatus) { uni.showToast({ title: '请输入健康状态', - icon: 'error' + icon: 'none' }) } else if (!form.politicalAppearance) { uni.showToast({ title: '请输入政治面貌', - icon: 'error' + icon: 'none' }) } else if (!form.contactName) { uni.showToast({ @@ -358,12 +358,12 @@ } else if (!form.hukouType) { uni.showToast({ title: '请输入户口性质', - icon: 'error' + icon: 'none' }) } else if (!form.currentAddress) { uni.showToast({ title: '请输入现住址', - icon: 'error' + icon: 'none' }) } else { const data = form diff --git a/pages/addsupplier/information.vue b/pages/addsupplier/information.vue index 65cc36e..25525f8 100644 --- a/pages/addsupplier/information.vue +++ b/pages/addsupplier/information.vue @@ -277,7 +277,7 @@ uni.hideLoading() uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -296,7 +296,7 @@ } else { uni.showToast({ title: '识别失败', - icon: 'error', + icon: 'none', duration: 2000 }) uping.value = true; @@ -306,7 +306,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uping.value = true; uni.hideLoading() @@ -366,7 +366,7 @@ fail: err => { uni.showToast({ title: '上传出错', - icon: 'error' + icon: 'none' }) uni.hideLoading() } @@ -475,11 +475,11 @@ } addSuppliers(form).then((res) => { if (res.code == 500) { + uni.hideLoading() uni.showToast({ title: res.message, icon: 'none' }) - uni.hideLoading() return } let data = { diff --git a/pages/oldmanindex/account.vue b/pages/oldmanindex/account.vue index 3af5989..0a95211 100644 --- a/pages/oldmanindex/account.vue +++ b/pages/oldmanindex/account.vue @@ -191,7 +191,7 @@ if (!data) { uni.showToast({ title: '服务器无响应', - icon: 'error' + icon: 'none' }); return; } @@ -203,7 +203,7 @@ // 如果后端使用另一种返回结构,请按实际字段判断 uni.showToast({ title: '支付信息获取失败', - icon: 'error' + icon: 'none' }); console.error('支付返回:', data); } @@ -212,7 +212,7 @@ console.error('请求失败:', err); uni.showToast({ title: '请求失败', - icon: 'error' + icon: 'none' }); } }; @@ -267,7 +267,7 @@ console.error('WeixinJSBridge 调用异常', e); uni.showToast({ title: '支付调用失败', - icon: 'error' + icon: 'none' }); reject(e); } @@ -315,7 +315,7 @@ console.error('uni.requestPayment 调用异常', e); uni.showToast({ title: '支付调用失败', - icon: 'error' + icon: 'none' }); reject(e); } diff --git a/pages/pay/index.vue b/pages/pay/index.vue index 480eec3..5478290 100644 --- a/pages/pay/index.vue +++ b/pages/pay/index.vue @@ -89,7 +89,7 @@ }else{ uni.showToast({ title: '支付失败', - icon: 'error' + icon: 'none' }) } })