diff --git a/pages.json b/pages.json index de5b5fe..abae6b4 100644 --- a/pages.json +++ b/pages.json @@ -1,5 +1,19 @@ { "pages": [ + { + "path" : "pages/book/photoProductDetail/photoProductDetail", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/book/photoProducts/photoProducts", + "style" : + { + "navigationBarTitleText" : "" + } + }, { "path" : "pages/coupon/CouponMall/CouponMall", "style" : @@ -261,6 +275,13 @@ { "navigationBarTitleText" : "" } + }, + { + "path" : "pages/coupon/OverDueCoupon/OverDueCoupon", + "style" : + { + "navigationBarTitleText" : "" + } } ], "plugins" : { diff --git a/pages/coupon/MyCoupon/MyCoupon.vue b/pages/coupon/MyCoupon/MyCoupon.vue index 751d9ed..889244f 100644 --- a/pages/coupon/MyCoupon/MyCoupon.vue +++ b/pages/coupon/MyCoupon/MyCoupon.vue @@ -4,31 +4,70 @@ 我的优惠券 优惠券 - + - 50 + {{ item.couponVO.conditionAmount }} - 200减50元 + {{ item.couponVO.name }} - 已过期 + - 满200元使用 - 2025-01-10 00:00至2025-04-09 00:00 + 满{{ item.couponVO.standardAmount }}元使用 + {{ item.couponVO.startTime.substr(0, 16) }}至{{ item.couponVO.endTime.substr(0, 16) }} - 查看失效的券码> - 兑换优惠券 + 查看失效的券码> + 兑换优惠券 diff --git a/pages/coupon/component/couponPopup.vue b/pages/coupon/component/couponPopup.vue index bd70966..74e94b4 100644 --- a/pages/coupon/component/couponPopup.vue +++ b/pages/coupon/component/couponPopup.vue @@ -21,7 +21,7 @@ - + 优惠券商城 { if (!val) { isShow.value = !isShow.value @@ -133,7 +135,9 @@ } const confirm = () => { - emitter.emit('getCouponObj', myCouponList.value[idx.value]) + if (idx.value !== -1) { + emitter.emit('getCouponObj', myCouponList.value[idx.value]) + } emitter.emit('closeCoupon') } @@ -160,6 +164,12 @@ } + const jumpToMall = () => { + uni.navigateTo({ + url: '/pages/coupon/CouponMall/CouponMall' + }) + } + diff --git a/pages/order/singleGoodOrder/singleGoodOrder.vue b/pages/order/singleGoodOrder/singleGoodOrder.vue index 22b1482..dc36d2e 100644 --- a/pages/order/singleGoodOrder/singleGoodOrder.vue +++ b/pages/order/singleGoodOrder/singleGoodOrder.vue @@ -3,7 +3,7 @@ - + {{ addressRealInfo.region }} @@ -15,7 +15,7 @@ {{ addressRealInfo.detailAddress }} - + 更换地址 - {{ productObject.price }} + {{ productObject.price.toFixed(2) }} @@ -93,10 +93,10 @@ - + 优惠券 - {{ templateString }} + {{ templateString }} {{ sfAmount.toFixed(2) }} - 微信支付 + + 微信支付 @@ -162,6 +163,9 @@ + + +