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

4
pages_tool/member/apply_withdrawal.vue
View File

@@ -78,7 +78,7 @@
this.getWithdrawInfo();
this.getBankAccountInfo();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {
back: '/pages_tool/member/apply_withdrawal'
});
}
@@ -109,7 +109,7 @@
title: '未开启提现'
});
setTimeout(() => {
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}, 1500);
}
}

2
pages_tool/member/assets.vue
View File

@@ -92,7 +92,7 @@ export default {
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getAccountInfo();
}

4
pages_tool/member/balance.vue
View File

@@ -6,7 +6,7 @@
'height': menuButtonBounding.height + 'px'
}">
<view class="navbar-wrap">
<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
<text class="iconfont icon-back_light back" @click="$util.redirectTo($util.MEMBER_PAGE_URL)"></text>
<view class="navbar-title">
账户余额
</view>
@@ -171,7 +171,7 @@ export default {
if (options.from === 'navigateBack') {
return false;
}
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch');
return true;
},
watch: {

2
pages_tool/member/cancellation.vue
View File

@@ -31,7 +31,7 @@ export default {
if (option.back) this.back = option.back;
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getCancelAgreement();
}

4
pages_tool/member/cancelrefuse.vue
View File

@@ -26,7 +26,7 @@ export default {
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getStatus();
}
@@ -43,7 +43,7 @@ export default {
});
},
toIndex() {
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
},
apply() {
this.$util.redirectTo('/pages_tool/member/cancellation');

8
pages_tool/member/cancelstatus.vue
View File

@@ -46,7 +46,7 @@
onLoad(option) {
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getStatus();
}
@@ -71,13 +71,13 @@
this.$store.commit('setMemberInfo', '');
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
this.$util.redirectTo('/pages/index/index');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
}
}
});
},
back() {
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
},
revoke() {
uni.showModal({
@@ -90,7 +90,7 @@
url: '/membercancel/api/membercancel/cancelApply',
success: res => {
if (res.code >= 0) {
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}
}
});

4
pages_tool/member/cancelsuccess.vue
View File

@@ -25,7 +25,7 @@
// 判断登录
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getStatus();
}
@@ -40,7 +40,7 @@
this.$store.commit('setToken', '');
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
this.$util.redirectTo('/pages/index/index');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
}
}
}

4
pages_tool/member/card.vue
View File

@@ -183,7 +183,7 @@ export default {
if (options.from === 'navigateBack') {
return false;
}
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
return true;
}
};
@@ -220,7 +220,7 @@ export default {
}
</style>
<style scoped>
<style lang="scss" scoped>
/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
max-height: unset !important;
}

2
pages_tool/member/card_buy.vue
View File

@@ -418,7 +418,7 @@ export default {
if (options.from === 'navigateBack') {
return false;
}
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
return true;
}
};

2
pages_tool/member/collection.vue
View File

@@ -30,7 +30,7 @@
</block>
<!-- 第一个列表为空时 -->
<view class="collection-empty" v-else>
<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品"
<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品" subText="赶紧去逛逛, 关注心仪的商品吧"
:isIndex="Boolean(storeToken)" :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
<button type="primary" size="mini" class="button mini" v-if="!storeToken"
@click="toLogin">{{ $lang('toLogin') }}</button>

4
pages_tool/member/coupon.vue
View File

@@ -60,7 +60,7 @@
</view>
</view>
<view v-if="!list.length && showEmpty" class="margin-top cart-empty" :fixed="false">
<ns-empty :isIndex="true" :emptyBtn="{url: '/pages/index/index',text: '去逛逛'}" text="暂无优惠券"></ns-empty>
<ns-empty :isIndex="true" :emptyBtn="{url: $util.INDEX_PAGE_URL,text: '去逛逛'}" text="暂无优惠券"></ns-empty>
</view>
</block>
</mescroll-uni>
@@ -93,7 +93,7 @@ export default {
duration: 2000
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
}, 2000);
}
},1000);

2
pages_tool/member/footprint.vue
View File

@@ -46,7 +46,7 @@
</view>
</view>
<view class="footprint-empty" v-else>
<ns-empty text="暂无浏览过的商品" :isIndex="Boolean(storeToken)" :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
<ns-empty text="暂无浏览过的商品" subText="赶紧去逛逛, 发现更多商品吧" :isIndex="Boolean(storeToken)" :emptyBtn="{ text: $lang('toGoodsCategoryPage'), url: '/pages_goods/category' }"></ns-empty>
<button type="primary" size="mini" class="button mini" v-if="!storeToken"
@click="toLogin">{{ $lang('toLogin') }}</button>
</view>

7
pages_tool/member/index.vue
View File

@@ -96,7 +96,8 @@ export default {
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
uni.removeStorageSync('privacyAgreed');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
}
}
});
@@ -118,7 +119,9 @@ export default {
this.$store.commit('setMemberInfo', '');
this.$store.dispatch('emptyCart');
uni.removeStorageSync('authInfo');
this.$util.redirectTo('/pages/member/index');
uni.removeStorageSync('privacyAgreed');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
} else {
this.$util.showToast({
title: rres.message

2
pages_tool/member/level.vue
View File

@@ -354,7 +354,7 @@
if (options.from === 'navigateBack') {
return false;
}
this.$util.redirectTo('/pages/member/index');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL);
return true;
},
watch: {

2
pages_tool/member/modify_face.vue
View File

@@ -40,7 +40,7 @@
onShow() {
if (!this.storeToken) {
this.$util.redirectTo(
'/pages_tool/login/login', {
this.$util.LOGIN_PAGE_URL, {
back: '/pages_tool/member/modify_face'
},
'redirectTo'

6
pages_tool/member/pay_password.vue
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();

4
pages_tool/member/point.vue
View File

@@ -7,7 +7,7 @@
}"
>
<view class="navbar-wrap">
<text class="iconfont icon-back_light back" @click="$util.redirectTo('/pages/member/index')"></text>
<text class="iconfont icon-back_light back" @click="$util.redirectTo($util.MEMBER_PAGE_URL)"></text>
<view class="navbar-title">
我的积分
</view>
@@ -143,7 +143,7 @@ export default {
if (options.from === 'navigateBack') {
return false;
}
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch');
return true;
},
watch: {

2
pages_tool/member/point_detail.vue
View File

@@ -74,7 +74,7 @@ export default {
onShow() {
if (!this.storeToken) {
this.$util.redirectTo(
'/pages_tool/login/login',
this.$util.LOGIN_PAGE_URL,
{
back: '/pages_tool/member/point'
},

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

2
pages_tool/member/withdrawal.vue
View File

@@ -40,7 +40,7 @@ export default {
onShow() {
if (!this.storeToken) {
this.$util.redirectTo(
'/pages_tool/login/login',
this.$util.LOGIN_PAGE_URL,
{
back: '/pages_tool/member/point'
},

2
pages_tool/member/withdrawal_detail.vue
View File

@@ -69,7 +69,7 @@ export default {
this.getDetail();
} else {
this.$util.redirectTo(
'/pages_tool/login/login',
this.$util.LOGIN_PAGE_URL,
{
back: '/pages_tool/member/point'
},