【功能完善】商品列表，展示满减送、限时折扣的信息

pages/goods/list.vue

@@ -118,7 +118,7 @@
 </template>
 
 <script setup>
-  import { reactive,ref } from 'vue';
+  import { reactive, ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
@@ -278,13 +278,13 @@
       return;
     }
     // 使用 map 提取每个对象的 id 属性
-    const ids = data.list.map(item => item.id);
+    const ids = data.list.map((item) => item.id);
     // 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
     const idsString = ids.join(',');
     // 获取结算信息
-    settleData.value = await getSettlementByIds(idsString)
+    settleData.value = await getSettlementByIds(idsString);
     // 处理获得的数据
-    const ms = enrichDataWithSkus(data.list,settleData.value)
+    const ms = enrichDataWithSkus(data.list, settleData.value);
     state.pagination.list = _.concat(state.pagination.list, ms);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
@@ -301,7 +301,7 @@
   }
 
   //获取结算信息
-  const settleData = ref()
+  const settleData = ref();
   async function getSettlementByIds(ids) {
     const { data } = await SpuApi.getSettlementProduct(ids);
     return data;
@@ -310,10 +310,10 @@
   //计算展示价格的函数
   function enrichDataWithSkus(data, array) {
     // 创建一个映射，以 id 为键，存储 data 数组中的对象
-    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+    const dataMap = new Map(data.map((item) => [item.id, { ...item }]));
 
     // 遍历 array 数组
-    array.forEach(item => {
+    array.forEach((item) => {
       // 初始化 discountPrice 和 vipPrice 为 null
       let discountPrice = null;
       let vipPrice = null;
@@ -321,13 +321,14 @@
       let foundType6 = false;
 
       // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
-      item.skus.forEach(sku => {
-        if (!foundType4 && sku.type === 4) {
-          discountPrice = sku.price;
+      item.skus.forEach((sku) => {
+        debugger;
+        if (!foundType4 && sku.promotionType === 4) {
+          discountPrice = sku.payPrice;
           foundType4 = true;
         }
-        if (!foundType6 && sku.type === 6) {
-          vipPrice = sku.price;
+        if (!foundType6 && sku.promotionType === 6) {
+          vipPrice = sku.payPrice;
           foundType6 = true;
         }
 
@@ -338,10 +339,11 @@
       });
 
       // 更新 dataMap 中对应的对象
-      if (dataMap.has(item.id)) {
-        dataMap.get(item.id).discountPrice = discountPrice;
-        dataMap.get(item.id).vipPrice = vipPrice;
-        dataMap.get(item.id).reward = item.reward;
+      if (dataMap.has(item.spuId)) {
+        debugger;
+        dataMap.get(item.spuId).discountPrice = discountPrice;
+        dataMap.get(item.spuId).vipPrice = vipPrice;
+        dataMap.get(item.spuId).reward = item.rewardActivity;
       }
     });