适配微服务版本

This commit is contained in:
paulGao
2022-01-25 09:46:12 +08:00
parent 1c3d711298
commit 846e80f1fa
14 changed files with 91 additions and 85 deletions

View File

@@ -51,6 +51,7 @@ export default {
list: [], // 优惠券列表
total: 0, // 优惠券总数
params: { // 请求参数
getType: 'FREE',
pageNumber: 1,
pageSize: 20
}
@@ -95,6 +96,7 @@ export default {
content: '<p>优惠券领取成功,可到我的优惠券页面查看</p>',
okText: '我的优惠券',
cancelText: '立即使用',
closable: true,
onOk: () => {
this.$router.push('/home/Coupons')
},

View File

@@ -9,7 +9,7 @@
class="width_300"
search
enter-button
v-model="params.keywords"
v-model="params.sn"
@on-search="getList"
placeholder="请输入订单号搜索"
/>
@@ -125,7 +125,7 @@ export default {
params: { // 请求参数
pageNumber: 1,
pageSize: 10,
keywords: '',
sn: '',
sort: 'createTime',
order: 'desc'
},

View File

@@ -313,8 +313,12 @@ export default {
let notSupArea = res.result.notSupportFreight;
this.selectedCoupon = {};
if (res.result.platformCoupon)
this.selectedCoupon.platformCoupon = res.result.platformCoupon;
Object.assign(this.selectedCoupon, res.result.storeCoupons);
this.selectedCoupon[res.result.platformCoupon.memberCoupon.id] = res.result.platformCoupon;
if (res.result.storeCoupons && Object.keys(res.result.storeCoupons)[0]) {
let storeMemberCouponsId = Object.keys(res.result.storeCoupons)[0];
let storeCouponId = res.result.storeCoupons[storeMemberCouponsId].memberCoupon.id;
this.selectedCoupon[storeCouponId] = res.result.storeCoupons[storeMemberCouponsId];
}
if (notSupArea) {
let content = [];
let title = "";
@@ -340,7 +344,7 @@ export default {
const couponKeys = Object.keys(this.selectedCoupon);
if (couponKeys.length) {
this.couponList.forEach((e) => {
if (e.id === this.selectedCoupon[couponKeys].memberCoupon.id) {
if (this.selectedCoupon[e.id] && e.id === this.selectedCoupon[e.id].memberCoupon.id) {
this.usedCouponId.push(e.id);
}
});