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

5
pages_tool/member/public/js/common.js
View File

@@ -1,8 +1,9 @@
export default {
methods: {
// 跳转至登录页
toLogin() {
this.$refs.login.open();
toLogin(url) {
console.log('跳转至登录页', {url, currentRoute: this.$util.getCurrentRoute()});
this.$refs.login.open(url ?? this.$util.getCurrentRoute());
}
}
}

4
pages_tool/member/public/js/info.js
View File

@@ -256,7 +256,7 @@ export default {
this.$store.dispatch('emptyCart');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
} else {
this.$util.showToast({
title: rres.message
@@ -329,7 +329,7 @@ export default {
this.$store.dispatch('emptyCart');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}
}
});

4
pages_tool/member/public/js/invite_friends.js
View File

@@ -51,7 +51,7 @@ export default {
this.$refs.rulePopup.close();
},
copyUrl() {
let text = this.$config.h5Domain + '/pages/index/index';
let text = this.$config.h5Domain + this.$util.INDEX_PAGE_URL;
if (this.memberInf && this.memberInfo.member_id) text += '?source_member=' + this.memberInfo.member_id;
this.$util.copy(text, () => {
this.closeSharePopup();
@@ -76,7 +76,7 @@ export default {
this.$api.sendRequest({
url: "/memberrecommend/api/memberrecommend/poster",
data: {
page: '/pages/index/index',
page: this.$util.INDEX_PAGE_URL,
qrcode_param: JSON.stringify(qrcode_param)
},
success: res => {

4
pages_tool/member/public/js/signin.js
View File

@@ -33,7 +33,7 @@ export default {
duration: 2000
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
}, 2000);
}
},1000);
@@ -106,7 +106,7 @@ export default {
if (this.back != '') {
this.$util.redirectTo(this.back, {}, this.redirect);
} else {
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}
},
//获取rule