diff --git a/ebike-user/pages/user/home/home.vue b/ebike-user/pages/user/home/home.vue index 1bbd212..bb32d38 100644 --- a/ebike-user/pages/user/home/home.vue +++ b/ebike-user/pages/user/home/home.vue @@ -219,7 +219,20 @@ tologin() } }) - } else if (!oUser['realNameStatus']) { + } + checkRealName((res)=>{ + if(!res) return; + getOrder((flag) => { + if (flag) { + map.addOrder(onLoadData.value["number"], false, (res) => { + if (res) { + getOrder(); + } + }) + } + }); + },nLoadData.value["number"],onLoadData.value['_tbScancodeApproach_']); + /* else if (!oUser['realNameStatus']) { showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { if (res.confirm) { uni.navigateTo({ @@ -239,7 +252,7 @@ }) } }); - } + } */ } } }) @@ -317,18 +330,26 @@ if (!oUser) { tologin(); return; - } else if (!oUser['realNameStatus']) { - showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { - if (res.confirm) { - uni.navigateTo({ - url: "/pages/user/views/IdentityVerification" - }) - } + } + checkRealName((res)=>{ + if(!res) return; + uni.navigateTo({ + url: "/pages/user/login/TroubleReportUser" }) - } - uni.navigateTo({ - url: "/pages/user/login/TroubleReportUser" }) + // else if (!oUser['realNameStatus']) { + + // showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { + // if (res.confirm) { + // uni.navigateTo({ + // url: "/pages/user/views/IdentityVerification" + // }) + // } + // }) + // } + // uni.navigateTo({ + // url: "/pages/user/login/TroubleReportUser" + // }) } //申请站点 @@ -336,7 +357,14 @@ if (!oUser) { tologin(); return; - } else if (!oUser['realNameStatus']) { + } + checkRealName((res)=>{ + if(!res) return; + uni.navigateTo({ + url: "/pages/user/scan/applysite" + }) + }) + /* else if (!oUser['realNameStatus']) { showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { if (res.confirm) { uni.navigateTo({ @@ -347,7 +375,7 @@ } uni.navigateTo({ url: "/pages/user/scan/applysite" - }) + }) */ } //个人中心 @@ -355,7 +383,14 @@ if (!oUser) { tologin(); return; - } else if (!oUser['realNameStatus']) { + } + checkRealName((res)=>{ + if(!res) return; + uni.navigateTo({ + url: "/pages/user/mine/MePage" + }) + }) + /* else if (!oUser['realNameStatus']) { showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { if (res.confirm) { uni.navigateTo({ @@ -366,7 +401,7 @@ } uni.navigateTo({ url: "/pages/user/mine/MePage" - }) + }) */ } //扫描 @@ -374,7 +409,18 @@ if (!oUser) { tologin(); return; - } else if (!oUser['realNameStatus']) { + } + checkRealName((res)=>{ + if(!res) return; + const { + userId + } = oUser; + uni.navigateTo({ + url: "/pages/user/scan/scancode?type=ride" + }) + }) + + /* else if (!oUser['realNameStatus']) { showModelMessage("请进行实名认证后骑行", "实名认证", true, "去认证").then(res => { if (res.confirm) { uni.navigateTo({ @@ -388,7 +434,7 @@ } = oUser; uni.navigateTo({ url: "/pages/user/scan/scancode?type=ride" - }) + }) */ } @@ -715,6 +761,7 @@ getOrder(); } } + console.log("999999999999999999",ismount); if (ismount) getLoalcationData(); }); @@ -778,6 +825,26 @@ } }) } + + function checkRealName(callBack,number,_tbScancodeApproach_){ + if (!oUser['realNameStatus']) { + showModelMessage("请先完成实名认证,再继续。", "实名认证", true, "去认证").then(res => { + if (res.confirm) { + let url="/pages/user/views/IdentityVerification"; + if(number){ + url=`${url}?number=${number}&_tbScancodeApproach_=${_tbScancodeApproach_}`; + } + uni.navigateTo({url}); + callBack(false); + return; + } + callBack(false); + }) + return; + } + callBack(true); + } +