diff --git a/frontend/app-user/pages/code.vue b/frontend/app-user/pages/code.vue index 011d437..c7a8db6 100644 --- a/frontend/app-user/pages/code.vue +++ b/frontend/app-user/pages/code.vue @@ -1,162 +1,175 @@ \ No newline at end of file +/deep/ .u-form-item__body__right__message { + margin-left: 0px !important; +} + diff --git a/frontend/app-user/pages/jump/weChatOffAcc.vue b/frontend/app-user/pages/jump/weChatOffAcc.vue index 6357c8c..e8d4222 100644 --- a/frontend/app-user/pages/jump/weChatOffAcc.vue +++ b/frontend/app-user/pages/jump/weChatOffAcc.vue @@ -1,166 +1,78 @@ \ No newline at end of file +.container { + display: flex; + justify-content: center; + align-items: center; + height: 100vh; +} + diff --git a/frontend/app-user/pages/login.vue b/frontend/app-user/pages/login.vue index dcf4e09..b2e6d30 100644 --- a/frontend/app-user/pages/login.vue +++ b/frontend/app-user/pages/login.vue @@ -52,7 +52,7 @@ placeholder="请填写验证码"> - + --> @@ -195,13 +195,13 @@ let isWechatBrowser = this.isWechatBrowser(); this.openId = uni.getStorageSync("openId"); console.log("openId", this.openId); - if (isWechatBrowser) { - if (!this.openId) { - uni.reLaunch({ - url: '/pages/jump/weChatOffAcc' - }) - } - } + // if (isWechatBrowser) { + // if (!this.openId) { + // uni.reLaunch({ + // url: '/pages/jump/weChatOffAcc' + // }) + // } + // } }, onReady() { // 如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则 @@ -214,7 +214,7 @@ console.log("有openid", this.openId); if (this.openId) { this.bindWxOffAcc(this.openId) - // 默认静默绑定 + // 默认静默绑定 // this.$modal.confirm('是否绑定公众号,以便下次免登录', '温馨提示', ) // .then(() => { // this.bindWxOffAcc(this.openId) @@ -235,10 +235,10 @@ }).then((res) => { if (res.state) { // 绑定成功 - uni.removeStorageSync('openId'); - uni.switchTab({ - url: '/pages/home/home' - }); + // uni.removeStorageSync('openId'); + // uni.switchTab({ + // url: '/pages/home/home' + // }); } }) }, @@ -409,7 +409,11 @@ uni.setStorageSync('myAvatorImg', ''); // 只在微信浏览器环境生效并去绑定openid if (this.isWechatBrowser()) { - this.hasOpenId(); + // 非微信环境登录直接进入主页 + this.hasOpenId(); + uni.switchTab({ + url: '/pages/home/home' + }); }else{ // 非微信环境登录直接进入主页 uni.switchTab({ @@ -469,4 +473,4 @@ /deep/.u-form-item__body__right__message { margin-left: 0px !important; } - \ No newline at end of file + -- libgit2 0.21.2