From a6543dc7ca2d9cb9ad0b98b7aafc0ba214c8e58e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E7=90=B3=E7=BA=A2?= <1921957171@qq.com>
Date: Fri, 30 Aug 2024 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=95=86=E6=A6=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/index.vue                      |    1 +
 pages/goods/index.vue                         |  313 +++-
 pages/goods/list.vue                          |   63 +-
 pages/index/category.vue                      |    1 +
 sheep/api/product/spu.js                      |   12 +
 .../s-activity-pop/s-activity-pop.vue         |   52 +-
 .../components/s-goods-card/s-goods-card.vue  |   61 +-
 .../s-goods-column/s-goods-column.vue         | 1404 +++++++++--------
 .../components/s-select-sku/s-select-sku.vue  |    2 +-
 static/images/dis.png                         |  Bin 0 -> 16936 bytes
 10 files changed, 1121 insertions(+), 788 deletions(-)
 create mode 100644 static/images/dis.png

diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 56417ed9..b84a084d 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -123,6 +123,7 @@
     if (code !== 0) {
       return;
     }
+	console.log('nibuhao ')
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index dc3f73aa..7fce4db9 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -8,13 +8,43 @@
 			<detailSkeleton v-if="state.skeletonLoading" />
 			<!-- 下架/售罄提醒 -->
 			<s-empty v-else-if="state.goodsInfo === null" text="商品不存在或已下架" icon="/static/soldout-empty.png" showAction
-               actionText="再逛逛" actionUrl="/pages/goods/list" />
+				actionText="再逛逛" actionUrl="/pages/goods/list" />
 			<block v-else>
 				<view class="detail-swiper-selector">
 					<!-- 商品轮播图  -->
 					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
-                     otStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
-
+						otStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
+					<!-- 限时折扣 -->
+					<view class="discount">
+						<image class="disImg" src="../../static/images/dis.png"></image>
+						<view class="discountCont">
+							<view class="disContT">
+								<view class="disContT1">
+									<view class="disContT1P">
+										￥0.7
+									</view>
+									<view class="disContT1End">
+										限时到手￥0.4
+									</view>
+								</view>
+								<view class="disContT2">
+									限时折扣
+								</view>
+							</view>
+							<view class="disContB">
+								<view class="disContB1">
+									价格：￥1 丨 剩余：100
+								</view>
+								<view class="disContB2">
+									距结束仅剩
+									<countDown :tipText="' '" :bgColor="bgColor" :dayText="':'" :hourText="':'"
+										:minuteText="':'" :secondText="' '" :datatime="1725033600000 / 1000"
+										:isDay="false" />
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 限时折扣 -->
 					<!-- 价格+标题 -->
 					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
 						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
@@ -34,15 +64,15 @@
 							<!-- 满减送/限时折扣活动的提示 -->
 							<div class="tag-content">
 								<view class="tag-box ss-flex">
-									<view class="tag ss-m-r-10" v-for="promos in state.activityInfo"
-                        :key="promos.id" @tap="onActivity">
+									<view class="tag ss-m-r-10" v-for="promos in state.activityInfo" :key="promos.id"
+										@tap="onActivity">
 										{{ promos.name }}
 									</view>
 								</view>
 							</div>
 
-							<!-- 优惠劵 -->
-							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
+							<!-- 优惠劵@tap="state.showModel = true" -->
+							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="onActivity"
 								v-if="state.couponInfo.length">
 								<view class="discounts-title ss-m-r-8">领券</view>
 								<text class="cicon-forward"></text>
@@ -55,12 +85,12 @@
 					<!-- 功能卡片 -->
 					<view class="detail-cell-card detail-card ss-flex-col">
 						<detail-cell-sku v-model="state.selectedSku.goods_sku_text" :sku="state.selectedSku"
-                             @tap="state.showSelectSku = true" />
+							@tap="state.showSelectSku = true" />
 					</view>
 
 					<!-- 规格与数量弹框 -->
 					<s-select-sku :goodsInfo="state.goodsInfo" :show="state.showSelectSku" @addCart="onAddCart"
-                        @buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
+						@buy="onBuy" @change="onSkuChange" @close="state.showSelectSku = false" />
 				</view>
 
 				<!-- 评价 -->
@@ -87,25 +117,36 @@
 				</detail-tabbar>
 
 				<!-- 优惠劵弹窗 -->
-				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-                      @get="onGet" />
+				<!-- <s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
+					@get="onGet" /> -->
 
 				<!-- 满减送/限时折扣活动弹窗 -->
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
-                        @close="state.showActivityModel = false" />
+					@close="state.showActivityModel = false" />
 			</block>
 		</s-layout>
 	</view>
 </template>
 
 <script setup>
-	import { reactive, computed } from 'vue';
-	import { onLoad, onPageScroll } from '@dcloudio/uni-app';
+	import {
+		reactive,
+		computed,
+		ref
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
 	import CouponApi from '@/sheep/api/promotion/coupon';
 	import ActivityApi from '@/sheep/api/promotion/activity';
-  import FavoriteApi from '@/sheep/api/product/favorite';
-  import { formatSales, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
+	import FavoriteApi from '@/sheep/api/product/favorite';
+	import {
+		formatSales,
+		formatGoodsSwiper,
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
 	import detailTabbar from './components/detail/detail-tabbar.vue';
@@ -113,13 +154,22 @@
 	import detailCommentCard from './components/detail/detail-comment-card.vue';
 	import detailContentCard from './components/detail/detail-content-card.vue';
 	import detailActivityTip from './components/detail/detail-activity-tip.vue';
-	import { isEmpty } from 'lodash-es';
-  import SpuApi from '@/sheep/api/product/spu';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import SpuApi from '@/sheep/api/product/spu';
 
 	onPageScroll(() => {});
-
-  const isLogin = computed(() => sheep.$store('user').isLogin);
-  const state = reactive({
+	import countDown from '@/sheep/components/countDown/index.vue'
+	const bgColor = {
+		'bgColor': '#E93323',
+		'Color': '#fff',
+		'width': '44rpx',
+		'timeTxtwidth': '16rpx',
+		'isDay': true
+	}
+	const isLogin = computed(() => sheep.$store('user').isLogin);
+	const state = reactive({
 		goodsId: 0,
 		skeletonLoading: true, // SPU 加载中
 		goodsInfo: {}, // SPU 信息
@@ -139,28 +189,28 @@
 
 	// 添加购物车
 	function onAddCart(e) {
-    if (!e.id) {
-      sheep.$helper.toast('请选择商品规格');
-      return;
-    }
+		if (!e.id) {
+			sheep.$helper.toast('请选择商品规格');
+			return;
+		}
 		sheep.$store('cart').add(e);
 	}
 
 	// 立即购买
 	function onBuy(e) {
-    if (!state.selectedSku.id) {
-      sheep.$helper.toast('请选择商品规格');
-      return;
-    }
-    sheep.$router.go('/pages/order/confirm', {
-      data: JSON.stringify({
-        items: [{
-          skuId: e.id,
-          count: e.goods_num,
-		      categoryId: state.goodsInfo.categoryId
-        }]
-      }),
-    });
+		if (!state.selectedSku.id) {
+			sheep.$helper.toast('请选择商品规格');
+			return;
+		}
+		sheep.$router.go('/pages/order/confirm', {
+			data: JSON.stringify({
+				items: [{
+					skuId: e.id,
+					count: e.goods_num,
+					categoryId: state.goodsInfo.categoryId
+				}]
+			}),
+		});
 	}
 
 	// 营销活动
@@ -170,16 +220,18 @@
 
 	// 立即领取
 	async function onGet(id) {
-    const { code } = await CouponApi.takeCoupon(id);
-    if (code !== 0) {
-      return;
-    }
-    uni.showToast({
-      title: '领取成功',
-    });
-    setTimeout(() => {
-      getCoupon();
-    }, 1000);
+		const {
+			code
+		} = await CouponApi.takeCoupon(id);
+		if (code !== 0) {
+			return;
+		}
+		uni.showToast({
+			title: '领取成功',
+		});
+		setTimeout(() => {
+			getCoupon();
+		}, 1000);
 	}
 
 	//  TODO 芋艿：待测试
@@ -202,13 +254,23 @@
 		});
 	});
 
-  async function getCoupon() {
-    const { code, data } = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
-    if (code === 0) {
-      state.couponInfo = data;
-    }
-  }
-
+	async function getCoupon() {
+		const {
+			code,
+			data
+		} = await CouponApi.getCouponTemplateList(state.goodsId, 2, 10);
+		if (code === 0) {
+			state.couponInfo = data;
+		}
+	}
+	//获取结算信息
+	const settleData = ref()
+	async function getSettlementByIds(ids) {
+	  const { data } = await SpuApi.getSettlementProduct(ids);
+	  settleData.value = data
+	  console.log('结算信息',data)
+	  return data;
+	}
 	onLoad((options) => {
 		// 非法参数
 		if (!options.id) {
@@ -226,36 +288,38 @@
 			// 加载到商品
 			state.skeletonLoading = false;
 			state.goodsInfo = res.data;
-
-      // 加载是否收藏
-      if (isLogin.value) {
-        FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
-          if (res.code !== 0) {
-            return;
-          }
-          state.goodsInfo.favorite = res.data;
-        });
-      }
+			console.log('sku',res.data)
+			// 加载是否收藏
+			if (isLogin.value) {
+				FavoriteApi.isFavoriteExists(state.goodsId, 'goods').then((res) => {
+					if (res.code !== 0) {
+						return;
+					}
+					state.goodsInfo.favorite = res.data;
+				});
+			}
 		});
 
 		// 2. 加载优惠劵信息
-    getCoupon();
+		getCoupon();
 
 		// 3. 加载营销活动信息
 		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
 			if (res.code !== 0) {
 				return;
 			}
-      res.data.forEach(activity => {
-        if ([1, 2, 3].includes(activity.type)) { // 情况一：拼团/秒杀/砍价
-          state.activityList.push(activity);
-        } else if (activity.type === 5) { // 情况二：满减送
-          state.activityInfo.push(activity);
-        } else { // 情况三：限时折扣 TODO 芋艿
-          console.log('待实现！优先级不高');
-        }
-      })
+			res.data.forEach(activity => {
+				if ([1, 2, 3].includes(activity.type)) { // 情况一：拼团/秒杀/砍价
+					state.activityList.push(activity);
+				} else if (activity.type === 5) { // 情况二：满减送
+					state.activityInfo.push(activity);
+				} else { // 情况三：限时折扣 TODO 芋艿
+					console.log('待实现！优先级不高');
+				}
+			})
 		});
+		//获取结算信息
+		getSettlementByIds(state.goodsId)
 	});
 </script>
 
@@ -404,4 +468,101 @@
 			color: #333333;
 		}
 	}
-</style>
+
+	// 限时折扣
+	.discount {
+		width: 750rpx;
+		height: 100rpx;
+		// background-color: red;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.disImg {
+		width: 750rpx;
+		height: 100rpx;
+		position: absolute;
+		top: 0;
+		z-index: -1;
+	}
+
+	.discountCont {
+		width: 680rpx;
+		height: 90rpx;
+		margin: 10rpx auto 0 auto;
+		// background-color: gold;
+	}
+
+	.disContT {
+		width: 680rpx;
+		height: 50rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.disContT1 {
+		width: 300rpx;
+		height: 50rpx;
+		// background-color: green;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.disContT2 {
+		width: 300rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		// background-color: green;
+		font-size: 30rpx;
+		text-align: end;
+		color: white;
+		font-weight: bolder;
+		font-style: oblique 20deg;
+		letter-spacing: .1rem;
+	}
+
+	.disContT1P {
+		color: white;
+		font-weight: bold;
+		font-size: 28rpx;
+	}
+
+	.disContT1End {
+		// width: 180rpx;
+		padding: 0 10rpx;
+		height: 30rpx;
+		line-height: 28rpx;
+		text-align: center;
+		font-weight: bold;
+		background-color: white;
+		color: #ff3000;
+		font-size: 23rpx;
+		border-radius: 20rpx;
+		margin-left: 10rpx;
+	}
+
+	.disContB {
+		width: 680rpx;
+		height: 40rpx;
+		display: flex;
+		justify-content: space-between;
+		font-size: 20rpx;
+		color: white;
+		align-items: center;
+	}
+
+	.disContB1 {
+		width: 300rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+	}
+
+	.disContB2 {
+		width: 300rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		display: flex;
+		justify-content: flex-end;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index 1fdf5592..64eb2e65 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -118,7 +118,7 @@
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
+  import { reactive,ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import _ from 'lodash-es';
@@ -277,7 +277,16 @@
     if (code !== 0) {
       return;
     }
-    state.pagination.list = _.concat(state.pagination.list, data.list);
+	console.log('数据流',data)
+	// 使用 map 提取每个对象的 id 属性
+	const ids = data.list.map(item => item.id);
+	// 使用 join 方法将 id 数组连接成一个用逗号分隔的字符串
+	const idsString = ids.join(',');
+	// 获取结算信息
+	settleData.value = await getSettlementByIds(idsString)
+	// 处理获得的数据
+	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';
     mountMasonry();
@@ -291,7 +300,55 @@
     state.pagination.pageNo++;
     getList(state.currentSort, state.currentOrder);
   }
-
+  //获取结算信息
+  const settleData = ref()
+  async function getSettlementByIds(ids) {
+    const { data } = await SpuApi.getSettlementProduct(ids);
+    // console.log('结算信息',data)
+  	return data;
+  }
+  
+  //计算展示价格的函数
+  function enrichDataWithSkus(data, array) {
+    // 创建一个映射，以 id 为键，存储 data 数组中的对象
+    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+  
+    // 遍历 array 数组
+    array.forEach(item => {
+      // 初始化 discountPrice 和 vipPrice 为 null
+      let discountPrice = null;
+      let vipPrice = null;
+      let foundType4 = false;
+      let foundType6 = false;
+  
+      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
+      item.skus.forEach(sku => {
+        if (!foundType4 && sku.type === 4) {
+          discountPrice = sku.price;
+          foundType4 = true;
+        }
+        if (!foundType6 && sku.type === 6) {
+          vipPrice = sku.price;
+          foundType6 = true;
+        }
+  
+        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
+        if (foundType4 && foundType6) {
+          return;
+        }
+      });
+  
+      // 更新 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;
+      }
+    });
+  
+    // 返回更新后的数据数组
+    return Array.from(dataMap.values());
+  }
   onLoad((options) => {
     state.categoryId = options.categoryId;
     state.keyword = options.keyword;
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 4c88f388..2e0a6c53 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -90,6 +90,7 @@
     if (code !== 0) {
       return;
     }
+	console.log('nihao ')
     state.categoryList = handleTree(data);
   }
 
diff --git a/sheep/api/product/spu.js b/sheep/api/product/spu.js
index 3b84c1dc..f15a87c9 100644
--- a/sheep/api/product/spu.js
+++ b/sheep/api/product/spu.js
@@ -13,6 +13,18 @@ const SpuApi = {
       },
     });
   },
+  // 获得商品结算信息
+  getSettlementProduct: (ids) => {
+    return request({
+      url: '/trade/order/settlementProduct',
+      method: 'GET',
+      params: { ids },
+      custom: {
+        showLoading: false,
+        showError: false,
+      },
+    });
+  },
   // 获得商品 SPU 分页
   getSpuPage: (params) => {
     return request({
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 432dc457..97468541 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -2,20 +2,23 @@
 <template>
   <su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
     <view class="model-box">
-      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">营销活动</view>
+      <view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
       <scroll-view
         class="model-content ss-m-t-50"
         scroll-y
         :scroll-with-animation="false"
         :enable-back-to-top="true"
       >
-        <view v-for="item in state.activityInfo" :key="item.id">
-          <view class="ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(item)">
-            <view class="model-content-tag ss-flex ss-row-center">满减</view>
+        <view class="actBox" v-for="item in state.activityInfo" :key="item.id">
+          <view class="boxCont ss-flex ss-col-top ss-m-b-40" @tap="onGoodsList(item)">
+            <view class="model-content-tag ss-flex ss-row-center">活动</view>
             <view class="ss-m-l-20 model-content-title ss-flex-1">
-              <view class="ss-m-b-24" v-for="rule in state.activityMap[item.id]?.rules" :key="rule">
+              <view class="contBu ss-m-b-24" v-for="rule in state.activityMap[item.id]?.rules" :key="rule">
                 {{ formatRewardActivityRule(state.activityMap[item.id], rule) }}
               </view>
+			  <view class="contBu ss-m-b-24">
+			  	2024.08.05-2025.10.10
+			  </view>
             </view>
             <text class="cicon-forward" />
           </view>
@@ -45,7 +48,7 @@
     activityInfo: computed(() => props.modelValue),
     activityMap: {}
   });
-
+  console.log('shuju',state)
   watch(
     () => props.show,
     () => {
@@ -73,6 +76,7 @@
   .model-box {
     height: 60vh;
     .title {
+	justify-content: center;
       font-size: 36rpx;
       height: 80rpx;
       font-weight: bold;
@@ -80,26 +84,50 @@
     }
   }
   .model-content {
+	  height: 300rpx;
     padding: 0 20rpx;
     box-sizing: border-box;
+	background-color: red;
     .model-content-tag {
-      background: rgba(#ff6911, 0.1);
-      font-size: 24rpx;
+      // background: rgba(#ff6911, 0.1);
+      font-size: 35rpx;
       font-weight: 500;
       color: #ff6911;
-      line-height: 42rpx;
-      width: 68rpx;
-      height: 32rpx;
-      border-radius: 5rpx;
+      line-height: 150rpx;
+      width: 150rpx;
+      height: 150rpx;
+	  text-align: center;
+      // border-radius: 5rpx;
     }
     .model-content-title {
+	  height: 150rpx;
       font-size: 26rpx;
       font-weight: 500;
       color: #333333;
+	  background-color: gold;
+	  overflow: hidden;
     }
     .cicon-forward {
       font-size: 28rpx;
       color: #999999;
     }
   }
+  
+  // 新增的
+  .actBox{
+	  width: 700rpx;
+	  height: 150rpx;
+	  background-color: #fff2f2;
+	  margin: 10rpx auto;
+	  border-radius: 10rpx;
+  }
+  .boxCont{
+	  width: 700rpx;
+	  height: 150rpx;
+	  align-items: center;
+  }
+  .contBu{
+	  height: 75rpx;
+	  line-height: 75rpx;
+  }
 </style>
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index 59f2bf10..82e99084 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -135,7 +135,7 @@
   /**
    * 商品卡片
    */
-  import { computed, reactive, onMounted } from 'vue';
+  import { computed, reactive, onMounted,ref } from 'vue';
   import sheep from '@/sheep';
   import SpuApi from '@/sheep/api/product/spu';
 
@@ -202,6 +202,8 @@
    */
   function calculateGoodsColumn(height = 0, where = 'left') {
     // 处理完
+	console.log('用来处理的数据',state.goodsList)
+	console.log(11111)
     if (!state.goodsList[count]) return;
     // 增加列的高度
     if (where === 'left') leftHeight += height;
@@ -224,16 +226,69 @@
    */
   async function getGoodsListByIds(ids) {
     const { data } = await SpuApi.getSpuListByIds(ids);
+	// console.log('商品信息',data)
     return data;
   }
-
+  //获取结算信息
+  const settleData = ref()
+  async function getSettlementByIds(ids) {
+    const { data } = await SpuApi.getSettlementProduct(ids);
+    // console.log('结算信息',data)
+	return data;
+  }
+  
+  //计算展示价格的函数
+  function enrichDataWithSkus(data, array) {
+    // 创建一个映射，以 id 为键，存储 data 数组中的对象
+    const dataMap = new Map(data.map(item => [item.id, { ...item }]));
+  
+    // 遍历 array 数组
+    array.forEach(item => {
+      // 初始化 discountPrice 和 vipPrice 为 null
+      let discountPrice = null;
+      let vipPrice = null;
+      let foundType4 = false;
+      let foundType6 = false;
+  
+      // 遍历 skus 数组，寻找 type 为 4 和 6 的首个条目
+      item.skus.forEach(sku => {
+        if (!foundType4 && sku.type === 4) {
+          discountPrice = sku.price;
+          foundType4 = true;
+        }
+        if (!foundType6 && sku.type === 6) {
+          vipPrice = sku.price;
+          foundType6 = true;
+        }
+  
+        // 如果已经找到 type 为 4 和 6 的条目，则不需要继续遍历
+        if (foundType4 && foundType6) {
+          return;
+        }
+      });
+  
+      // 更新 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;
+      }
+    });
+  
+    // 返回更新后的数据数组
+    return Array.from(dataMap.values());
+  }
   // 初始化
   onMounted(async () => {
     // 加载商品列表
-    state.goodsList = await getGoodsListByIds(spuIds.join(','));
+    const ms = await getGoodsListByIds(spuIds.join(','));
+	settleData.value = await getSettlementByIds(spuIds.join(','))
+	state.goodsList = await enrichDataWithSkus(ms,settleData.value)
+	// console.log('计算后',state.goodsList)
     // 只有双列布局时需要
     if (layoutType === LayoutTypeEnum.TWO_COL){
       // 分列
+	  console.log('用来分流的数据',state.goodsList)
       calculateGoodsColumn();
     }
   });
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 228c64e1..1dd5528e 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -1,751 +1,769 @@
 <!-- 页面 -->
 <template>
-  <view class="ss-goods-wrap">
-    <!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
-    <view
-      v-if="size === 'xs'"
-      class="xs-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
-      <image
-        class="xs-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFit"
-      ></image>
-      <view
-        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
-        class="xs-goods-content ss-flex-col ss-row-around"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="xs-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="xs-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-        </view>
-      </view>
-    </view>
+	<view class="ss-goods-wrap">
+		<!-- xs卡片：横向紧凑型，一行放两个，图片左内容右边  -->
+		<view v-if="size === 'xs'" class="xs-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
+			<image class="xs-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFit"></image>
+			<view v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+				class="xs-goods-content ss-flex-col ss-row-around">
+				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="xs-goods-title ss-line-1"
+					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
+					{{ data.title || data.name }}
+				</view>
+				<view v-if="goodsFields.price?.show" class="xs-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+					{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+				</view>
+			</view>
+		</view>
 
-    <!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
-    <view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
-      <image
-        class="sm-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFill"
-      ></image>
+		<!-- sm卡片：竖向紧凑，一行放三个，图上内容下 -->
+		<view v-if="size === 'sm'" class="sm-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
+			<image class="sm-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
 
-      <view
-        v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
-        class="sm-goods-content"
-        :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="sm-goods-title ss-line-1 ss-m-b-16"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="sm-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-        </view>
-      </view>
-    </view>
+			<view v-if="goodsFields.title?.show || goodsFields.name?.show || goodsFields.price?.show"
+				class="sm-goods-content" :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
+				<view v-if="goodsFields.title?.show || goodsFields.name?.show"
+					class="sm-goods-title ss-line-1 ss-m-b-16">
+					{{ data.title || data.name }}
+				</view>
+				<view v-if="goodsFields.price?.show" class="sm-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+					{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+				</view>
+			</view>
+		</view>
 
-    <!-- md卡片：竖向，一行放两个，图上内容下 -->
-    <view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
-      <image
-        class="md-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="widthFix"
-      ></image>
-      <view
-        class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
-        :id="elId"
-      >
-        <view
-          v-if="goodsFields.title?.show || goodsFields.name?.show"
-          class="md-goods-title ss-line-1"
-          :style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
-        >
-          {{ data.title || data.name }}
-        </view>
-        <view
-          v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-          class="md-goods-subtitle ss-m-t-16 ss-line-1"
-          :style="[{ color: subTitleColor, background: subTitleBackground }]"
-        >
-          {{ data.subtitle || data.introduction }}
-        </view>
-        <slot name="activity">
-          <view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
-            <view
-              class="activity-tag ss-m-r-10 ss-m-t-16"
-              v-for="item in data.promos"
-              :key="item.id"
-            >
-              {{ item.title }}
-            </view>
-          </view>
-        </slot>
-        <view class="ss-flex ss-col-bottom">
-          <view
-            v-if="goodsFields.price?.show"
-            class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
-            :style="[{ color: goodsFields.price.color }]"
-          >
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-          </view>
+		<!-- md卡片：竖向，一行放两个，图上内容下 -->
+		<view v-if="size === 'md'" class="md-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
+			<image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix"></image>
+			<view class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16" :id="elId">
+				<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="md-goods-title ss-line-1"
+					:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]">
+					{{ data.title || data.name }}
+				</view>
+				<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+					class="md-goods-subtitle ss-m-t-16 ss-line-1"
+					:style="[{ color: subTitleColor, background: subTitleBackground }]">
+					{{ data.subtitle || data.introduction }}
+				</view>
+				<slot name="activity">
+					<view v-if="data.promos?.length" class="tag-box ss-flex-wrap ss-flex ss-col-center">
+						<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
+							{{ item.title }}
+						</view>
+					</view>
+				</slot>
+				<!-- 这里是新加的会员价和限时优惠 -->
+				<view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+					<view class="card" v-if="iconShow">{{iconShow}}</view>
+					<view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+				</view>
+				<!-- 这里是新加的会员价和限时优惠结束 -->
+				<view class="ss-flex ss-col-bottom">
+					<view v-if="goodsFields.price?.show" class="md-goods-price ss-m-t-16 font-OPPOSANS ss-m-r-10"
+						:style="[{ color: goodsFields.price.color }]">
+						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+						<text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+						<text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+						<text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
+					</view>
 
-          <view
-            v-if="
+					<view v-if="
               (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
               (data.original_price > 0 || data.marketPrice > 0)
-            "
-            class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
-            :style="[{ color: originPriceColor }]"
-          >
-            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-            <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-          </view>
-        </view>
+            " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
+						<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+						<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+					</view>
+				</view>
 
-        <view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
-          <view class="sales-text">{{ salesAndStock }}</view>
-        </view>
-      </view>
+				<view class="ss-m-t-16 ss-flex ss-col-center ss-flex-wrap">
+					<view class="sales-text">{{ salesAndStock }}</view>
+				</view>
+			</view>
 
-      <slot name="cart">
-        <view class="cart-box ss-flex ss-col-center ss-row-center">
-          <image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
-        </view>
-      </slot>
-    </view>
+			<slot name="cart">
+				<view class="cart-box ss-flex ss-col-center ss-row-center">
+					<image class="cart-icon" src="/static/img/shop/tabbar/category2.png" mode="" />
+				</view>
+			</slot>
+		</view>
 
-    <!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
-    <view
-      v-if="size === 'lg'"
-      class="lg-goods-card ss-flex ss-col-stretch"
-      :style="[elStyles]"
-      @tap="onClick"
-    >
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
-      <view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center"> 秒杀 </view>
-      <view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
-        <view class="tag-icon">拼团</view>
-      </view>
-      <image
-        class="lg-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFill"
-      ></image>
-      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
-        <view>
-          <view
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="lg-goods-title ss-line-2"
-            :style="[{ color: titleColor }]"
-          >
-            {{ data.title || data.name }}
-          </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
-            {{ data.subtitle || data.introduction }}
-          </view>
-        </view>
-        <view>
-          <slot name="activity">
-            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
-              <view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
-                {{ item.title }}
-              </view>
-            </view>
-          </slot>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view
-              v-if="goodsFields.price?.show"
-              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]"
-            >
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </view>
-            <view
-              v-if="
+		<!-- lg卡片：横向型，一行放一个，图片左内容右边  -->
+		<view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
+			<view v-if="seckillTag" class="seckill-tag ss-flex ss-row-center"> 秒杀 </view>
+			<view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
+				<view class="tag-icon">拼团</view>
+			</view>
+			<image class="lg-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
+			<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
+				<view>
+					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="lg-goods-title ss-line-2"
+						:style="[{ color: titleColor }]">
+						{{ data.title || data.name }}
+					</view>
+					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+						class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+						:style="[{ color: subTitleColor, background: subTitleBackground }]">
+						{{ data.subtitle || data.introduction }}
+					</view>
+				</view>
+				<view>
+					<slot name="activity">
+						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center">
+							<view class="activity-tag ss-m-r-10" v-for="item in data.promos" :key="item.id">
+								{{ item.title }}
+							</view>
+						</view>
+					</slot>
+					<view class="ss-flex ss-col-bottom ss-m-t-10">
+						<view v-if="goodsFields.price?.show"
+							class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+							:style="[{ color: goodsFields.price.color }]">
+							<text class="ss-font-24">{{ priceUnit }}</text>
+							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+						</view>
+						<view v-if="
                 (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
                 (data.original_price > 0 || data.marketPrice > 0)
-              "
-              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: originPriceColor }]"
-            >
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-            </view>
-          </view>
-          <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
-            <view class="sales-text">{{ salesAndStock }}</view>
-          </view>
-        </view>
-      </view>
+              " class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS" :style="[{ color: originPriceColor }]">
+							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+							<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+						</view>
+					</view>
+					<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
+						<view class="sales-text">{{ salesAndStock }}</view>
+					</view>
+				</view>
+			</view>
 
-      <slot name="cart">
-        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
-      </slot>
-    </view>
+			<slot name="cart">
+				<view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
+			</slot>
+		</view>
 
-    <!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
-    <view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
-      <view v-if="tagStyle.show" class="tag-icon-box">
-        <image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
-      </view>
+		<!-- sl卡片：竖向型，一行放一个，图片上内容下边 -->
+		<view v-if="size === 'sl'" class="sl-goods-card ss-flex-col" :style="[elStyles]" @tap="onClick">
+			<view v-if="tagStyle.show" class="tag-icon-box">
+				<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src || tagStyle.imgUrl)"></image>
+			</view>
 
-      <image
-        class="sl-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFill"
-      ></image>
+			<image class="sl-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
 
-      <view class="sl-goods-content">
-        <view>
-          <view
-            v-if="goodsFields.title?.show || goodsFields.name?.show"
-            class="sl-goods-title ss-line-1"
-            :style="[{ color: titleColor }]"
-          >
-            {{ data.title || data.name }}
-          </view>
-          <view
-            v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="sl-goods-subtitle ss-m-t-16"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]"
-          >
-            {{ data.subtitle || data.introduction }}
-          </view>
-        </view>
-        <view>
-          <slot name="activity">
-            <view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
-              <view
-                class="activity-tag ss-m-r-10 ss-m-t-16"
-                v-for="item in data.promos"
-                :key="item.id"
-              >
-                {{ item.title }}
-              </view>
-            </view>
-          </slot>
-          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
-            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
-              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </view>
-            <view
-              v-if="
+			<view class="sl-goods-content">
+				<view>
+					<view v-if="goodsFields.title?.show || goodsFields.name?.show" class="sl-goods-title ss-line-1"
+						:style="[{ color: titleColor }]">
+						{{ data.title || data.name }}
+					</view>
+					<view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+						class="sl-goods-subtitle ss-m-t-16"
+						:style="[{ color: subTitleColor, background: subTitleBackground }]">
+						{{ data.subtitle || data.introduction }}
+					</view>
+				</view>
+				<view>
+					<slot name="activity">
+						<view v-if="data.promos?.length" class="tag-box ss-flex ss-col-center ss-flex-wrap">
+							<view class="activity-tag ss-m-r-10 ss-m-t-16" v-for="item in data.promos" :key="item.id">
+								{{ item.title }}
+							</view>
+						</view>
+					</slot>
+					<!-- 这里是新加的会员价和限时优惠 -->
+					<view class="iconBox" v-if="data.discountPrice || data.vipPrice || data.reward">
+						<view class="card" v-if="iconShow">{{iconShow}}</view>
+						<view class="card2" v-if="data.reward">{{data.reward.rewardActivity}}</view>
+					</view>
+					<!-- 这里是新加的会员价和限时优惠结束 -->
+					<view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+						<view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
+							<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+							<text v-if="iconShow=='限时优惠'">{{fen2yuan(data.discountPrice)}}</text>
+							<text v-else-if="iconShow=='会员价'">{{fen2yuan(data.vipPrice)}}</text>
+							<text v-else>{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}</text>
+						</view>
+						<view v-if="
                 (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
                 (data.original_price > 0 || data.marketPrice > 0)
-              "
-              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
-              :style="[{ color: originPriceColor }]"
-            >
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-            </view>
-          </view>
-          <view class="ss-m-t-16 ss-flex ss-flex-wrap">
-            <view class="sales-text">{{ salesAndStock }}</view>
-          </view>
-        </view>
-      </view>
+              " class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex" :style="[{ color: originPriceColor }]">
+							<text class="price-unit ss-font-20">{{ priceUnit }}</text>
+							<view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+						</view>
+					</view>
+					<view class="ss-m-t-16 ss-flex ss-flex-wrap">
+						<view class="sales-text">{{ salesAndStock }}</view>
+					</view>
+				</view>
+			</view>
 
-      <slot name="cart"
-        ><view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view></slot
-      >
-    </view>
-  </view>
+			<slot name="cart">
+				<view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+			</slot>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 商品卡片
-   *
-   * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
-   * @property {String} tag 											- md及以上才有
-   * @property {String} img 											- 图片
-   * @property {String} background 									- 背景色
-   * @property {String} topRadius 									- 上圆角
-   * @property {String} bottomRadius 									- 下圆角
-   * @property {String} title 										- 标题
-   * @property {String} titleColor 									- 标题颜色
-   * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
-   * @property {String} subTitle 										- 副标题
-   * @property {String} subTitleColor									- 副标题颜色
-   * @property {String} subTitleBackground 							- 副标题背景
-   * @property {String | Number} price 								- 价格
-   * @property {String} priceColor 									- 价格颜色
-   * @property {String | Number} originPrice 							- 原价/划线价
-   * @property {String} originPriceColor 								- 原价颜色
-   * @property {String | Number} sales 								- 销售数量
-   * @property {String} salesColor									- 销售数量颜色
-   *
-   * @slots activity												 	- 活动插槽
-   * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
-   *
-   * @event {Function()} click 										- 点击卡片
-   *
-   */
-  import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
-  import sheep from '@/sheep';
-  import { fen2yuan, formatSales } from '@/sheep/hooks/useGoods';
-  import { formatStock } from '@/sheep/hooks/useGoods';
-  import goodsCollectVue from '@/pages/user/goods-collect.vue';
-  import { isArray } from 'lodash-es';
+	/**
+	 * 商品卡片
+	 *
+	 * @property {Array} size = [xs | sm | md | lg | sl ] 			 	- 列表数据
+	 * @property {String} tag 											- md及以上才有
+	 * @property {String} img 											- 图片
+	 * @property {String} background 									- 背景色
+	 * @property {String} topRadius 									- 上圆角
+	 * @property {String} bottomRadius 									- 下圆角
+	 * @property {String} title 										- 标题
+	 * @property {String} titleColor 									- 标题颜色
+	 * @property {Number} titleWidth = 0								- 标题宽度，默认0，单位rpx
+	 * @property {String} subTitle 										- 副标题
+	 * @property {String} subTitleColor									- 副标题颜色
+	 * @property {String} subTitleBackground 							- 副标题背景
+	 * @property {String | Number} price 								- 价格
+	 * @property {String} priceColor 									- 价格颜色
+	 * @property {String | Number} originPrice 							- 原价/划线价
+	 * @property {String} originPriceColor 								- 原价颜色
+	 * @property {String | Number} sales 								- 销售数量
+	 * @property {String} salesColor									- 销售数量颜色
+	 *
+	 * @slots activity												 	- 活动插槽
+	 * @slots cart														- 购物车插槽，默认包含文字，背景色，文字颜色 || 图片 || 行为
+	 *
+	 * @event {Function()} click 										- 点击卡片
+	 *
+	 */
+	import {
+		computed,
+		reactive,
+		getCurrentInstance,
+		onMounted,
+		nextTick,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		fen2yuan,
+		formatSales
+	} from '@/sheep/hooks/useGoods';
+	import {
+		formatStock
+	} from '@/sheep/hooks/useGoods';
+	import goodsCollectVue from '@/pages/user/goods-collect.vue';
+	import {
+		isArray
+	} from 'lodash-es';
+	// 数据
+	const state = reactive({});
 
-  // 数据
-  const state = reactive({});
+	// 接收参数
+	const props = defineProps({
+		goodsFields: {
+			type: [Array, Object],
+			default () {
+				return {
+					// 商品价格
+					price: {
+						show: true
+					},
+					// 库存
+					stock: {
+						show: true
+					},
+					// 商品名称
+					name: {
+						show: true
+					},
+					// 商品介绍
+					introduction: {
+						show: true
+					},
+					// 市场价
+					marketPrice: {
+						show: true
+					},
+					// 销量
+					salesCount: {
+						show: true
+					},
+				};
+			},
+		},
+		tagStyle: {
+			type: Object,
+			default: {},
+		},
+		data: {
+			type: Object,
+			default: {},
+		},
+		size: {
+			type: String,
+			default: 'sl',
+		},
+		background: {
+			type: String,
+			default: '',
+		},
+		topRadius: {
+			type: Number,
+			default: 0,
+		},
+		bottomRadius: {
+			type: Number,
+			default: 0,
+		},
+		titleWidth: {
+			type: Number,
+			default: 0,
+		},
+		titleColor: {
+			type: String,
+			default: '#333',
+		},
+		priceColor: {
+			type: String,
+			default: '',
+		},
+		originPriceColor: {
+			type: String,
+			default: '#C4C4C4',
+		},
+		priceUnit: {
+			type: String,
+			default: '￥',
+		},
+		subTitleColor: {
+			type: String,
+			default: '#999999',
+		},
+		subTitleBackground: {
+			type: String,
+			default: '',
+		},
+		buttonShow: {
+			type: Boolean,
+			default: true,
+		},
+		seckillTag: {
+			type: Boolean,
+			default: false,
+		},
+		grouponTag: {
+			type: Boolean,
+			default: false,
+		},
+	});
+	//判断限时优惠和会员价标签内容暂时导致页面出错，又舍不得丢，等着把新的数据整合到商品信息中，也用起来
+	const iconShow = handle()
 
-  // 接收参数
-  const props = defineProps({
-    goodsFields: {
-      type: [Array, Object],
-      default() {
-        return {
-          // 商品价格
-          price: { show: true },
-          // 库存
-          stock: { show: true },
-          // 商品名称
-          name: { show: true },
-          // 商品介绍
-          introduction: { show: true },
-          // 市场价
-          marketPrice: { show: true },
-          // 销量
-          salesCount: { show: true },
-        };
-      },
-    },
-    tagStyle: {
-      type: Object,
-      default: {},
-    },
-    data: {
-      type: Object,
-      default: {},
-    },
-    size: {
-      type: String,
-      default: 'sl',
-    },
-    background: {
-      type: String,
-      default: '',
-    },
-    topRadius: {
-      type: Number,
-      default: 0,
-    },
-    bottomRadius: {
-      type: Number,
-      default: 0,
-    },
-    titleWidth: {
-      type: Number,
-      default: 0,
-    },
-    titleColor: {
-      type: String,
-      default: '#333',
-    },
-    priceColor: {
-      type: String,
-      default: '',
-    },
-    originPriceColor: {
-      type: String,
-      default: '#C4C4C4',
-    },
-    priceUnit: {
-      type: String,
-      default: '￥',
-    },
-    subTitleColor: {
-      type: String,
-      default: '#999999',
-    },
-    subTitleBackground: {
-      type: String,
-      default: '',
-    },
-    buttonShow: {
-      type: Boolean,
-      default: true,
-    },
-    seckillTag: {
-      type: Boolean,
-      default: false,
-    },
-    grouponTag: {
-      type: Boolean,
-      default: false,
-    },
-  });
+	function handle() {
+		console.log('传来的数据',props.data)
+		if (props.data.discountPrice === null && props.data.vipPrice === null) {
+			// 如果两个值都为 null，则不展示任何内容
+			return '';
+		} else if (props.data.discountPrice === null) {
+			// 如果 discountPrice 为 null，展示 vipPrice
+			return '会员价';
+		} else if (props.data.vipPrice === null) {
+			// 如果 vipPrice 为 null，展示 discountPrice
+			return '限时优惠';
+		} else if (props.data.discountPrice < props.data.vipPrice) {
+			return '限时优惠';
+		} else if (props.data.discountPrice > props.data.vipPrice) {
+			return '会员价';
+		}
+	}
+	// 组件样式
+	const elStyles = computed(() => {
+		return {
+			background: props.background,
+			'border-top-left-radius': props.topRadius + 'px',
+			'border-top-right-radius': props.topRadius + 'px',
+			'border-bottom-left-radius': props.bottomRadius + 'px',
+			'border-bottom-right-radius': props.bottomRadius + 'px',
+		};
+	});
 
-  // 组件样式
-  const elStyles = computed(() => {
-    return {
-      background: props.background,
-      'border-top-left-radius': props.topRadius + 'px',
-      'border-top-right-radius': props.topRadius + 'px',
-      'border-bottom-left-radius': props.bottomRadius + 'px',
-      'border-bottom-right-radius': props.bottomRadius + 'px',
-    };
-  });
+	// 格式化销量、库存信息
+	const salesAndStock = computed(() => {
+		let text = [];
+		if (props.goodsFields.salesCount?.show) {
+			text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+		}
+		if (props.goodsFields.stock?.show) {
+			text.push(formatStock(props.data.stock_show_type, props.data.stock));
+		}
+		return text.join(' | ');
+	});
 
-  // 格式化销量、库存信息
-  const salesAndStock = computed(() => {
-    let text = [];
-    if (props.goodsFields.salesCount?.show) {
-      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
-    }
-    if (props.goodsFields.stock?.show) {
-      text.push(formatStock(props.data.stock_show_type, props.data.stock));
-    }
-    return text.join(' | ');
-  });
+	// 返回事件
+	const emits = defineEmits(['click', 'getHeight']);
 
-  // 返回事件
-  const emits = defineEmits(['click', 'getHeight']);
+	const onClick = () => {
+		emits('click');
+	};
 
-  const onClick = () => {
-    emits('click');
-  };
+	// 获取卡片实时高度
+	const {
+		proxy
+	} = getCurrentInstance();
+	const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
 
-  // 获取卡片实时高度
-  const { proxy } = getCurrentInstance();
-  const elId = `sheep_${Math.ceil(Math.random() * 10e5).toString(36)}`;
-  function getGoodsPriceCardWH() {
-    if (props.size === 'md') {
-      const view = uni.createSelectorQuery().in(proxy);
-      view.select(`#${elId}`).fields({ size: true, scrollOffset: true });
-      view.exec((data) => {
-        let totalHeight = 0;
-        const goodsPriceCard = data[0];
-        if (props.data.image_wh) {
-          totalHeight =
-            (goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
-            goodsPriceCard.height;
-        } else {
-          totalHeight = goodsPriceCard.width;
-        }
-        emits('getHeight', totalHeight);
-      });
-    }
-  }
-  onMounted(() => {
-    nextTick(() => {
-      getGoodsPriceCardWH();
-    });
-  });
+	function getGoodsPriceCardWH() {
+		if (props.size === 'md') {
+			const view = uni.createSelectorQuery().in(proxy);
+			view.select(`#${elId}`).fields({
+				size: true,
+				scrollOffset: true
+			});
+			view.exec((data) => {
+				let totalHeight = 0;
+				const goodsPriceCard = data[0];
+				if (props.data.image_wh) {
+					totalHeight =
+						(goodsPriceCard.width / props.data.image_wh.w) * props.data.image_wh.h +
+						goodsPriceCard.height;
+				} else {
+					totalHeight = goodsPriceCard.width;
+				}
+				emits('getHeight', totalHeight);
+			});
+		}
+	}
+	onMounted(() => {
+		nextTick(() => {
+			getGoodsPriceCardWH();
+		});
+	});
 </script>
 
 <style lang="scss" scoped>
-  .tag-icon-box {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    .tag-icon {
-      width: 72rpx;
-      height: 44rpx;
-    }
-  }
-  .seckill-tag {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    width: 68rpx;
-    height: 38rpx;
-    background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
-    border-radius: 10rpx 0px 10rpx 0px;
-    font-size: 24rpx;
-    font-weight: 500;
-    color: #ffffff;
-    line-height: 32rpx;
-  }
-  .groupon-tag {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
-    width: 68rpx;
-    height: 38rpx;
-    background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
-    border-radius: 10rpx 0px 10rpx 0px;
-    font-size: 24rpx;
-    font-weight: 500;
-    color: #ffffff;
-    line-height: 32rpx;
-  }
-  .goods-img {
-    width: 100%;
-    height: 100%;
-    background-color: #f5f5f5;
-  }
-  .price-unit {
-    margin-right: -4px;
-  }
-  .sales-text {
-    display: table;
-    font-size: 24rpx;
-    transform: scale(0.8);
-    margin-left: 0rpx;
-    color: #c4c4c4;
-  }
+	.tag-icon-box {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
 
-  .activity-tag {
-    font-size: 20rpx;
-    color: #ff0000;
-    line-height: 30rpx;
-    padding: 0 10rpx;
-    border: 1px solid rgba(#ff0000, 0.25);
-    border-radius: 4px;
-    flex-shrink: 0;
-  }
+		.tag-icon {
+			width: 72rpx;
+			height: 44rpx;
+		}
+	}
 
-  .goods-origin-price {
-    font-size: 20rpx;
-    color: #c4c4c4;
-    line-height: 36rpx;
-    text-decoration: line-through;
-  }
+	.seckill-tag {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		width: 68rpx;
+		height: 38rpx;
+		background: linear-gradient(90deg, #ff5854 0%, #ff2621 100%);
+		border-radius: 10rpx 0px 10rpx 0px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 32rpx;
+	}
 
-  // xs
-  .xs-goods-card {
-    overflow: hidden;
-    // max-width: 375rpx;
-    background-color: $white;
-    position: relative;
+	.groupon-tag {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
+		width: 68rpx;
+		height: 38rpx;
+		background: linear-gradient(90deg, #fe832a 0%, #ff6600 100%);
+		border-radius: 10rpx 0px 10rpx 0px;
+		font-size: 24rpx;
+		font-weight: 500;
+		color: #ffffff;
+		line-height: 32rpx;
+	}
 
-    .xs-img-box {
-      width: 128rpx;
-      height: 128rpx;
-      margin-right: 20rpx;
-    }
+	.goods-img {
+		width: 100%;
+		height: 100%;
+		background-color: #f5f5f5;
+	}
 
-    .xs-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
+	.price-unit {
+		margin-right: -4px;
+	}
 
-    .xs-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+	.sales-text {
+		display: table;
+		font-size: 24rpx;
+		transform: scale(0.8);
+		margin-left: 0rpx;
+		color: #c4c4c4;
+	}
 
-  // sm
-  .sm-goods-card {
-    overflow: hidden;
-    // width: 223rpx;
-    // width: 100%;
-    background-color: $white;
-    position: relative;
+	.activity-tag {
+		font-size: 20rpx;
+		color: #ff0000;
+		line-height: 30rpx;
+		padding: 0 10rpx;
+		border: 1px solid rgba(#ff0000, 0.25);
+		border-radius: 4px;
+		flex-shrink: 0;
+	}
 
-    .sm-img-box {
-      // width: 228rpx;
-      width: 100%;
-      height: 208rpx;
-    }
-    .sm-goods-content {
-      padding: 20rpx 16rpx;
-      box-sizing: border-box;
-    }
-    .sm-goods-title {
-      font-size: 26rpx;
-      color: #333;
-    }
+	.goods-origin-price {
+		font-size: 20rpx;
+		color: #c4c4c4;
+		line-height: 36rpx;
+		text-decoration: line-through;
+	}
 
-    .sm-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+	// xs
+	.xs-goods-card {
+		overflow: hidden;
+		// max-width: 375rpx;
+		background-color: $white;
+		position: relative;
 
-  // md
-  .md-goods-card {
-    overflow: hidden;
-    width: 100%;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    position: relative;
+		.xs-img-box {
+			width: 128rpx;
+			height: 128rpx;
+			margin-right: 20rpx;
+		}
 
-    .md-img-box {
-      width: 100%;
-    }
+		.xs-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
 
-    .md-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      width: 100%;
-    }
-    .md-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
+		.xs-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-    .md-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+	// sm
+	.sm-goods-card {
+		overflow: hidden;
+		// width: 223rpx;
+		// width: 100%;
+		background-color: $white;
+		position: relative;
 
-    .cart-box {
-      width: 54rpx;
-      height: 54rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 50%;
-      position: absolute;
-      bottom: 50rpx;
-      right: 20rpx;
-      z-index: 2;
+		.sm-img-box {
+			// width: 228rpx;
+			width: 100%;
+			height: 208rpx;
+		}
 
-      .cart-icon {
-        width: 30rpx;
-        height: 30rpx;
-      }
-    }
-  }
+		.sm-goods-content {
+			padding: 20rpx 16rpx;
+			box-sizing: border-box;
+		}
 
-  // lg
-  .lg-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    height: 280rpx;
+		.sm-goods-title {
+			font-size: 26rpx;
+			color: #333;
+		}
 
-    .lg-img-box {
-      width: 280rpx;
-      height: 280rpx;
-      margin-right: 20rpx;
-    }
+		.sm-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-    .lg-goods-title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #333333;
-      // line-height: 36rpx;
-      // width: 410rpx;
-    }
-    .lg-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      // line-height: 30rpx;
-      // width: 410rpx;
-    }
+	// md
+	.md-goods-card {
+		overflow: hidden;
+		width: 100%;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		position: relative;
 
-    .lg-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.md-img-box {
+			width: 100%;
+		}
 
-    .buy-box {
-      position: absolute;
-      bottom: 20rpx;
-      right: 20rpx;
-      z-index: 2;
-      width: 120rpx;
-      height: 50rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #ffffff;
-    }
-    .tag-box {
-      width: 100%;
-    }
-  }
+		.md-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			width: 100%;
+		}
 
-  // sl
+		.md-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+		}
 
-  .sl-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    width: 100%;
-    background-color: $white;
-    .sl-goods-content {
-      padding: 20rpx 20rpx;
-      box-sizing: border-box;
-    }
-    .sl-img-box {
-      width: 100%;
-      height: 360rpx;
-    }
+		.md-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .sl-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
-    .sl-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      line-height: 30rpx;
-    }
+		.cart-box {
+			width: 54rpx;
+			height: 54rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 50%;
+			position: absolute;
+			bottom: 50rpx;
+			right: 20rpx;
+			z-index: 2;
 
-    .sl-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+			.cart-icon {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
 
-    .buy-box {
-      position: absolute;
-      bottom: 20rpx;
-      right: 20rpx;
-      z-index: 2;
-      width: 148rpx;
-      height: 50rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #ffffff;
-    }
-  }
-</style>
+	// lg
+	.lg-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		height: 280rpx;
+
+		.lg-img-box {
+			width: 280rpx;
+			height: 280rpx;
+			margin-right: 20rpx;
+		}
+
+		.lg-goods-title {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+			// line-height: 36rpx;
+			// width: 410rpx;
+		}
+
+		.lg-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			// line-height: 30rpx;
+			// width: 410rpx;
+		}
+
+		.lg-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
+
+		.buy-box {
+			position: absolute;
+			bottom: 20rpx;
+			right: 20rpx;
+			z-index: 2;
+			width: 120rpx;
+			height: 50rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #ffffff;
+		}
+
+		.tag-box {
+			width: 100%;
+		}
+	}
+
+	// sl
+
+	.sl-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		width: 100%;
+		background-color: $white;
+
+		.sl-goods-content {
+			padding: 20rpx 20rpx;
+			box-sizing: border-box;
+		}
+
+		.sl-img-box {
+			width: 100%;
+			height: 360rpx;
+		}
+
+		.sl-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
+
+		.sl-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			line-height: 30rpx;
+		}
+
+		.sl-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
+
+		.buy-box {
+			position: absolute;
+			bottom: 20rpx;
+			right: 20rpx;
+			z-index: 2;
+			width: 148rpx;
+			height: 50rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #ffffff;
+		}
+	}
+
+	.card {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: red;
+		color: #ffffff;
+		font-size: 24rpx;
+	}
+
+	.card2 {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: rgb(255, 242, 241);
+		color: #ff2621;
+		font-size: 24rpx;
+		margin-left: 5rpx;
+	}
+
+	.iconBox {
+		width: 100%;
+		height: fit-content;
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: flex-start;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index b339d4a1..4a48e0dc 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -82,7 +82,7 @@
 	});
 
 	const propertyList = convertProductPropertyList(props.goodsInfo.skus);
-
+	console.log('传递来的sku信息',props.goodsInfo.skus)
 	// SKU 列表
 	const skuList = computed(() => {
 		let skuPrices = props.goodsInfo.skus;
diff --git a/static/images/dis.png b/static/images/dis.png
new file mode 100644
index 0000000000000000000000000000000000000000..5deb35c29e961f5c05642b875ec2368a85f67fe5
GIT binary patch
literal 16936
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

literal 0
HcmV?d00001