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

@@ -33,7 +33,7 @@ export default {
onShow() {
if (!this.storeToken) {
this.$util.redirectTo('/pages_tool/login/login');
this.$util.redirectTo(this.$util.LOGIN_PAGE_URL);
} else {
this.getPayInfo();
}
@@ -54,7 +54,7 @@ export default {
title: '未获取到支付信息!'
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL);
}, 1500);
}
},

View File

@@ -91,7 +91,7 @@
this.$util.redirectTo('/pages_tool/member/coupon', {});
break;
default:
this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.MEMBER_PAGE_URL, {}, 'reLaunch');
break;
}
},
@@ -133,7 +133,7 @@
title: '未获取到支付信息!'
});
setTimeout(() => {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'reLaunch');
}, 1500);
}
},
@@ -143,7 +143,7 @@
});
},
goHome() {
this.$util.redirectTo('/pages/index/index', {}, 'reLaunch');
this.$util.redirectTo(this.$util.INDEX_PAGE_URL, {}, 'reLaunch');
},
toOrderDetail(id) {
if (this.payInfo.order_type == 2) {