diff --git a/common/auth.js b/common/auth.js index 5739a1e..39bf033 100644 --- a/common/auth.js +++ b/common/auth.js @@ -10,11 +10,17 @@ const isLogin = () => { return !!uni.getStorageSync('phone') } -// xuchao: 登录校验 —— 未登录则跳登录页,登录成功后回跳 redirect 指定的页面 +// xuchao: 登录校验 +// - 开发模式:无登录态时静默用首个测试手机号假登录,不跳登录页(本地直接进业务页) +// - 正式流程:跳登录页;登录成功后回跳 redirect 指定的页面 const requireLogin = (redirect) => { if (isLogin()) return true + if (config.devMode) { + loginByMock(config.testPhones[0]) + return true + } uni.navigateTo({ - url: '/pages/index/authorization' + (redirect ? '?redirect=' + encodeURIComponent(redirect) : '') + url: '/pages/index/authorization' + (redirect ? '?redirect=' + redirect : '') }) return false } diff --git a/pages/index/authorization.vue b/pages/index/authorization.vue index cf62f34..f8413cd 100644 --- a/pages/index/authorization.vue +++ b/pages/index/authorization.vue @@ -55,7 +55,7 @@ onLoad(options) { // xuchao: 记录登录前的页面,登录成功后回跳 if (options.redirect) { - this.redirect = decodeURIComponent(options.redirect) + this.redirect = options.redirect } // xuchao: 正式流程 —— 公众号网页授权重定向回来时 URL 带 code,用它换用户信息 if (options.code && !config.devMode) {