领取数量调整描述为已领取数量，明确含义。

购物车无法渲染哪个商品参与了满减活动问题处理

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>

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">

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 } });
     },

seller/src/views/promotion/coupon/coupon.vue

@@ -92,7 +92,7 @@ export default {
         },
 
         {
-          title: "领取数量/总数量",
+          title: "已领取数量/总数量",
           key: "publishNum",
           render: (h, params) => {
             return h(