diff --git a/pages/passport/login.vue b/pages/passport/login.vue index 0123bfe..a6a4244 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -3,46 +3,108 @@
-
{{loginTitleWay[current].title}}
-
{{loginTitleWay[current].desc}}{{mobile | secrecyMobile}}
+
{{ loginTitleWay[current].title }}
+
+ {{ loginTitleWay[current].desc + }}{{ mobile | secrecyMobile }} +
-
- -
获取验证码
+
+ +
+ 获取验证码 +
- + -
未注册的手机号验证后将自动创建用户账号,登录即代表您已同意《使用条款及隐私协议》 +
+ 未注册的手机号验证后将自动创建用户账号,登录即代表您已同意《使用条款及隐私协议》
-
-
- +
+
- - {{tips}} + + {{ tips }}
@@ -136,7 +198,6 @@ export default { } //#endif }, - mounted() { // #ifndef APP-PLUS @@ -423,7 +484,7 @@ export default { // #ifdef H5 let code = connectLogin.code; let buyer = api.buyer; - window.open(buyer + `/connect/login/web/` + code, "_self"); + window.open(buyer + `/passport/connect/login/web/` + code, "_self"); // #endif // #ifdef APP-PLUS this.nonH5OpenId(connectLogin); @@ -442,43 +503,41 @@ export default { /** * 执行登录 */ - smsLogin({ mobile: this.mobile, code: this.code }, this.clientType).then( - (res) => { - if (res.data.success) { - storage.setAccessToken(res.data.result.accessToken); - storage.setRefreshToken(res.data.result.refreshToken); + smsLogin({ mobile: this.mobile, code: this.code }, this.clientType).then((res) => { + if (res.data.success) { + storage.setAccessToken(res.data.result.accessToken); + storage.setRefreshToken(res.data.result.refreshToken); - /** - * 登录成功后获取个人信息 - */ - getUserInfo().then((user) => { - if (user.data.success) { - /** - * 个人信息存储到缓存userInfo中 - */ - storage.setUserInfo(user.data.result); - storage.setHasLogin(true); - // 登录成功 - uni.showToast({ - title: "登录成功!", - icon: "none", - }); + /** + * 登录成功后获取个人信息 + */ + getUserInfo().then((user) => { + if (user.data.success) { + /** + * 个人信息存储到缓存userInfo中 + */ + storage.setUserInfo(user.data.result); + storage.setHasLogin(true); + // 登录成功 + uni.showToast({ + title: "登录成功!", + icon: "none", + }); - /** - * 计算出当前router路径 - * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页 - * 2.都不满足返回跳转页面 - */ - whetherNavigate(); - } else { - uni.switchTab({ - url: "/pages/tabbar/home/index", - }); - } - }); - } + /** + * 计算出当前router路径 + * 1.如果跳转的链接为登录页面或跳转的链接为空页面。则会重新跳转到首页 + * 2.都不满足返回跳转页面 + */ + whetherNavigate(); + } else { + uni.switchTab({ + url: "/pages/tabbar/home/index", + }); + } + }); } - ); + }); }, // 验证码验证 verification(val) { @@ -551,7 +610,7 @@ export default { }, }; - \ No newline at end of file + diff --git a/pages/passport/wechatH5Login.vue b/pages/passport/wechatH5Login.vue index 1a48dd2..6a35b8e 100644 --- a/pages/passport/wechatH5Login.vue +++ b/pages/passport/wechatH5Login.vue @@ -43,7 +43,7 @@ export default { getUserProfile() { let code = "WECHAT"; let buyer = api.buyer; - window.open(buyer + `/connect/login/web/` + code, "_self"); + window.open(buyer + `/passport/connect/login/web/` + code, "_self"); }, backToHome() { uni.switchTab({ @@ -55,11 +55,9 @@ export default {