Merge branch 'dev/1.0' into custom/common

This commit is contained in:
2026-01-08 15:10:46 +08:00
parent aa2f13f3b2
commit 23c954981b
92 changed files with 1975 additions and 382 deletions

View File

@@ -40,7 +40,7 @@
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
if (this.memberInfo.mobile == '') {
uni.showModal({
@@ -54,7 +54,7 @@
}, 'redirectTo');
} else {
if (this.back) this.$util.redirectTo(this.back);
else this.$util.redirectTo('/pages/member/index');
else this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}
}
});
@@ -133,7 +133,7 @@
setTimeout(() => {
if (this.back) this.$util.redirectTo(this.back, {},
'redirectTo');
else this.$util.redirectTo('/pages/member/index');
else this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}, 2000);
} else {
this.initInfo();