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

2
pages_tool/order/logistics.vue
View File

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

2
pages_tool/order/public/js/evaluate.js
View File

@@ -27,7 +27,7 @@ export default {
this.isIphoneX = this.$util.uniappIsIPhoneX();
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login', {
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {
back: '/pages_tool/order/evaluate?order_id=' + this.orderId
}, 'redirectTo');
}

2
pages_tool/order/refund.vue
View File

@@ -130,7 +130,7 @@ export default {
if (this.storeToken) {
this.getRefundData();
} else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
}
},
methods: {

2
pages_tool/order/refund_batch.vue
View File

@@ -122,7 +122,7 @@ export default {
if (this.storeToken) {
this.getRefundData();
} else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id });
}
},
methods: {

2
pages_tool/order/refund_detail.vue
View File

@@ -175,7 +175,7 @@ export default {
if (this.storeToken) {
this.getRefundDetail();
} else {
this.$util.redirectTo('/pages_tool/login/login', { back: '/pages_tool/order/refund_detail?order_goods_id=' + this.order_goods_id });
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, { back: '/pages_tool/order/refund_detail?order_goods_id=' + this.order_goods_id });
}
},
methods: {

2
pages_tool/order/refund_type_select.vue
View File

@@ -41,7 +41,7 @@
if (this.storeToken) {
this.getRefundData();
} else {
this.$util.redirectTo('/pages_tool/login/login', {
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL, {
back: '/pages_tool/order/refund?order_goods_id=' + this.order_goods_id
});
}