diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue index f2b38f2..0965037 100644 --- a/src/views/common/analyse.vue +++ b/src/views/common/analyse.vue @@ -345,7 +345,8 @@ onBeforeUnmount(() => { // 当前路由不是首页,且用户确认离开时 - router.replace('/enforceHome'); // 替换到首页 + // 替换到首页 + router.replace('/enforceHome'); }); onUnmounted(() => { diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue index 442e680..e02db04 100644 --- a/src/views/enforce/scanQrCode.vue +++ b/src/views/enforce/scanQrCode.vue @@ -163,8 +163,9 @@ console.log("=========== 扫码返回 ===========") console.log(res) //TODO 判断是否是市监 - if(isHttpLink(res)){ - getEnterpriseInfoBySj({"url":res},success =>{ + if(isHttpLink(res.resultStr)){ + + getEnterpriseInfoBySj({"url":res.resultStr},success =>{ if (success.success) { router.push({ path: "/enterpriseScanPreview", @@ -180,6 +181,7 @@ }) } },error =>{}) + }else{ const scanObj = JSON.parse(res.resultStr); // 判断二维码是否过期, 如果已过期则跳转提示页 @@ -288,7 +290,6 @@ const isHttpLink = (url) =>{