diff --git a/pages/login/login.vue b/pages/login/login.vue index d9239b6..7a989da 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -11,10 +11,10 @@ 登录中 立即登录 立即登录 - + @@ -73,12 +73,14 @@ }, login(e) { if (this.validate) { - if (!this.userChecked) { - uni.showToast({ - title:'请先阅读并同意《服务及隐私协议》', - icon:'none', - }) - } else { + this.userChecked = true; + console.log(this.userChecked) + // if (!this.userChecked) { + // uni.showToast({ + // title:'请先阅读并同意《服务及隐私协议》', + // icon:'none', + // }) + // } else { var that = this this.loading = true this.$store.dispatch("LoginByUsername", { @@ -103,8 +105,9 @@ }).catch((err) => { this.loading = false // this.$refs.code.refushCode() + location.href = "https://dy12333.org.cn/h5/" }); - } + // } } }, // 步骤 diff --git a/pages/login/template.vue b/pages/login/template.vue index 8a40867..95b9c31 100644 --- a/pages/login/template.vue +++ b/pages/login/template.vue @@ -5,11 +5,11 @@ - + diff --git a/pages/user/policyContent.vue b/pages/user/policyContent.vue index 2343ef9..95e25a8 100644 --- a/pages/user/policyContent.vue +++ b/pages/user/policyContent.vue @@ -38,8 +38,11 @@ diff --git a/untils/AxiosUtils.js b/untils/AxiosUtils.js index 0f92493..d62574c 100644 --- a/untils/AxiosUtils.js +++ b/untils/AxiosUtils.js @@ -162,23 +162,24 @@ export function Promisify(func) { export function GoLogin() { if (showModal) { showModal = false - uni.showModal({ - title: "提示", - content: "您还未登录,点击确认去登录", - success({ - confirm - }) { - if (confirm) { - uni.redirectTo({ - url: "/pages/login/login" - }); - } - showModal = true - }, - fail() { - showModal = true - } - }) + location.href = "https://dy12333.org.cn/h5/" + // uni.showModal({ + // title: "提示", + // content: "您还未登录,点击确认去登录", + // success({ + // confirm + // }) { + // if (confirm) { + // uni.redirectTo({ + // url: "/pages/login/login" + // }); + // } + // showModal = true + // }, + // fail() { + // showModal = true + // } + // }) } }