|
@@ -93,6 +93,9 @@ export function mobileLogin(data) {
|
|
|
const backUrl = takeBackUrl();
|
|
const backUrl = takeBackUrl();
|
|
|
const backIsTab = uni.getStorageSync('login_back_is_tab');
|
|
const backIsTab = uni.getStorageSync('login_back_is_tab');
|
|
|
uni.removeStorageSync('login_back_is_tab');
|
|
uni.removeStorageSync('login_back_is_tab');
|
|
|
|
|
+ // 快捷登录 OAuth 回调后应用重启,首页可能是页面栈中唯一的页面
|
|
|
|
|
+ // uni.redirectTo 无法关闭栈中最后一个页面,此时需用 reLaunch
|
|
|
|
|
+ const onlyOnePage = getCurrentPages().length <= 1;
|
|
|
if (backUrl) {
|
|
if (backUrl) {
|
|
|
if (backIsTab) {
|
|
if (backIsTab) {
|
|
|
// tabBar 页面必须用 switchTab,redirectTo 无法跳转
|
|
// tabBar 页面必须用 switchTab,redirectTo 无法跳转
|
|
@@ -102,6 +105,13 @@ export function mobileLogin(data) {
|
|
|
uni.switchTab({ url: '/pages/tidings/tidings' });
|
|
uni.switchTab({ url: '/pages/tidings/tidings' });
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ } else if (onlyOnePage) {
|
|
|
|
|
+ uni.reLaunch({
|
|
|
|
|
+ url: backUrl,
|
|
|
|
|
+ fail: function () {
|
|
|
|
|
+ uni.switchTab({ url: '/pages/tidings/tidings' });
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
uni.redirectTo({
|
|
uni.redirectTo({
|
|
|
url: backUrl,
|
|
url: backUrl,
|