feat: 跳转逻辑修改

This commit is contained in:
mayubo@gmail.com 2025-05-12 11:01:50 +08:00
parent 7966cfb14c
commit 2c9b9718cb
4 changed files with 15 additions and 13 deletions

View File

@ -305,7 +305,6 @@
async getUserInfo() { async getUserInfo() {
const isCtoken = uni.getStorageSync('ctoken'); const isCtoken = uni.getStorageSync('ctoken');
console.log('12313131313', isCtoken)
if (!isCtoken) return; if (!isCtoken) return;
const res = await request(apiArr.loginInfo, 'POST', {}); const res = await request(apiArr.loginInfo, 'POST', {});
const newUserInfo = { const newUserInfo = {
@ -322,7 +321,6 @@
}, },
onShow() { onShow() {
console.log('111');
this.getUserInfo(); this.getUserInfo();
}, },
} }

File diff suppressed because one or more lines are too long

View File

@ -19318,11 +19318,10 @@ var NavgateTo = function NavgateTo(path) {
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {}; var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
var _options$isLogin = options.isLogin, var _options$isLogin = options.isLogin,
isLogin = _options$isLogin === void 0 ? true : _options$isLogin; isLogin = _options$isLogin === void 0 ? true : _options$isLogin;
var userId = uni.getStorageSync('userId'); // 假设这个方法存在并返回用户信息 var ctoken = uni.getStorageSync('ctoken');
if (isLogin) { if (isLogin) {
if (!userId) { if (!ctoken) {
uni.navigateTo({ uni.redirectTo({
url: '/pages/login/login' url: '/pages/login/login'
}); });
return; return;
@ -19396,10 +19395,13 @@ var request = function request(url) {
complete: function complete(res) { complete: function complete(res) {
if (res.cancel) { if (res.cancel) {
uni.hideLoading(); uni.hideLoading();
uni.redirectTo({
url: '/pages/index/index'
});
return; return;
} }
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.redirectTo({
url: '/pages/login/login' url: '/pages/login/login'
}); });
} }

View File

@ -11,11 +11,10 @@ export const picUrl = 'https://test.hshuishang.com'; // 图片地址前缀
*/ */
export const NavgateTo = (path, options = {}) => { export const NavgateTo = (path, options = {}) => {
const { isLogin = true } = options; const { isLogin = true } = options;
const userId = uni.getStorageSync('userId'); // 假设这个方法存在并返回用户信息 const ctoken = uni.getStorageSync('ctoken');
if (isLogin) { if (isLogin) {
if (!userId) { if (!ctoken) {
uni.navigateTo({ url: '/pages/login/login' }) uni.redirectTo({ url: '/pages/login/login' })
return return
} else { } else {
uni.navigateTo({ uni.navigateTo({
@ -79,11 +78,14 @@ export const request = (url, method = 'POST', data = {}, options = {}) => {
complete: (res) => { complete: (res) => {
if (res.cancel) { if (res.cancel) {
uni.hideLoading(); uni.hideLoading();
uni.redirectTo({
url: '/pages/index/index'
});
return return
} }
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.redirectTo({
url: '/pages/login/login', url: '/pages/login/login',
}) })
} }