From f49b26b87a5d818cb282a466c589bf2ad1f659dd Mon Sep 17 00:00:00 2001 From: wangweidong <850489345@qq.com> Date: Mon, 9 Mar 2026 11:03:31 +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/card.vue | 2 +- pages/addjigou/name.vue | 12 +++++++----- pages/addjigou/where.vue | 17 ++++++++++++++--- pages/addoldman/IDcard.vue | 30 ++++++++++++++++++------------ pages/index/index.vue | 2 +- pages/login/specialsmall.vue | 3 ++- pages/login/workjoin.vue | 2 +- pages/login/workjoinsuccess.vue | 2 +- pages/yuangongindex/index.vue | 22 ++++------------------ request/index.js | 4 ++-- 10 files changed, 51 insertions(+), 45 deletions(-) diff --git a/pages/addjigou/card.vue b/pages/addjigou/card.vue index 5a5d7d3..277dae8 100644 --- a/pages/addjigou/card.vue +++ b/pages/addjigou/card.vue @@ -10,7 +10,7 @@ - 机构加盟登记表 + 机构登记表 diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue index f733b2e..49126bc 100644 --- a/pages/addjigou/name.vue +++ b/pages/addjigou/name.vue @@ -10,7 +10,7 @@ - 机构加盟登记表 + 机构登记表 @@ -455,15 +455,18 @@ } const alldata = ref({}) onLoad((e) => { - if (uni.getStorageSync('baddata')||e.element) { - let data = uni.getStorageSync('baddata')||JSON.parse(e.element); + let data = JSON.parse(e.element); if(e.element){ alldata.value = JSON.parse(e.element); uni.setStorageSync('baddata',alldata.value) uni.setStorageSync('backhuancun',alldata.value) uni.setStorageSync('tel',alldata.value.tel) + }else{ + data = uni.getStorageSync('baddata') + } + if(!data){ + return } - console.log(uni.getStorageSync('baddata')) textArray[0] = data.name; textArray[1] = data.sex; textArray[2] = data.idCard; @@ -476,7 +479,6 @@ backImge.value = `${media_base_url}${data.cardFmPath}`; fontphoto.value = data.cardZmPath endphoto.value = data.cardFmPath - } }) onShow(() => { diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue index 5741a53..c678a7a 100644 --- a/pages/addjigou/where.vue +++ b/pages/addjigou/where.vue @@ -53,7 +53,7 @@ - 机构加盟登记表 + 机构登记表 @@ -306,6 +306,10 @@ // } else { // data.status = form.status // } + uni.showLoading({ + title:"加载中..", + icon:'none' + }) uni.setStorageSync("backhuancun", data) if (allNonEmpty) { let data = uni.getStorageSync('backhuancun') @@ -313,7 +317,7 @@ if (data.endTime == '长期') { data.endTime = swapLongTerm(data.endTime); } - if(!flag.value){ + if(!flag.value&&!data.flag){ if(data.optType == 'rz' && data.status == '3' && !data.orgStatus){ // 入驻重新提交 data.status = `1` @@ -330,15 +334,18 @@ uni.setStorageSync("backhuancun", data) changemessage(uni.getStorageSync('backhuancun'), ukey.value).then(res => { + uni.hideLoading(); if (res.success ) { uni.requestSubscribeMessage({ // 这里填后台申请好的 templateId 数组 tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'], success: (res) => { - uni.setStorageSync('specicalid', data.optType == "bg"?true:false); + uni.setStorageSync('jgxxbgsq', data.optType == "bg"?true:false); uni.reLaunch({ url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}` }); + data.flag = false; + uni.setStorageSync("backhuancun", data) }, fail: (err) => { console.error('订阅接口调用失败：', err); @@ -363,6 +370,7 @@ } }) } else { + uni.hideLoading(); uni.showToast({ title: '请完善信息', icon: 'none' @@ -370,6 +378,9 @@ } } const go = (e)=>{ + let data = uni.getStorageSync('backhuancun') + data.flag = true; + uni.setStorageSync("backhuancun", data) if (e==1) { flag.value = true; exitshow.value = false; diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue index 0555a1a..f876d3b 100644 --- a/pages/addoldman/IDcard.vue +++ b/pages/addoldman/IDcard.vue @@ -263,21 +263,27 @@ }, data: data, success: (res) => { - if (res.data.result == '重复提交') { + // if (res.data.result == '重复提交') { + // uni.showToast({ + // title: `重复提交`, + // icon: 'none' + // }) + // return + // } + // if (res.data.result == '未做变更') { + // uni.showToast({ + // title: `当前无变更，无需提交`, + // icon: 'none' + // }) + // return + // } + if (!res.data.success) { uni.showToast({ - title: `重复提交`, - icon: 'none' + title: res.data.message, + icon: 'none' }) return - } - if (res.data.result == '未做变更') { - uni.showToast({ - title: `当前无变更，无需提交`, - icon: 'none' - }) - return - } - if (res.data.success) { + }else { getMessage(uni.getStorageSync('openid')).then(res => { uni.setStorageSync('allinfo', res.result); uni.reLaunch({ diff --git a/pages/index/index.vue b/pages/index/index.vue index 2d9f626..f99e5e7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -363,7 +363,7 @@ uni.setStorageSync('specicalid', item.id); uni.setStorageSync("backhuancun", {}) uni.navigateTo({ - url: `/pages/addjigou/name` + url: `/pages/addjigou/name?element=${JSON.stringify(item)}` }); } const jumpTo = () => { diff --git a/pages/login/specialsmall.vue b/pages/login/specialsmall.vue index bab03b8..a79ca5e 100644 --- a/pages/login/specialsmall.vue +++ b/pages/login/specialsmall.vue @@ -6,7 +6,8 @@ 提交成功 - {{ uni.getStorageSync('isstaffchange') ? `尊敬的用户，您的机构变更信息申请已成功提交，我们将尽快处理反馈审核结果，期待与您继续携手同行！`:`尊敬的用户，您的机构加盟申请已成功提交，请耐心等待审核结果，期待您早日加入护理单元大家庭！` }} + {{ uni.getStorageSync('jgxxbgsq') ? `尊敬的用户，您的机构变更信息申请已成功提交，我们将尽快处理反馈审核结果，期待与您继续携手同行！` + :`尊敬的用户，您的机构加盟申请已成功提交，请耐心等待审核结果，期待您早日加入护理单元大家庭！` }} diff --git a/pages/login/workjoin.vue b/pages/login/workjoin.vue index 903ef08..26a0c7b 100644 --- a/pages/login/workjoin.vue +++ b/pages/login/workjoin.vue @@ -114,7 +114,7 @@ uni.setStorageSync('specicalid', item.id); uni.setStorageSync("backhuancun", {}) uni.navigateTo({ - url: `/pages/addjigou/name` + url: `/pages/addjigou/name?element=${JSON.stringify(item)}` }); } diff --git a/pages/login/workjoinsuccess.vue b/pages/login/workjoinsuccess.vue index 97ae637..8d161b3 100644 --- a/pages/login/workjoinsuccess.vue +++ b/pages/login/workjoinsuccess.vue @@ -146,7 +146,7 @@ uni.setStorageSync('specicalid', trans.id); uni.setStorageSync("backhuancun", {}) uni.navigateTo({ - url: `/pages/addjigou/name` + url: `/pages/addjigou/name?element=${JSON.stringify(item)}` }); } diff --git a/pages/yuangongindex/index.vue b/pages/yuangongindex/index.vue index 6f1bf10..8c5d9df 100644 --- a/pages/yuangongindex/index.vue +++ b/pages/yuangongindex/index.vue @@ -20,10 +20,9 @@ - + - + @@ -94,9 +93,7 @@ - - + @@ -188,18 +185,7 @@ - - - + diff --git a/request/index.js b/request/index.js index f4c3b2b..9fcc2ac 100644 --- a/request/index.js +++ b/request/index.js @@ -1,6 +1,6 @@ // 全局请求封装 -export const base_url = 'http://192.168.2.17:8081/opeapi/' -// export const base_url = 'https://www.focusnu.com/opeapi' +// export const base_url = 'http://192.168.2.17:8081/opeapi/' +export const base_url = 'https://www.focusnu.com/opeapi' export const media_base_url = 'https://www.focusnu.com/media/' // export const base_url = 'http://192.168.2.24:8081/opeapi'