Uniapp/lucky_shop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev/1.0' into custom/common

Browse Source
This commit is contained in:
ZF Sun
2026-01-08 15:10:46 +08:00
parent aa2f13f3b2
commit 23c954981b
92 changed files with 1975 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages_tool/login/login.vue
View File

@@ -234,13 +234,13 @@ export default {
this.$util.showToast({
title: this.$lang('loginSuccessTip')
});
let back = this.back ? this.back : '/pages/member/index';
let back = this.back ? this.back : this.$util.MEMBER_PAGE_URL;
if (this.$refs.registerReward) this.$refs.registerReward.open(back);
} else {
if (this.back != '') {
this.$util.redirectTo(decodeURIComponent(this.back), {}, 'reLaunch');
} else {
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch');
}
}
});
@@ -348,13 +348,13 @@ export default {
this.$store.dispatch('getCartNumber');
this.getMemberInfo(() => {
if (can_receive_registergift == 1) {
let back = this.back ? this.back : '/pages/member/index';
let back = this.back ? this.back : this.$util.MEMBER_PAGE_URL;
if (this.$refs.registerReward) this.$refs.registerReward.open(back);
} else {
if (this.back != '') {
this.$util.redirectTo(decodeURIComponent(this.back), {}, this.redirect);
} else {
this.$util.redirectTo('/pages/member/index', {}, this.redirect);
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, this.redirect);
}
}
})