diff --git a/components/coupon-modal.vue b/components/coupon-modal.vue index 06bfde7..294c500 100644 --- a/components/coupon-modal.vue +++ b/components/coupon-modal.vue @@ -29,11 +29,11 @@ 第二件半价券 - 满{{ val.fullAmount }}可用 + 买一送一券 - 满{{ val.fullAmount }}可用 + {{ val.title }} diff --git a/pages.json b/pages.json index 56f0b82..39a686a 100644 --- a/pages.json +++ b/pages.json @@ -103,6 +103,12 @@ "navigationBarTitleText": "会员列表" } }, + { + "path": "pages/user/points_store", + "style": { + "navigationBarTitleText": "积分门店" + } + }, { "path": "pages/user/member/memberdetails", "style": { @@ -190,37 +196,32 @@ } }, { - "path" : "pages/user/member/charge-detail/charge-detail", - "style" : - { - "navigationBarTitleText" : "", + "path": "pages/user/member/charge-detail/charge-detail", + "style": { + "navigationBarTitleText": "", "navigationStyle": "custom" } } ], - "subPackages": [ - { - "root": "user", - "pages": [{ - "path" : "vip/vip", - "style" : - { - "navigationBarTitleText" : "", + "subPackages": [{ + "root": "user", + "pages": [{ + "path": "vip/vip", + "style": { + "navigationBarTitleText": "", "navigationStyle": "custom" } }, { - "path" : "vip/buy-vip", - "style" : - { - "navigationBarTitleText" : "", + "path": "vip/buy-vip", + "style": { + "navigationBarTitleText": "", "navigationStyle": "custom" } } - - ] - } - ], + + ] + }], "uniIdRouter": {}, "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue index 9cfbbaf..cd0b68e 100644 --- a/pages/user/coupon.vue +++ b/pages/user/coupon.vue @@ -148,18 +148,17 @@ function showDetailHandle(item) { `可适用商品:${item.foods}`, `可使用类型:${convertValuesToLabels(item.useType)}`, `可用时间段:${item.useTimeType == 'all' ? '全段时间可用' : `${item.useStartTime} - ${item.useEndTime}`}`, - `限量规则:${item.getLimit == -10086 ? '无限' : `${item.getLimit}张`}`, + `限量规则:每人限领${item.getLimit == -10086 ? `无限张` : `${item.getLimit}张`},每日最多可使用${item.useLimit == -10086 ? `无限张` : `${item.useLimit}张`}`, `同享规则:${item.vipPriceShare ? '与限时折扣同享、与会员价同享' : '不与限时折扣同享、与会员价同享'}`, `其它说明:${item.ruleDetails || '无'}` ]; - if (item.type == 2 || item.type == 4) { + if (item.type == 2 || item.type == 4 || item.type == 6) { selectListItemDetails.value.splice(2, 0, `使用规则:${item.useRule == 'price_asc' ? '从最低价开始抵扣' : '从最高价开始抵扣'}`); } if (item.type == 3) { selectListItemDetails.value.unshift(`最高抵扣${item.maxDiscountAmount}元`); - // selectListItemDetails.value.splice(3, 0, `使用规则:${item.useRule == 'price_asc' ? '从最低价开始抵扣' : '从最高价开始抵扣'}`); } }