From abaefc59a690ea9807481347a3000e15eec3e7ed Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Thu, 26 Aug 2021 11:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=95=B0=E9=87=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=8F=8F=E8=BF=B0=E4=B8=BA=E5=B7=B2=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E6=98=8E=E7=A1=AE=E5=90=AB=E4=B9=89?=
 =?UTF-8?q?=E3=80=82=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=93=AA=E4=B8=AA=E5=95=86=E5=93=81=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E4=BA=86=E6=BB=A1=E5=87=8F=E6=B4=BB=E5=8A=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/Promotion.vue |  2 +-
 buyer/src/pages/Cart.vue                       | 12 ++++++++++++
 manager/src/views/promotion/coupon/coupon.vue  |  4 ++--
 seller/src/views/promotion/coupon/coupon.vue   |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/buyer/src/components/goodsDetail/Promotion.vue b/buyer/src/components/goodsDetail/Promotion.vue
index ea685c88..be6b08b4 100644
--- a/buyer/src/components/goodsDetail/Promotion.vue
+++ b/buyer/src/components/goodsDetail/Promotion.vue
@@ -8,7 +8,7 @@
       <div v-else>{{end}}</div>
     </div>
     <span v-else class="cart-promotion">
-      <span v-if="end === ''">据活动结束：<span>{{ hours }}</span> : <span>{{ minutes }}</span> : <span>{{ seconds }}</span></span>
+      <span v-if="end === ''">距活动结束：<span>{{ hours }}</span> : <span>{{ minutes }}</span> : <span>{{ seconds }}</span></span>
       <span v-else>活动已结束</span>
     </span>
   </div>
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index 293d7d65..f46df18b 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -75,6 +75,18 @@
                       <promotion :time="promotion.endTime" type="cart"></promotion>
                     </div>
                   </template>
+                  <template v-for="(promotion, promotionIndex) in goods.promotions">
+                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'FULL_DISCOUNT'">
+                      <span>满优惠活动</span>
+                      <promotion :time="promotion.endTime" type="cart"></promotion>
+                    </div>
+                  </template>
+                  <template v-for="(promotion, promotionIndex) in goods.promotions">
+                    <div class="promotion" :key="promotionIndex" v-if="promotion.promotionType === 'COUPON'">
+                      <span>优惠券</span>
+                      <promotion :time="promotion.endTime" type="cart"></promotion>
+                    </div>
+                  </template>
                 </div>
               </div>
               <div class="width_150">
diff --git a/manager/src/views/promotion/coupon/coupon.vue b/manager/src/views/promotion/coupon/coupon.vue
index a372f567..8f172e02 100644
--- a/manager/src/views/promotion/coupon/coupon.vue
+++ b/manager/src/views/promotion/coupon/coupon.vue
@@ -95,7 +95,7 @@ export default {
         },
 
         {
-          title: "领取数量/总数量",
+          title: "已领取数量/总数量",
           key: "publishNum",
           width: 130,
           render: (h, params) => {
@@ -308,7 +308,7 @@ export default {
       this.total = this.data.length;
       this.loading = false;
     },
-    
+
     edit(v) {  // 跳转编辑页面
       this.$router.push({ name: "edit-platform-coupon", query: { id: v.id } });
     },
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 469d3aef..7bb199b9 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -92,7 +92,7 @@ export default {
         },
 
         {
-          title: "领取数量/总数量",
+          title: "已领取数量/总数量",
           key: "publishNum",
           render: (h, params) => {
             return h(