From a779bec7fa6a376a31b5ec6c57e816b9499de31c Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 26 Jul 2024 15:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=89=AB=E7=A0=81=E4=B9=9F=E8=A6=81?= =?UTF-8?q?=E5=85=88=E8=BF=9B=E5=85=A5=E4=BC=81=E4=B8=9A=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enforce/enterpriseScanPreview.vue | 497 ++++++++++---------- src/views/enforce/noScan.vue | 3 +- src/views/enforce/scanQrCode.vue | 3 +- src/views/login.vue | 4 +- 4 files changed, 260 insertions(+), 247 deletions(-) diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue index 7314ab9..c4a192d 100644 --- a/src/views/enforce/enterpriseScanPreview.vue +++ b/src/views/enforce/enterpriseScanPreview.vue @@ -1,284 +1,295 @@ diff --git a/src/views/enforce/noScan.vue b/src/views/enforce/noScan.vue index 254ea02..a989680 100644 --- a/src/views/enforce/noScan.vue +++ b/src/views/enforce/noScan.vue @@ -117,7 +117,8 @@ }, toDetail(item) { this.$router.push({ - path: "/sign", + // path: "/sign", + path: "/enterpriseScanPreview", query: { reason: this.reason, checkCss: this.checkCss, diff --git a/src/views/enforce/scanQrCode.vue b/src/views/enforce/scanQrCode.vue index 5f74fb8..d733318 100644 --- a/src/views/enforce/scanQrCode.vue +++ b/src/views/enforce/scanQrCode.vue @@ -140,7 +140,8 @@ router.push({ path: "/enterpriseScanPreview", query: { - enterpriseNumber: res.resultStr + enterpriseNumber: res.resultStr, + isNoScan: false } }) } else { diff --git a/src/views/login.vue b/src/views/login.vue index a2a873b..76dcb3a 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -44,8 +44,8 @@ const onSubmit = async (values) => { // userLogin(values,success=>{ testLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey},success=>{ console.log(success); - router.push({ name: "Home" }); - // router.push({ name: "enforceHome" }); + // router.push({ name: "Home" }); + router.push({ name: "enforceHome" }); //设置全局变量 useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId);