From 53450274811721d60c019dacf60466db8b2df6ff Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Fri, 11 Oct 2024 18:12:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/groupon/list.vue               | 444 ++++++++----------
 pages/index/user.vue                          |  56 +--
 .../components/s-block-item/s-block-item.vue  |  42 +-
 sheep/components/s-user-card/s-user-card.vue  |   2 +-
 sheep/ui/su-navbar/su-navbar.vue              |   2 +-
 5 files changed, 252 insertions(+), 294 deletions(-)

diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index d84fba9..4cbfe77 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -1,255 +1,227 @@
 <!-- 拼团活动列表 -->
 <template>
-	<s-layout title="拼团列表" navbar="normal" :bgStyle="{ color: '#FE832A',backgroundColor: 'rgba(233,51,35)' }">
-		<!-- <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" /> -->
-		<view class="list-content">
-			<!-- 参团会员统计 -->
-			<view class="content-header ss-flex-col ss-col-center ss-row-center">
-				<view class="content-header-title ss-flex ss-row-center">
-					<view v-for="(item, index) in state.summaryData.avatars" :key="index" class="picture"
-						:style="index === 6 ? 'position: relative' : 'position: static'">
-						<span class="avatar" :style="`background-image: url(${item})`" />
-						<span v-if="index === 6 && state.summaryData.avatars.length > 3" class="mengceng">
-							<i>···</i>
-						</span>
-					</view>
-					<text class="pic_count">{{ state.summaryData.userCount || 0 }}人参与</text>
-				</view>
-			</view>
-			<scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
-				:scroll-with-animation="false" :enable-back-to-top="true">
-				<view class="goods-box ss-m-b-20" v-for="item in state.pagination.list" :key="item.id">
-					<s-goods-column class="" size="lg" :data="item" :grouponTag="true"
-						@click="sheep.$router.go('/pages/goods/groupon', { id: item.id })">
-						<template v-slot:cart>
-							<button class="ss-reset-button cart-btn">去拼团</button>
-						</template>
-					</s-goods-column>
-				</view>
-				<uni-load-more color="white" v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+  <s-layout navbar="inner" :bgStyle="{ color: '#FE832A' }">
+    <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" />
+    <view class="list-content">
+      <!-- 参团会员统计 -->
+      <view class="content-header ss-flex-col ss-col-center ss-row-center">
+        <view class="content-header-title ss-flex ss-row-center">
+          <view
+            v-for="(item, index) in state.summaryData.avatars"
+            :key="index"
+            class="picture"
+            :style="index === 6 ? 'position: relative' : 'position: static'"
+          >
+            <span class="avatar" :style="`background-image: url(${item})`" />
+            <span v-if="index === 6 && state.summaryData.avatars.length > 3" class="mengceng">
+              <i>···</i>
+            </span>
+          </view>
+          <text class="pic_count">{{ state.summaryData.userCount || 0 }}人参与</text>
+        </view>
+      </view>
+      <scroll-view
+        class="scroll-box"
+        :style="{ height: pageHeight + 'rpx' }"
+        scroll-y="true"
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
+        <view class="goods-box ss-m-b-20" v-for="item in state.pagination.list" :key="item.id">
+          <s-goods-column
+            class=""
+            size="lg"
+            :data="item"
+            :grouponTag="true"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.id })"
+          >
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn">去拼团</button>
+            </template>
+          </s-goods-column>
+        </view>
+        <uni-load-more
+          v-if="state.pagination.total > 0"
+          :status="state.loadStatus"
+          :content-text="{
             contentdown: '上拉加载更多',
-          }" @tap="loadMore" />
-			</scroll-view>
-		</view>
-	</s-layout>
+          }"
+          @tap="loadMore"
+        />
+      </scroll-view>
+    </view>
+  </s-layout>
 </template>
 <script setup>
-	import {
-		reactive
-	} from 'vue';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
-	import sheep from '@/sheep';
-	import CombinationApi from '@/sheep/api/promotion/combination';
+  import { reactive } from 'vue';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import sheep from '@/sheep';
+  import CombinationApi from '@/sheep/api/promotion/combination';
 
-	const {
-		safeAreaInsets,
-		safeArea
-	} = sheep.$platform.device;
-	const sysNavBar = sheep.$platform.navbar;
-	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-	const pageHeight =
-		(safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sysNavBar - 350;
-	const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-header.png');
+  const { safeAreaInsets, safeArea } = sheep.$platform.device;
+  const sysNavBar = sheep.$platform.navbar;
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const pageHeight =
+    (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sysNavBar - 350;
+  const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-header.png');
 
-	const state = reactive({
-		pagination: {
-			list: [],
-			total: 0,
-			pageNo: 1,
-			pageSize: 10,
-		},
-		loadStatus: '',
-		summaryData: {},
-	});
+  const state = reactive({
+    pagination: {
+      list: [],
+      total: 0,
+      pageNo: 1,
+      pageSize: 10,
+    },
+    loadStatus: '',
+    summaryData: {},
+  });
 
-	// 加载统计数据
-	const getSummary = async () => {
-		const {
-			data
-		} = await CombinationApi.getCombinationRecordSummary();
-		state.summaryData = data;
-	};
+  // 加载统计数据
+  const getSummary = async () => {
+    const { data } = await CombinationApi.getCombinationRecordSummary();
+    state.summaryData = data;
+  };
 
-	// 加载活动列表
-	async function getList() {
-		state.loadStatus = 'loading';
-		const {
-			data
-		} = await CombinationApi.getCombinationActivityPage({
-			pageNo: state.pagination.pageNo,
-			pageSize: state.pagination.pageSize,
-		});
-		data.list.forEach((activity) => {
-			state.pagination.list.push({
-				...activity,
-				price: activity.combinationPrice
-			});
-		});
-		state.pagination.total = data.total;
-		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-	}
+  // 加载活动列表
+  async function getList() {
+    state.loadStatus = 'loading';
+    const { data } = await CombinationApi.getCombinationActivityPage({
+      pageNo: state.pagination.pageNo,
+      pageSize: state.pagination.pageSize,
+    });
+    data.list.forEach((activity) => {
+      state.pagination.list.push({ ...activity, price: activity.combinationPrice });
+    });
+    state.pagination.total = data.total;
+    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+  }
 
-	// 加载更多
-	function loadMore() {
-		if (state.loadStatus === 'noMore') {
-			return;
-		}
-		state.pagination.pageNo++;
-		getList();
-	}
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus === 'noMore') {
+      return;
+    }
+    state.pagination.pageNo++;
+    getList();
+  }
 
-	// 上拉加载更多
-	onReachBottom(() => loadMore());
+  // 上拉加载更多
+  onReachBottom(() => loadMore());
 
-	// 页面初始化
-	onLoad(() => {
-		getSummary();
-		getList();
-	});
+  // 页面初始化
+  onLoad(() => {
+    getSummary();
+    getList();
+  });
 </script>
 <style lang="scss" scoped>
-	.page-bg {
-		width: 100%;
-		height: 458rpx;
-		margin-top: -88rpx;
-		background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png');
-		background-size: 100% 100%;
-	}
+  .page-bg {
+    width: 100%;
+    height: 458rpx;
+    margin-top: -88rpx;
+    background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png');
+    background-size: 100% 100%;
+  }
+  .list-content {
+    position: relative;
+    z-index: 3;
+    margin: -190rpx 20rpx 0 20rpx;
+    // background: #fff;
+    border-radius: 20rpx 20rpx 0 0;
+    .content-header {
+      width: 100%;
+      border-radius: 20rpx 20rpx 0 0;
+      height: 100rpx;
+      background: linear-gradient(180deg, #fff4f7, #ffe4d1);
+      .content-header-title {
+        width: 100%;
+        font-size: 30rpx;
+        font-weight: 500;
+        color: #ff2923;
+        line-height: 30rpx;
+        position: relative;
+        .more {
+          position: absolute;
+          right: 30rpx;
+          top: 0;
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #999999;
+          line-height: 30rpx;
+        }
 
-	.list-content {
-		position: relative;
-		z-index: 3;
-		margin: 0 20rpx 0 20rpx;
-		// background: #fff;
-		border-radius: 20rpx 20rpx 0 0;
+        .picture {
+          display: inline-table;
+        }
 
-		.content-header {
-			width: 100%;
-			border-radius: 20rpx 20rpx 0 0;
-			height: 50rpx;
-			margin: 10px 0;
-			position: relative;
+        .avatar {
+          width: 38rpx;
+          height: 38rpx;
+          display: inline-table;
+          vertical-align: middle;
+          -webkit-user-select: none;
+          -moz-user-select: none;
+          -ms-user-select: none;
+          user-select: none;
+          border-radius: 50%;
+          background-repeat: no-repeat;
+          background-size: cover;
+          background-position: 0 0;
+          margin-right: -10rpx;
+          box-shadow: 0 0 0 1px #fe832a;
+        }
 
-			// background: linear-gradient(180deg, #fff4f7, #ffe4d1);
-			&::after {
-				content: '';
-				position: absolute;
-				right: 15%;
-				height: 1px;
-				width: 50px;
-				background: white;
-				top: 50%;
-				transform: translateY(-50%);
-			}
+        .pic_count {
+          margin-left: 30rpx;
+          font-size: 22rpx;
+          font-weight: 500;
+          width: auto;
+          height: auto;
+          background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+          color: #ffffff;
+          border-radius: 19rpx;
+          padding: 4rpx 14rpx;
+        }
 
-			&::before {
-				content: '';
-				position: absolute;
-				left: 15%;
-				height: 1px;
-				width: 50px;
-				background: white;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-
-			.content-header-title {
-				width: 100%;
-				font-size: 30rpx;
-				font-weight: 500;
-				color: #ff2923;
-				line-height: 30rpx;
-				position: relative;
-
-				.more {
-					position: absolute;
-					right: 30rpx;
-					top: 0;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #999999;
-					line-height: 30rpx;
-				}
-
-				.picture {
-					display: inline-table;
-				}
-
-				.avatar {
-					width: 38rpx;
-					height: 38rpx;
-					display: inline-table;
-					vertical-align: middle;
-					-webkit-user-select: none;
-					-moz-user-select: none;
-					-ms-user-select: none;
-					user-select: none;
-					border-radius: 50%;
-					background-repeat: no-repeat;
-					background-size: cover;
-					background-position: 0 0;
-					margin-right: -10rpx;
-					box-shadow: 0 0 0 1px #fe832a;
-				}
-
-				.pic_count {
-					margin-left: 30rpx;
-					font-size: 22rpx;
-					font-weight: 500;
-					width: auto;
-					height: auto;
-					background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
-					color: #ffffff;
-					border-radius: 19rpx;
-					padding: 4rpx 14rpx;
-				}
-
-				.mengceng {
-					width: 40rpx;
-					height: 40rpx;
-					line-height: 36rpx;
-					background: rgba(51, 51, 51, 0.6);
-					text-align: center;
-					border-radius: 50%;
-					opacity: 1;
-					position: absolute;
-					left: -2rpx;
-					color: #fff;
-					top: 2rpx;
-
-					i {
-						font-style: normal;
-						font-size: 20rpx;
-					}
-				}
-			}
-		}
-
-		.scroll-box {
-			// margin-top: 13px;
-			height: 900rpx;
-
-			.goods-box {
-				position: relative;
-				padding: 0 10px;
-
-				.cart-btn {
-					position: absolute;
-					bottom: 10rpx;
-					right: 20rpx;
-					z-index: 11;
-					height: 50rpx;
-					line-height: 50rpx;
-					padding: 0 20rpx;
-					border-radius: 25rpx;
-					font-size: 24rpx;
-					color: #fff;
-					background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
-				}
-			}
-		}
-	}
+        .mengceng {
+          width: 40rpx;
+          height: 40rpx;
+          line-height: 36rpx;
+          background: rgba(51, 51, 51, 0.6);
+          text-align: center;
+          border-radius: 50%;
+          opacity: 1;
+          position: absolute;
+          left: -2rpx;
+          color: #fff;
+          top: 2rpx;
+          i {
+            font-style: normal;
+            font-size: 20rpx;
+          }
+        }
+      }
+    }
+    .scroll-box {
+	  margin-top: 13px;
+      height: 900rpx;
+      .goods-box {
+        position: relative;
+		    padding: 0 10px;
+        .cart-btn {
+          position: absolute;
+          bottom: 10rpx;
+          right: 20rpx;
+          z-index: 11;
+          height: 50rpx;
+          line-height: 50rpx;
+          padding: 0 20rpx;
+          border-radius: 25rpx;
+          font-size: 24rpx;
+          color: #fff;
+          background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+        }
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 98b0bf4..1cabb8d 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -2,21 +2,11 @@
 <template>
 	<s-layout title="个人中心" tabbar="/pages/index/user" navbar="normal" :bgStyle="template.page"
 		:navbarStyle="template.navigationBar" onShareAppMessage>
-
-
 		
-
+		<image class="seckill" src="@/static/images/seckilbg.png"></image>
 		<s-block class="" v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
-			<s-block-item style="" :class="item.id == 'UserOrder'? 'ss': ''" :type="item.id" :data="item.property" :styles="item.property.style" />
+			<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 		</s-block>
-		<view class="new-huiy" @click="
-			  sheep.$router.go('/pages/user/user_vip/index')
-			">
-			<image class="seckill" src="@/static/images/seckilbg.png"></image>
-			<view class="new-button">立即开通</view>
-			<img class="seckill1" mode="aspectFit"
-				src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" />
-		</view>
 	</s-layout>
 </template>
 
@@ -51,40 +41,13 @@
 	onPageScroll(() => {});
 </script>
 
-<style lang="scss" scoped>
-	.new-huiy {
-		width: 100%;
-		height: 240px;
-		position: absolute;
-		top: 0;
-		.new-button {
-			background: white;
-			padding: 8px;
-			text-align: center;
-			position: absolute;
-			border-radius: 20px;
-			right: 29px;
-			bottom: 17px;
-			font-size: 14px;
-			color: rgba(148, 109, 45, 1);
-			// z-index: 33;
-		}
-
-		.seckill1 {
-			position: absolute;
-			bottom: 0;
-			// z-index: 22;
-			/* left: 50%; */
-			/* transform: translateX(-50%); */
-			width: 96%;
-			height: 72px;
-		}
+<style>
+	.new-main{
+		
 	}
-
-	/* .new-main {} */
-
 	.seckill1 {
 		position: absolute;
+		top: 117px;
 		z-index: 22;
 		left: 50%;
 		transform: translateX(-50%);
@@ -99,11 +62,4 @@
 	view {
 		position: relative;
 	}
-	::v-deep .ss{
-		z-index: 99999;
-		&>view{
-			margin-top: 94px;
-		}
-	}
-	
 </style>
\ No newline at end of file
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 8dc2545..7ce3287 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		
-		<!-- 基础组件：搜索框 -->
+			<!-- 基础组件：搜索框 -->
 		<s-search-block v-if="type === 'SearchBar'" :data="data" :styles="styles" :navbar="false" />
 		<!-- 基础组件：公告栏 -->
 		<s-notice-block v-if="type === 'NoticeBar'" :data="data" />
@@ -40,9 +40,7 @@
 		<s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
 		<!-- 营销组件：秒杀 -->
 		<s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
-		<!-- 营销组件：积分商城 -->
-		<s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
-		<!-- 营销组件：	小程序直播（暂时没有这个功能） -->
+		<!-- 营销组件：小程序直播（暂时没有这个功能） -->
 		<s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
 		<!-- 营销组件：优惠券 -->
 		<s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
@@ -68,7 +66,16 @@
 
 		<!-- 用户组件：用户卡片 -->
 		<s-user-card v-if="type === 'UserCard'" />
-		
+		<view v-if="type === 'UserOrder'" class="new-huiy"
+			@click="
+			  sheep.$router.go('/pages/user/user_vip/index')
+			"
+		>
+			<view class="new-button">立即开通</view>
+			<img class="seckill1" mode="aspectFit"
+				src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png"
+			/>
+		</view>
 		<!-- 用户组件：用户订单 -->
 		<s-order-card v-if="type === 'UserOrder'" :data="data" />
 		<!-- 用户组件：用户资产 -->
@@ -124,7 +131,30 @@
 	:deep(.uni-border-bottom){
 		  height:0;
 	}
-	
+	.new-huiy{
+		width:100%;
+		height:100px;
+		.new-button{
+			background:white;
+			padding:4px 8px;
+			text-align:center;
+			position: absolute;
+			border-radius: 20px;
+			right: 29px;
+			top: 37px;
+			font-size:14px;
+			color: rgba(148, 109, 45, 1);
+			z-index: 33;
+		}
+		.seckill1{
+			position: absolute;
+			    top: -71px;
+			    z-index: 22;
+			    /* left: 50%; */
+			    /* transform: translateX(-50%); */
+			    width: 94%;
+		}
+	}
 	
 	
 	.floxt {
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 20626cc..ea21211 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;">
+	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;margin-top: 23px;">
 		<view class="ss-flex ss-col-center ss-row-between ">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
index 741b4dc..09c183c 100644
--- a/sheep/ui/su-navbar/su-navbar.vue
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -42,7 +42,7 @@
 					<image class="new-image" src="https://zysc.fjptzykj.com:3000/shangcheng/e0d70e9bac714465b87d22d19e30f3fb008dbcdea21842674b355340d6dedceb.png"></image>
 				</view> -->
 				<view v-if="tools === 'search'" class=""
-					:style="`width:${sheep.$platform.device.windowWidth - sheep.$platform.capsule.width - 37}px;display: flex;align-items: center;`"
+					:style="`width:${sheep.$platform.device.windowWidth - sheep.$platform.capsule.width - 30}px;display: flex;align-items: center;`"
 					@click="onSearch">
 					<slot name="center">
 						<uni-search-bar class="ss-flex-1 search-box" :radius="20" placeholder="请输入关键词"

From 5828d37b1ae8b07ec61e583a0a0eae7c9d6d00a1 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Sat, 12 Oct 2024 09:21:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E4=B8=8E=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E6=8C=89=E9=92=AE=E4=B8=8E=E6=8A=A2=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue                       |    4 +-
 .../components/s-block-item/s-block-item.vue  |    2 +
 .../s-goods-column/s-goods-column.vue         | 1721 ++++++++---------
 .../s-groupon-block/s-groupon-block.vue       |    2 +-
 .../s-seckill-block/s-seckill-block.vue       |    2 +-
 5 files changed, 841 insertions(+), 890 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 1203b9b..5fd634d 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -51,7 +51,7 @@
               class="score-img"
             />
             <text class="item-value ss-m-r-24">
-              {{ state.orderInfo.usePoint }}
+              {{ state.orderInfo.usedPoint }}
             </text>
           </view>
         </view>
@@ -69,7 +69,7 @@
             <text class="item-value ss-m-r-24">
               {{
                 state.pointStatus || state.orderPayload.pointActivityId
-                  ? state.orderInfo.totalPoint - state.orderInfo.usePoint
+                  ? state.orderInfo.totalPoint - state.orderInfo.usedPoint
                   : state.orderInfo.totalPoint || 0
               }}
             </text>
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 7ce3287..572959a 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -40,6 +40,8 @@
 		<s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
 		<!-- 营销组件：秒杀 -->
 		<s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
+		<!-- 营销组件：积分商城 -->
+				<s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
 		<!-- 营销组件：小程序直播（暂时没有这个功能） -->
 		<s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
 		<!-- 营销组件：优惠券 -->
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 00e6e2e..4e37112 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -1,960 +1,909 @@
 <!-- 页面 -->
 <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" />
-      <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 class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view
-            class="card2"
-            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
-            :key="item"
-          >
-            {{ item }}
-          </view>
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="xs-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <!-- 活动价格 -->
-          <view class="ss-flex" v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
-            <image
-              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-              class="point-img"
-            ></image>
-            <text class="point-text ss-m-r-16">
-              {{ data.point }}
-              {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
-            </text>
-          </view>
-          <template v-else>
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-            <text v-else>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </text>
-          </template>
-        </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" />
+			<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 class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2"
+						v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+						:key="item">
+						{{ item }}
+					</view>
+				</view>
+				<view v-if="goodsFields.price?.show" class="xs-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<!-- 活动价格 -->
+					<view class="ss-flex"
+						v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+						<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="point-img"></image>
+						<text class="point-text ss-m-r-16">
+							{{ data.point }}
+							{{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
+						</text>
+					</view>
+					<template v-else>
+						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+						<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+						<text v-else>
+							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+						</text>
+					</template>
+				</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 class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view
-            class="card2"
-            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
-            :key="item"
-          >
-            {{ item }}
-          </view>
-        </view>
-        <view
-          v-if="goodsFields.price?.show"
-          class="sm-goods-price font-OPPOSANS"
-          :style="[{ color: goodsFields.price.color }]"
-        >
-          <!-- 活动价格 -->
-          <view class="ss-flex" v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
-            <image
-              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-              class="point-img"
-            ></image>
-            <text class="point-text ss-m-r-16">
-              {{ data.point }}
-              {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
-            </text>
-          </view>
-          <template v-else>
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-            <text v-else>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </text>
-          </template>
-        </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 class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2"
+						v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+						:key="item">
+						{{ item }}
+					</view>
+				</view>
+				<view v-if="goodsFields.price?.show" class="new-ii sm-goods-price font-OPPOSANS"
+					:style="[{ color: goodsFields.price.color }]">
+					<!-- 活动价格 -->
+					<view class="ss-flex"
+						v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+						<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="point-img"></image>
+						<text class="point-text ss-m-r-16">
+							{{ data.point }}
+							{{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
+						</text>
+					</view>
+					<template v-else>
+						<view class="fff" v-if="btn == 'ms'">抢</view>
+						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+						<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+						<text v-else>
+							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+						</text>
+					</template>
+				</view>
+				<view class="sss" v-if="btn == 'pt'">参与拼团</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)" />
-      </view>
-      <image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
-      <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.promotionType > 0 || data.rewardActivity">
-          <view class="card" v-if="discountText">{{ discountText }}</view>
-          <view
-            class="card2"
-            v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
-            :key="item"
-          >
-            {{ item }}
-          </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 }]"
-          >
-            <!-- 活动价格 -->
-            <view class="ss-flex" v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
-              <image
-                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-                class="point-img"
-              ></image>
-              <text class="point-text ss-m-r-16">
-                {{ data.point }}
-                {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
-              </text>
-            </view>
-            <template v-else>
-              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-              <text v-else>
-                {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-              </text>
-            </template>
-          </view>
-          <view
-            v-if="
+		<!-- 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)" />
+			</view>
+			<image class="md-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="widthFix" />
+			<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.promotionType > 0 || data.rewardActivity">
+					<view class="card" v-if="discountText">{{ discountText }}</view>
+					<view class="card2"
+						v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+						:key="item">
+						{{ item }}
+					</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 }]">
+						<!-- 活动价格 -->
+						<view class="ss-flex"
+							v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+							<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="point-img">
+							</image>
+							<text class="point-text ss-m-r-16">
+								{{ data.point }}
+								{{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
+							</text>
+						</view>
+						<template v-else>
+							<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+							<text v-else>
+								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+							</text>
+						</template>
+					</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>
+            " 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"
-      />
-      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ">
-        <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="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
-            <view class="card" v-if="discountText">{{ discountText }}</view>
-            <view
-              class="card2"
-              v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
-              :key="item"
-            >
-              {{ item }}
-            </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 }]">
-              <!-- 活动价格 -->
-              <view class="ss-flex" v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
-                <image
-                  src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
-                  class="point-img"
-                ></image>
-                <text class="point-text ss-m-r-16">
-                  {{ data.point }}
-                  {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
-                </text>
-              </view>
-              <template v-else>
-                <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-                <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-                <text v-else>
-                  {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-                </text>
-              </template>
-            </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" />
+			<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ">
+				<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="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+						<view class="card" v-if="discountText">{{ discountText }}</view>
+						<view class="card2"
+							v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+							:key="item">
+							{{ item }}
+						</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 }]">
+							<!-- 活动价格 -->
+							<view class="ss-flex"
+								v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+								<image
+									src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
+									class="point-img"></image>
+								<text class="point-text ss-m-r-16">
+									{{ data.point }}
+									{{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
+								</text>
+							</view>
+							<template v-else>
+								<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+								<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+								<text v-else>
+									{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+								</text>
+							</template>
+						</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-8 ss-flex ss-col-center 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-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)" />
-      </view>
-      <image
-        class="sl-img-box"
-        :src="sheep.$url.cdn(data.image || data.picUrl)"
-        mode="aspectFill"
-      />
-      <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.promotionType > 0 || data.rewardActivity">
-            <view class="card" v-if="discountText">{{ discountText }}</view>
-            <view
-              class="card2"
-              v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
-              :key="item"
-            >
-              {{ item }}
-            </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 }]">
-              <!-- 活动价格 -->
-              <view class="ss-flex" v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
-                <image
-                  src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
-                  class="point-img"
-                ></image>
-                <text class="ss-m-r-16">
-                  {{ data.point }}
-                  {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
-                </text>
-              </view>
-              <template v-else>
-                <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-                <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
-                <text v-else>
-                  {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-                </text>
-              </template>
-            </view>
-            <view
-              v-if="
+		<!-- 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)" />
+			</view>
+			<image class="sl-img-box" :src="sheep.$url.cdn(data.image || data.picUrl)" mode="aspectFill" />
+			<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.promotionType > 0 || data.rewardActivity">
+						<view class="card" v-if="discountText">{{ discountText }}</view>
+						<view class="card2"
+							v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+							:key="item">
+							{{ item }}
+						</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 }]">
+							<!-- 活动价格 -->
+							<view class="ss-flex"
+								v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
+								<image
+									src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
+									class="point-img"></image>
+								<text class="ss-m-r-16">
+									{{ data.point }}
+									{{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${priceUnit}${fen2yuan(data.pointPrice)}` }}
+								</text>
+							</view>
+							<template v-else>
+								<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+								<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+								<text v-else>
+									{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+								</text>
+							</template>
+						</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, getCurrentInstance, nextTick, onMounted } from 'vue';
-  import sheep from '@/sheep';
-  import {
-    fen2yuan,
-    formatExchange,
-    formatSales,
-    formatStock,
-    getRewardActivityRuleItemDescriptions,
-  } from '@/sheep/hooks/useGoods';
-  import { isArray } from 'lodash-es';
-  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+	/**
+	 * 商品卡片
+	 *
+	 * @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,
+		getCurrentInstance,
+		nextTick,
+		onMounted
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		fen2yuan,
+		formatExchange,
+		formatSales,
+		formatStock,
+		getRewardActivityRuleItemDescriptions,
+	} from '@/sheep/hooks/useGoods';
+	import {
+		isArray
+	} from 'lodash-es';
+	import {
+		PromotionActivityTypeEnum
+	} from '@/sheep/util/const';
 
-  // 接收参数
-  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 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: '',
+		},
+		btn: {
+			type: String,
+			default: '',
+		},
+		buttonShow: {
+			type: Boolean,
+			default: true,
+		},
+		seckillTag: {
+			type: Boolean,
+			default: false,
+		},
+		grouponTag: {
+			type: Boolean,
+			default: false,
+		},
+	});
 
-  // 优惠文案
-  const discountText = computed(() => {
-    const promotionType = props.data.promotionType;
-    if (promotionType === 4) {
-      return '限时优惠';
-    } else if (promotionType === 6) {
-      return '会员价';
-    }
-    return undefined;
-  });
+	// 优惠文案
+	const discountText = computed(() => {
+		const promotionType = props.data.promotionType;
+		if (promotionType === 4) {
+			return '限时优惠';
+		} else if (promotionType === 6) {
+			return '会员价';
+		}
+		return undefined;
+	});
 
-  // 组件样式
-  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) {
-      if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
-        text.push(formatExchange(props.data.sales_show_type, (props.data.pointTotalStock || 0) - (props.data.pointStock || 0)));
-      } else {
-        text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
-      }
-    }
-    if (props.goodsFields.stock?.show) {
-      if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
-        text.push(formatStock(props.data.stock_show_type, props.data.pointTotalStock));
-      } else {
-        text.push(formatStock(props.data.stock_show_type, props.data.stock));
-      }
-    }
-    return text.join(' | ');
-  });
+	// 格式化销量、库存信息
+	const salesAndStock = computed(() => {
+		let text = [];
+		if (props.goodsFields.salesCount?.show) {
+			if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
+				text.push(formatExchange(props.data.sales_show_type, (props.data.pointTotalStock || 0) - (props
+					.data.pointStock || 0)));
+			} else {
+				text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+			}
+		}
+		if (props.goodsFields.stock?.show) {
+			if (props.data.activityType && props.data.activityType === PromotionActivityTypeEnum.POINT.type) {
+				text.push(formatStock(props.data.stock_show_type, props.data.pointTotalStock));
+			} else {
+				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);
-      });
-    }
-  }
+	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();
-    });
-  });
+	onMounted(() => {
+		nextTick(() => {
+			getGoodsPriceCardWH();
+		});
+	});
 </script>
 
 <style lang="scss" scoped>
-  .tag-icon-box {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 2;
+	.tag-icon-box {
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 2;
 
-    .tag-icon {
-      width: 72rpx;
-      height: 44rpx;
-    }
-  }
+		.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;
-  }
+	.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;
+	}
 
-  .point-img {
-    width: 30rpx;
-    height: 30rpx;
-    margin: 0 4rpx;
-  }
+	.point-img {
+		width: 30rpx;
+		height: 30rpx;
+		margin: 0 4rpx;
+	}
 
-  .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;
-  }
+	.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;
-  }
+	.goods-img {
+		width: 100%;
+		height: 100%;
+		background-color: #f5f5f5;
+	}
 
-  .price-unit {
-    margin-right: -4px;
-  }
+	.price-unit {
+		margin-right: -4px;
+	}
 
-  .sales-text {
-    display: table;
-    font-size: 24rpx;
-    transform: scale(0.8);
-    margin-left: 0rpx;
-    color: #c4c4c4;
-  }
+	.sales-text {
+		display: table;
+		font-size: 24rpx;
+		transform: scale(0.8);
+		margin-left: 0rpx;
+		color: #c4c4c4;
+	}
 
-  .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;
-  }
+	.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;
+	}
 
-  .goods-origin-price {
-    font-size: 20rpx;
-    color: #c4c4c4;
-    line-height: 36rpx;
-    text-decoration: line-through;
-  }
+	.goods-origin-price {
+		font-size: 20rpx;
+		color: #c4c4c4;
+		line-height: 36rpx;
+		text-decoration: line-through;
+	}
 
-  // xs
-  .xs-goods-card {
-    overflow: hidden;
-    // max-width: 375rpx;
-    background-color: $white;
-    position: relative;
+	// xs
+	.xs-goods-card {
+		overflow: hidden;
+		// max-width: 375rpx;
+		background-color: $white;
+		position: relative;
 
-    .xs-img-box {
-      width: 128rpx;
-      height: 128rpx;
-      margin-right: 20rpx;
-    }
+		.xs-img-box {
+			width: 128rpx;
+			height: 128rpx;
+			margin-right: 20rpx;
+		}
 
-    .xs-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
+		.xs-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
 
-    .xs-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+		.xs-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-  // sm
-  .sm-goods-card {
-    overflow: hidden;
-    // width: 223rpx;
-    // width: 100%;
-    background-color: $white;
-    position: relative;
+	// sm
+	.sm-goods-card {
+		overflow: hidden;
+		// width: 223rpx;
+		// width: 100%;
+		background-color: $white;
+		position: relative;
 
-    .sm-img-box {
-      // width: 228rpx;
-      width: 100%;
-      height: 208rpx;
-    }
+		.sm-img-box {
+			// width: 228rpx;
+			width: 100%;
+			height: 208rpx;
+		}
 
-    .sm-goods-content {
-      padding: 20rpx 16rpx;
-      box-sizing: border-box;
-    }
+		.sm-goods-content {
+			padding: 20rpx 16rpx;
+			box-sizing: border-box;
+		}
 
-    .sm-goods-title {
-      font-size: 26rpx;
-      color: #333;
-    }
+		.sm-goods-title {
+			font-size: 26rpx;
+			color: #333;
+		}
 
-    .sm-goods-price {
-      font-size: 30rpx;
-      color: $red;
-    }
-  }
+		.sm-goods-price {
+			font-size: 30rpx;
+			color: $red;
+		}
+	}
 
-  // md
-  .md-goods-card {
-    overflow: hidden;
-    width: 100%;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    position: relative;
+	// md
+	.md-goods-card {
+		overflow: hidden;
+		width: 100%;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		position: relative;
 
-    .md-img-box {
-      width: 100%;
-    }
+		.md-img-box {
+			width: 100%;
+		}
 
-    .md-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      width: 100%;
-    }
+		.md-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			width: 100%;
+		}
 
-    .md-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-    }
+		.md-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+		}
 
-    .md-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.md-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .cart-box {
-      width: 54rpx;
-      height: 54rpx;
-      background: linear-gradient(90deg, #fe8900, #ff5e00);
-      border-radius: 50%;
-      position: absolute;
-      bottom: 50rpx;
-      right: 20rpx;
-      z-index: 2;
+		.cart-box {
+			width: 54rpx;
+			height: 54rpx;
+			background: linear-gradient(90deg, #fe8900, #ff5e00);
+			border-radius: 50%;
+			position: absolute;
+			bottom: 50rpx;
+			right: 20rpx;
+			z-index: 2;
 
-      .cart-icon {
-        width: 30rpx;
-        height: 30rpx;
-      }
-    }
-  }
+			.cart-icon {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+	}
 
-  // lg
-  .lg-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    background-color: $white;
-    // height: 280rpx;
-	border-radius:10px !important;
-	padding: 10px;
-    .lg-img-box {
-      width: 180rpx;
-      height: 180rpx;
-      margin-right: 20rpx;
-	  border-radius:10px;
-    }
+	// lg
+	.lg-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		background-color: $white;
+		// height: 280rpx;
+		border-radius: 10px !important;
+		padding: 10px;
 
-    .lg-goods-title {
-      font-size: 28rpx;
-      font-weight: 500;
-      color: #333333;
-      // line-height: 36rpx;
-      // width: 410rpx;
-    }
+		.lg-img-box {
+			width: 180rpx;
+			height: 180rpx;
+			margin-right: 20rpx;
+			border-radius: 10px;
+		}
 
-    .lg-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      // line-height: 30rpx;
-      // width: 410rpx;
-    }
+		.lg-goods-title {
+			font-size: 28rpx;
+			font-weight: 500;
+			color: #333333;
+			// line-height: 36rpx;
+			// width: 410rpx;
+		}
 
-    .lg-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.lg-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			// line-height: 30rpx;
+			// width: 410rpx;
+		}
 
-    .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;
-    }
+		.lg-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-    .tag-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;
+		}
 
-  // sl
+		.tag-box {
+			width: 100%;
+		}
+	}
 
-  .sl-goods-card {
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    width: 100%;
-    background-color: $white;
+	// sl
 
-    .sl-goods-content {
-      padding: 20rpx 20rpx;
-      box-sizing: border-box;
-    }
+	.sl-goods-card {
+		overflow: hidden;
+		position: relative;
+		z-index: 1;
+		width: 100%;
+		background-color: $white;
 
-    .sl-img-box {
-      width: 100%;
-      height: 360rpx;
-    }
+		.sl-goods-content {
+			padding: 20rpx 20rpx;
+			box-sizing: border-box;
+		}
 
-    .sl-goods-title {
-      font-size: 26rpx;
-      color: #333;
-      font-weight: 500;
-    }
+		.sl-img-box {
+			width: 100%;
+			height: 360rpx;
+		}
 
-    .sl-goods-subtitle {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #999999;
-      line-height: 30rpx;
-    }
+		.sl-goods-title {
+			font-size: 26rpx;
+			color: #333;
+			font-weight: 500;
+		}
 
-    .sl-goods-price {
-      font-size: 30rpx;
-      color: $red;
-      line-height: 36rpx;
-    }
+		.sl-goods-subtitle {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #999999;
+			line-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;
-    }
-  }
+		.sl-goods-price {
+			font-size: 30rpx;
+			color: $red;
+			line-height: 36rpx;
+		}
 
-  .card {
-    width: fit-content;
-    height: fit-content;
-    padding: 2rpx 10rpx;
-    background-color: red;
-    color: #ffffff;
-    font-size: 24rpx;
-    margin-top: 5rpx;
-  }
+		.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;
+		}
+	}
 
-  .card2 {
-    width: fit-content;
-    height: fit-content;
-    padding: 2rpx 10rpx;
-    background-color: rgb(255, 242, 241);
-    color: #ff2621;
-    font-size: 24rpx;
-    margin: 5rpx 0 5rpx 5rpx;
-  }
+	.card {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: red;
+		color: #ffffff;
+		font-size: 24rpx;
+		margin-top: 5rpx;
+	}
 
-  .iconBox {
-    width: 100%;
-    height: fit-content;
-    margin-top: 10rpx;
-    display: flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-  }
-</style>
+	.card2 {
+		width: fit-content;
+		height: fit-content;
+		padding: 2rpx 10rpx;
+		background-color: rgb(255, 242, 241);
+		color: #ff2621;
+		font-size: 24rpx;
+		margin: 5rpx 0 5rpx 5rpx;
+	}
+
+	.iconBox {
+		width: 100%;
+		height: fit-content;
+		margin-top: 10rpx;
+		display: flex;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.sss {
+		margin-top: 10px;
+		padding: 3px;
+		font-size: 13px;
+		background: #e93422;
+		text-align: center;
+		color: white;
+		border-radius: 0px 0px 5px 5px;
+	}
+	.fff{
+		padding: 3px;
+		font-size: 13px;
+		background: #e93422;
+		text-align: center;
+		color: white;
+		border-radius: 5px;
+		    width: 20px;
+		margin-right:5px;
+	}
+	.new-ii{
+		display:flex;
+		align-items: baseline;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 6561d3b..495fad3 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -72,7 +72,7 @@
 		    padding: data.space + 'rpx',
 		  },
 		]">
-				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
+				<s-goods-column btn='pt' class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
 					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
 					:bottomRadius="data.borderRadiusBottom" @click="
 					sheep.$router.go('/pages/goods/groupon', {
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index aa08fd2..be2eb15 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -105,7 +105,7 @@
 	        padding: data.space + 'rpx',
 	      },
 	    ]">
-				<s-goods-column class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
+				<s-goods-column btn='ms' class="goods-card" size="sm" :goodsFields="data.fields" :tagStyle="tagStyle"
 					:data="product" :titleColor="data.fields.name?.color" :topRadius="data.borderRadiusTop"
 					:bottomRadius="data.borderRadiusBottom" @click="
 	        sheep.$router.go('/pages/goods/seckill', {

From a18bd4f01a5ef16ba996d99de58764be51c5fe49 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Sat, 12 Oct 2024 17:10:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E4=B8=8E=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=B6=85=E5=87=BA=E9=99=90=E8=B4=AD=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/seckill/list.vue                       |  2 +-
 pages/goods/groupon.vue                               |  5 +++--
 pages/goods/seckill.vue                               |  7 +++++--
 sheep/components/s-block-item/s-block-item.vue        |  2 +-
 .../s-select-groupon-sku/s-select-groupon-sku.vue     | 11 ++++++++---
 .../s-select-seckill-sku/s-select-seckill-sku.vue     |  7 ++++++-
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 49fe147..81edf7c 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -264,7 +264,7 @@
 
   // 时间段轮播图
   .header {
-    width: 710rpx;
+    width: 100%;
     height: 330rpx;
     margin: 0 auto 0 auto;
     border-radius: 14rpx;
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index d384eb2..93a7441 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -90,7 +90,7 @@
 					</view>
 
 					<!-- 规格与数量弹框 -->
-					<s-select-groupon-sku :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
+					<s-select-groupon-sku :activity="state.activity" :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
 						:grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy"
 						@change="onSkuChange" @close="onSkuClose" />
 				</view>
@@ -115,7 +115,7 @@
 				  state.activity.status === 0 && state.goodsInfo.stock !== 0
 				    ? 'check-btn-box'
 				    : 'disabled-btn-box'
-				" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0">
+				" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0 || state.activity.remainingPurchases == 0"">
 							<view class="btn-price">{{
 				  fen2yuan(state.activity.price || state.goodsInfo.price)
 				}}</view>
@@ -263,6 +263,7 @@
 			data: activity
 		} = await CombinationApi.getCombinationActivity(state.grouponId);
 		state.activity = activity;
+		// console.log(activity,"activity")
 		// 加载商品信息
 		const {
 			data: spu
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index e9ca676..be78f9d 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -68,7 +68,7 @@
 							<detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
 						</view>
 						<!-- 规格与数量弹框 -->
-						<s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
+						<s-select-seckill-sku :activity="activity" v-model="state.goodsInfo" :show="state.showSelectSku"
 							:single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
 							@close="state.showSelectSku = false" />
 
@@ -102,14 +102,16 @@
 								  timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0
 									? 'check-btn-box'
 									: 'disabled-btn-box'
-								" :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED">
+								" :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED || activity.remainingPurchases == 0">
 									<view class="btn-price">{{ fen2yuan(state.goodsInfo.price) }}</view>
 									<view v-if="timeStatusEnum === TimeStatusEnum.STARTED">
 										<view v-if="state.goodsInfo.stock === 0">已售罄</view>
+										<!-- <view v-else-if=" activity.remainingPurchases == 0">立即秒杀</view> -->
 										<view v-else>立即秒杀</view>
 									</view>
 									<view v-else>{{ timeStatusEnum }}</view>
 								</button>
+								<!-- {{timeStatusEnum}}---{{TimeStatusEnum.STARTED}} -->
 							</view>
 						</detail-tabbar>
 					</view>
@@ -223,6 +225,7 @@
 			data
 		} = await SeckillApi.getSeckillActivity(id);
 		activity.value = data;
+		// console.log(activity.value,"activity.value")
 		timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
 
 		// 查询商品
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 572959a..85a3af3 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -81,7 +81,7 @@
 		<!-- 用户组件：用户订单 -->
 		<s-order-card v-if="type === 'UserOrder'" :data="data" />
 		<!-- 用户组件：用户资产 -->
-		<s-wallet-card v-if="type === 'UserWallet'" />
+		<s-wallet-card v-if="type === 'UserCard'" />
 		<!-- 用户组件：用户卡券 -->
 		<s-coupon-card v-if="type === 'UserCoupon'" />
 	</view>
diff --git a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
index ebfded8..fcb6672 100644
--- a/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
+++ b/sheep/components/s-select-groupon-sku/s-select-groupon-sku.vue
@@ -65,7 +65,7 @@
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
-              :max="state.selectedSku.stock"
+              :max="min([skuList[0].stock,activity.singleLimitCount,activity.remainingPurchases])"
               :step="1"
               v-model="state.selectedSku.count"
               @change="onNumberChange($event)"
@@ -97,6 +97,7 @@
 <script setup>
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
+  import { isEmpty, min } from 'lodash-es';
   import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
 
   const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-btn-long.png');
@@ -118,6 +119,10 @@
       type: [Number, String],
       default: 0,
     },
+	activity:{
+		type: Array,
+		default: 0,
+	}
   });
   const state = reactive({
     selectedSku: {}, // 选中的 SKU
@@ -133,6 +138,7 @@
     for (let price of skuPrices) {
       price.value_id_array = price.properties.map((item) => item.valueId);
     }
+	console.log(props.activity,"skuPrices")
     return skuPrices;
   });
 
@@ -152,8 +158,8 @@
     if (e === 0) return;
     if (state.selectedSku.count === e) return;
     state.selectedSku.count = e;
+	console.log(state.selectedSku)
   }
-
   // 点击购买
   function onBuy() {
     if (!state.selectedSku.id || state.selectedSku.id <= 0) {
@@ -166,7 +172,6 @@
     }
     emits('buy', state.selectedSku);
   }
-
   // 改变禁用状态：计算每个 property 属性值的按钮，是否禁用
   function changeDisabled(isChecked = false, propertyId = 0, valueId = 0) {
     let newSkus = []; // 所有可以选择的 sku 数组
diff --git a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
index 1233cbf..05b85c2 100644
--- a/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
+++ b/sheep/components/s-select-seckill-sku/s-select-seckill-sku.vue
@@ -75,7 +75,7 @@
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
-              :max="min([singleLimitCount, state.selectedSku.stock])"
+              :max="min([skuList[0].stock,activity.singleLimitCount,activity.remainingPurchases])"
               :step="1"
               v-model="state.selectedSku.count"
               @change="onBuyCountChange($event)"
@@ -122,12 +122,17 @@
       type: Number,
       default: 1,
     },
+	activity:{
+		type: Array,
+		default: 0,
+	}
   });
   const state = reactive({
     goodsInfo: computed(() => props.modelValue),
     selectedSku: {},
     currentPropertyArray: [],
   });
+  // console.log(props.activity,"activity");
   const getShowPriceText = computed(() => {
     let priceText = `￥${fen2yuan(state.goodsInfo.price)}`;
     if (!isEmpty(state.selectedSku)) {