From 6b6fa0c25715df9e8c4d67561fc6b61d2ad692ae Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 16 Sep 2024 19:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=91=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=85=B7=E4=BD=93=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                       |  3 +-
 .../s-discount-list/s-discount-list.vue       | 55 +++++++------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 70393b2..d090aec 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -143,8 +143,7 @@
           v-if="state.orderInfo.price.discountPrice > 0"
         >
           <view class="item-title">活动优惠</view>
-          <view class="ss-flex ss-col-center">
-            <!--                @tap="state.showDiscount = true" TODO puhui999：【折扣】后续要把优惠信息打进去 -->
+          <view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
             <text class="item-value text-red">
               -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
             </text>
diff --git a/sheep/components/s-discount-list/s-discount-list.vue b/sheep/components/s-discount-list/s-discount-list.vue
index 25e42dd..652cd60 100644
--- a/sheep/components/s-discount-list/s-discount-list.vue
+++ b/sheep/components/s-discount-list/s-discount-list.vue
@@ -1,23 +1,24 @@
 <template>
-  <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
+  <su-popup
+    :show="show"
+    type="bottom"
+    round="20"
+    @close="emits('close')"
+    showClose
+    backgroundColor="#f2f2f2"
+  >
     <view class="model-box">
       <view class="title ss-m-t-38 ss-m-l-20 ss-m-b-40">活动优惠</view>
-      <scroll-view class="model-content ss-m-l-20" scroll-y :scroll-with-animation="false"
-                   :enable-back-to-top="true">
+      <scroll-view
+        class="model-content ss-m-l-20"
+        scroll-y
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
         <view v-for="(item, index) in state.orderInfo.promotions" :key="index">
-          <view class="ss-flex ss-m-b-40 subtitle">
-            <!-- <view>共{{ item.goods_ids.length }}件，</view>
-            <view v-if="item.activity_type === 'full_discount'">
-              满{{ item.discount_rule.full }}打{{ item.discount_rule.discount }}折,已减
-            </view>
-            <view v-if="item.activity_type === 'full_gift'">满赠</view>
-            <view v-if="item.activity_type === 'full_reduce'">
-              满{{ item.discount_rule.full }}减{{ item.discount_rule.discount }},已减
-            </view>
-            <view class="price-text">￥{{ item.promo_discount_money || '0.00' }}</view> -->
-            <view>
-              {{item.description}}
-            </view>
+          <!-- 不展示积分、优惠劵、会员折扣，因为它们已经单独展示了 -->
+          <view class="ss-flex ss-m-b-40 subtitle" v-if="[1, 2, 3, 4, 5, 6].includes(item.type)">
+            <view> {{ item.description }} </view>
           </view>
         </view>
       </scroll-view>
@@ -28,14 +29,7 @@
   </su-popup>
 </template>
 <script setup>
-  import {
-    computed,
-    reactive
-  } from 'vue';
-  import sheep from '@/sheep';
-  import {
-    fen2yuan
-  } from '@/sheep/hooks/useGoods';
+  import { computed, reactive } from 'vue';
   const props = defineProps({
     promoInfo: {
       type: Array,
@@ -47,7 +41,7 @@
     },
     modelValue: {
       type: Object,
-      default () {},
+      default() {},
     },
     show: {
       type: Boolean,
@@ -58,15 +52,6 @@
   const state = reactive({
     orderInfo: computed(() => props.modelValue),
   });
-  // const getGoodsImg = (e) => {
-  //   let goodsImg = '';
-  //   state.orderInfo.goods_list.forEach((i) => {
-  //     if (e == i.goods_id) {
-  //       goodsImg = i.goods.image;
-  //     }
-  //   });
-  //   return goodsImg;
-  // };
 </script>
 <style lang="scss" scoped>
   .model-box {
@@ -108,4 +93,4 @@
   .price-text {
     color: #ff3000;
   }
-</style>
\ No newline at end of file
+</style>