diff --git a/buyer/src/pages/CouponCenter.vue b/buyer/src/pages/CouponCenter.vue index e3f589f2..959e0329 100644 --- a/buyer/src/pages/CouponCenter.vue +++ b/buyer/src/pages/CouponCenter.vue @@ -5,25 +5,44 @@
- +

领券中心

- +
推荐好券
- +
  • - {{item.price | unitPrice}} - {{item.couponDiscount}} - 满{{item.consumeThreshold}}元可用 + {{ + item.price | unitPrice + }} + {{ item.couponDiscount }} + 满{{ item.consumeThreshold }}元可用
    -

    使用范围:{{useScope(item.scopeType, item.storeName)}}

    -

    有效期:{{item.endTime}}

    +

    使用范围:{{ useScope(item.scopeType, item.storeName) }}

    +

    有效期:{{ item.endTime }}

    立即领取 @@ -31,12 +50,15 @@
- + show-sizer + >
@@ -44,135 +66,136 @@ diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue index 94038860..0d454c22 100644 --- a/buyer/src/pages/GoodsList.vue +++ b/buyer/src/pages/GoodsList.vue @@ -82,20 +82,24 @@
- + 自营 虚拟 实物 @@ -155,13 +159,21 @@ export default { watch: { $route() { const keyword = this.$route.query.keyword; - this.handleSearch(keyword); + if (keyword) { + this.handleSearch(keyword); + } if (this.$route.query.categoryId) { let cateId = this.$route.query.categoryId.split(","); Object.assign(this.params, this.$route.query); this.params.categoryId = cateId[cateId.length - 1]; - this.getGoodsList(); } + if (this.$route.query.promotionType) { + this.params.promotionType = this.$route.query.promotionType; + } + if (this.$route.query.promotionsId) { + this.params.promotionsId = this.$route.query.promotionsId; + } + this.getGoodsList(); }, }, methods: { @@ -301,7 +313,6 @@ export default { margin-top: 5px; } - .goods-show-self { float: left; height: 16px; diff --git a/buyer/src/pages/home/userCenter/Coupons.vue b/buyer/src/pages/home/userCenter/Coupons.vue index b1b2ed0c..8da1314d 100644 --- a/buyer/src/pages/home/userCenter/Coupons.vue +++ b/buyer/src/pages/home/userCenter/Coupons.vue @@ -1,136 +1,155 @@