diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index 416c85b..d84fba9 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -1,227 +1,255 @@
 <!-- 拼团活动列表 -->
 <template>
-  <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="{
+	<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="{
             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%;
-  }
-  .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;
-        }
+	.page-bg {
+		width: 100%;
+		height: 458rpx;
+		margin-top: -88rpx;
+		background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png');
+		background-size: 100% 100%;
+	}
 
-        .picture {
-          display: inline-table;
-        }
+	.list-content {
+		position: relative;
+		z-index: 3;
+		margin: 0 20rpx 0 20rpx;
+		// background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
 
-        .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;
-        }
+		.content-header {
+			width: 100%;
+			border-radius: 20rpx 20rpx 0 0;
+			height: 50rpx;
+			margin: 10px 0;
+			position: relative;
 
-        .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;
-        }
+			// background: linear-gradient(180deg, #fff4f7, #ffe4d1);
+			&::after {
+				content: '';
+				position: absolute;
+				right: 15%;
+				height: 1px;
+				width: 50px;
+				background: white;
+				top: 50%;
+				transform: translateY(-50%);
+			}
 
-        .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>
+			&::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%);
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 111cd3a..49fe147 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -1,11 +1,11 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
+  <s-layout title="秒杀列表" navbar="normal" :bgStyle="{ color: 'rgb(245,28,19)' }">
     <!--顶部背景图-->
-    <view
+    <!-- <view
       class="page-bg"
       :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
-    ></view>
+    ></view> -->
     <!-- 时间段轮播图 -->
     <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
       <swiper
@@ -45,7 +45,7 @@
           :key="index"
           :class="['item', { active: activeTimeIndex === index }]"
           :id="`timeItem${index}`"
-          @tap="handleChangeTimeConfig(index)"
+          @tap="handleChangeTimeConfig(index,config.id)"
         >
           <!-- 活动起始时间 -->
           <view class="time">{{ config.startTime }}</view>
@@ -58,7 +58,7 @@
     <!-- 内容区 -->
     <view class="list-content">
       <!-- 活动倒计时 -->
-      <view class="content-header ss-flex-col ss-col-center ss-row-center">
+      <!-- <view class="content-header ss-flex-col ss-col-center ss-row-center">
         <view class="content-header-box ss-flex ss-row-center">
           <view
             class="countdown-box ss-flex"
@@ -75,7 +75,7 @@
           </view>
           <view v-else> {{ activeTimeConfig?.status }} </view>
         </view>
-      </view>
+      </view> -->
 
       <!-- 活动列表 -->
       <scroll-view
@@ -174,8 +174,9 @@
       }
     });
     timeConfigList.value = data;
+	console.log(timeConfigList.value[0]?.id,"timeConfigList.value[0]?.id");
     // 默认选中进行中的活动
-    handleChangeTimeConfig(activeTimeIndex.value);
+    handleChangeTimeConfig(activeTimeIndex.value, timeConfigList.value[0]?.id);
     // 滚动到进行中的时间段
     scrollToTimeConfig(activeTimeIndex.value);
   };
@@ -189,13 +190,13 @@
   // 切换时间段
   const activeTimeIndex = ref(0); // 当前选中的时间段的索引
   const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); // 当前选中的时间段
-  const handleChangeTimeConfig = (index) => {
+  const handleChangeTimeConfig = (index, config) => {
     activeTimeIndex.value = index;
-
+	console.log(config,'config')
     // 查询活动列表
     activityPageParams.pageNo = 1;
     activityList.value = [];
-    getActivityList();
+    getActivityList(config);
   };
 
   // 倒计时
@@ -212,15 +213,16 @@
 
   // 查询活动列表
   const activityPageParams = reactive({
-    id: 0, // 时间段 ID
+    configId: 0, // 时间段 ID
     pageNo: 1, // 页码
     pageSize: 5, // 每页数量
   });
   const activityTotal = ref(0); // 活动总数
   const activityList = ref([]); // 活动列表
   const loadStatus = ref(''); // 页面加载状态
-  async function getActivityList() {
+  async function getActivityList(id) {
     loadStatus.value = 'loading';
+	activityPageParams.configId= id;
     const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams);
     data.list.forEach((activity) => {
       // 计算抢购进度
@@ -264,7 +266,7 @@
   .header {
     width: 710rpx;
     height: 330rpx;
-    margin: -276rpx auto 0 auto;
+    margin: 0 auto 0 auto;
     border-radius: 14rpx;
     overflow: hidden;
     swiper {
@@ -331,7 +333,7 @@
     position: relative;
     z-index: 3;
     margin: 0 20rpx 0 20rpx;
-    background: #fff;
+    // background: #fff;
     border-radius: 20rpx 20rpx 0 0;
     .content-header {
       width: 100%;
diff --git a/pages/goods/components/groupon/groupon-card-list.vue b/pages/goods/components/groupon/groupon-card-list.vue
index 7b1367b..80383a5 100644
--- a/pages/goods/components/groupon/groupon-card-list.vue
+++ b/pages/goods/components/groupon/groupon-card-list.vue
@@ -10,7 +10,7 @@
       v-for="(record, index) in state.list"
       @tap="sheep.$router.go('/pages/activity/groupon/detail', { id: record.id })"
       :key="index"
-      class="ss-m-t-40 ss-flex ss-row-between border-bottom ss-p-b-30"
+      class="ss-m-t-40 ss-flex ss-row-between ss-p-b-30"
     >
       <view class="ss-flex ss-col-center">
         <image :src="sheep.$url.cdn(record.avatar)" class="user-avatar"></image>
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index e95cdfa..d384eb2 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -1,561 +1,618 @@
 <!-- 拼团商品详情 -->
 <template>
-  <s-layout :onShareAppMessage="shareInfo" navbar="goods">
-    <!-- 标题栏 -->
-    <detailNavbar />
-    <!-- 骨架屏 -->
-    <detailSkeleton v-if="state.skeletonLoading" />
-    <!-- 下架/售罄提醒 -->
-    <s-empty
-      v-else-if="
+	<s-layout :onShareAppMessage="shareInfo" navbar="goods">
+		<!-- 标题栏 -->
+		<detailNavbar />
+		<!-- 骨架屏 -->
+		<detailSkeleton v-if="state.skeletonLoading" />
+		<!-- 下架/售罄提醒 -->
+		<s-empty v-else-if="
         state.goodsInfo === null ||
         state.activity.status !== 0 ||
         state.activity.endTime < new Date().getTime()
-      "
-      text="活动不存在或已结束"
-      icon="/static/soldout-empty.png"
-      showAction
-      actionText="返回上一页"
-      @clickAction="sheep.$router.back()"
-    />
-    <block v-else>
-      <view class="detail-swiper-selector">
-        <!-- 商品图轮播 -->
-        <su-swiper
-          class="ss-m-b-14"
-          isPreview
-          :list="state.goodsSwiper"
-          dotStyle="tag"
-          imageMode="widthFix"
-          dotCur="bg-mask-40"
-          :seizeHeight="750"
-        />
+      " text="活动不存在或已结束" icon="/static/soldout-empty.png" showAction actionText="返回上一页"
+			@clickAction="sheep.$router.back()" />
+		<block v-else>
+			<view class="detail-swiper-selector">
+				<!-- 商品图轮播 -->
+				<su-swiper class="" isPreview :list="state.goodsSwiper" dotStyle="tag" imageMode="widthFix"
+					dotCur="bg-mask-40" :seizeHeight="750" />
 
-        <!-- 价格+标题 -->
-        <view class="title-card bj detail-card ss-m-y-14 ss-m-x-20">
-          <view class="ss-flex ss-row-between ">
-            <view class="new-kk">
-              <view class="price-box ss-flex ss-col-bottom ss-m-b-18">
-				  <!-- <view class="tig ss-flex ss-col-center">
-				    <view class="tig-icon ss-flex ss-col-center ss-row-center">
-				      <view class="groupon-tag">
-				        <image
-				          :src="sheep.$url.static('/static/img/shop/goods/groupon-tag.png')"
-				        ></image>
-				      </view>
-				    </view>
-				    <view class="tig-title">拼团价</view>
-				  </view> -->
-				<view class="origin-price ss-flex ss-col-center">
-				  拼团价
+				<!-- 价格+标题 -->
+				<view class="new-class title-card bj detail-card ss-m-y-14 ss-m-x-20">
+					<view class="ss-flex ss-row-between ">
+						<view class="new-kk">
+							<view class="price-box ss-flex ss-col-bottom ss-m-b-18">
+								<!-- <view class="tig ss-flex ss-col-center">
+									<view class="tig-icon ss-flex ss-col-center ss-row-center">
+									  <view class="groupon-tag">
+										<image
+										  :src="sheep.$url.static('/static/img/shop/goods/groupon-tag.png')"
+										></image>
+									  </view>
+									</view>
+									<view class="tig-title">拼团价</view>
+								  </view> -->
+								<view class="origin-price ss-flex ss-col-center">
+									拼团价
+								</view>
+								<view class="price-text ss-m-r-16">
+									{{ fen2yuan(state.activity.price || state.goodsInfo.price) }}
+								</view>
+
+								<view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.price">
+									单买价：
+									<view class="origin-price-text">
+										{{ fen2yuan(state.goodsInfo.price) }}
+									</view>
+								</view>
+
+							</view>
+							<view class="origin-price ss-flex ss-col-center" style="margin-left: 130rpx;">
+								<view>
+									{{ state.activity.userSize }}
+								</view>人团
+							</view>
+						</view>
+
+						<!-- <view class="countdown-box" v-if="endTime.ms > 0">
+						  <view class="countdown-title ss-m-b-20">距结束仅剩</view>
+						  <view class="ss-flex countdown-time">
+							<view class="ss-flex countdown-h">{{ endTime.h }}</view>
+							<view class="ss-m-x-4">:</view>
+							<view class="countdown-num ss-flex ss-row-center">{{ endTime.m }}</view>
+							<view class="ss-m-x-4">:</view>
+							<view class="countdown-num ss-flex ss-row-center">{{ endTime.s }}</view>
+						  </view>
+						</view>
+						<view class="countdown-title" v-else> 活动已结束 </view> -->
+					</view>
 				</view>
-                <view class="price-text ss-m-r-16">
-                  {{ fen2yuan(state.activity.price || state.goodsInfo.price) }}
-                </view>
-                
-				<view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.price">
-				  单买价：
-				  <view class="origin-price-text">
-				    {{ fen2yuan(state.goodsInfo.price) }}
-				  </view>
+				<view class="new-main">
+					<view class="new-sub title-card detail-card ss-m-b-18" style="">
+						<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name }}</view>
+						<!-- <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view> -->
+					</view>
+
+					<!-- 功能卡片 -->
+					<view class=" new-detail-card detail-cell-card detail-card ss-flex-col">
+						<!-- 规格 -->
+						<detail-cell-sku :sku="state.selectedSkuPrice" @tap="state.showSelectSku = true" />
+					</view>
+
+					<!-- 参团列表 -->
+					<groupon-card-list class="new-groupon-card-list" v-model="state.activity" @join="onJoinGroupon" />
+
+					<!-- 参团玩法 -->
+					<view class="new-detail-card detail-cell-card detail-card ss-flex-col">
+						<image class="image" mode="aspectFill"
+							src="https://zysc.fjptzykj.com:3000/shangcheng/27747f3ba1d36807f485eab196aecd357e0811d6f74b36936818a2a7ff86d96e.png" />
+					</view>
+
+					<!-- 规格与数量弹框 -->
+					<s-select-groupon-sku :show="state.showSelectSku" :goodsInfo="state.goodsInfo"
+						:grouponAction="state.grouponAction" :grouponNum="state.grouponNum" @buy="onBuy"
+						@change="onSkuChange" @close="onSkuClose" />
 				</view>
-				
-              </view>
-			  <view class="origin-price ss-flex ss-col-center" style="margin-left: 130rpx;">
-			    <view>
-			      {{ state.activity.userSize }}
-			    </view>人团
-			  </view>
-            </view>
 
-           <!-- <view class="countdown-box" v-if="endTime.ms > 0">
-              <view class="countdown-title ss-m-b-20">距结束仅剩</view>
-              <view class="ss-flex countdown-time">
-                <view class="ss-flex countdown-h">{{ endTime.h }}</view>
-                <view class="ss-m-x-4">:</view>
-                <view class="countdown-num ss-flex ss-row-center">{{ endTime.m }}</view>
-                <view class="ss-m-x-4">:</view>
-                <view class="countdown-num ss-flex ss-row-center">{{ endTime.s }}</view>
-              </view>
-            </view>
-            <view class="countdown-title" v-else> 活动已结束 </view> -->
-          </view>
-        </view>
-		
-		<view class="title-card detail-card ss-m-b-18" style="padding: 10px 9px;">
-		  <view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo.name }}</view>
-		  <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
-		</view>
+			</view>
+			<view class="new-bottom">
+				<!-- 评价 -->
+				<detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
+				<!-- 详情 -->
+				<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
 
-        <!-- 功能卡片 -->
-        <view class="detail-cell-card detail-card ss-flex-col">
-          <!-- 规格 -->
-          <detail-cell-sku :sku="state.selectedSkuPrice" @tap="state.showSelectSku = true" />
-        </view>
+				<!-- 商品tabbar -->
+				<!-- TODO: 已售罄、预热 判断 设计-->
+				<detail-tabbar v-model="state.goodsInfo">
+					<view class="buy-box ss-flex ss-col-center ss-p-r-20">
+						<button class="ss-reset-button origin-price-btn ss-flex-col"
+							@tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
+							<view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
+							<view>原价购买</view>
+						</button>
+						<button class="ss-reset-button btn-tox ss-flex-col" @tap="onCreateGroupon" :class="
+				  state.activity.status === 0 && state.goodsInfo.stock !== 0
+				    ? 'check-btn-box'
+				    : 'disabled-btn-box'
+				" :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0">
+							<view class="btn-price">{{
+				  fen2yuan(state.activity.price || state.goodsInfo.price)
+				}}</view>
+							<view v-if="state.activity.startTime > new Date().getTime()">未开始</view>
+							<view v-else-if="state.activity.endTime <= new Date().getTime()">已结束</view>
+							<view v-else>
+								<view v-if="state.goodsInfo.stock === 0">已售罄</view>
+								<view v-else>立即开团</view>
+							</view>
+						</button>
+					</view>
+				</detail-tabbar>
+			</view>
 
-        <!-- 参团列表 -->
-        <groupon-card-list v-model="state.activity" @join="onJoinGroupon" />
-		
-		<!-- 参团玩法 -->
-		<view class="detail-cell-card detail-card ss-flex-col">
-		  <image class="image" mode="aspectFill" src="https://zysc.fjptzykj.com:3000/shangcheng/27747f3ba1d36807f485eab196aecd357e0811d6f74b36936818a2a7ff86d96e.png"/>
-		</view>
-		
-        <!-- 规格与数量弹框 -->
-        <s-select-groupon-sku
-          :show="state.showSelectSku"
-          :goodsInfo="state.goodsInfo"
-          :grouponAction="state.grouponAction"
-          :grouponNum="state.grouponNum"
-          @buy="onBuy"
-          @change="onSkuChange"
-          @close="onSkuClose"
-        />
-      </view>
-
-      <!-- 评价 -->
-      <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
-      <!-- 详情 -->
-      <detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
-
-      <!-- 商品tabbar -->
-      <!-- TODO: 已售罄、预热 判断 设计-->
-      <detail-tabbar v-model="state.goodsInfo">
-        <view class="buy-box ss-flex ss-col-center ss-p-r-20">
-          <button
-            class="ss-reset-button origin-price-btn ss-flex-col"
-            @tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })"
-          >
-            <view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
-            <view>原价购买</view>
-          </button>
-          <button
-            class="ss-reset-button btn-tox ss-flex-col"
-            @tap="onCreateGroupon"
-            :class="
-              state.activity.status === 0 && state.goodsInfo.stock !== 0
-                ? 'check-btn-box'
-                : 'disabled-btn-box'
-            "
-            :disabled="state.goodsInfo.stock === 0 || state.activity.status !== 0"
-          >
-            <view class="btn-price">{{
-              fen2yuan(state.activity.price || state.goodsInfo.price)
-            }}</view>
-            <view v-if="state.activity.startTime > new Date().getTime()">未开始</view>
-            <view v-else-if="state.activity.endTime <= new Date().getTime()">已结束</view>
-            <view v-else>
-              <view v-if="state.goodsInfo.stock === 0">已售罄</view>
-              <view v-else>立即开团</view>
-            </view>
-          </button>
-        </view>
-      </detail-tabbar>
-    </block>
-  </s-layout>
+		</block>
+	</s-layout>
 </template>
 
 <script setup>
-  import { reactive, computed } from 'vue';
-  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
-  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';
-  import detailSkeleton from './components/detail/detail-skeleton.vue';
-  import detailCommentCard from './components/detail/detail-comment-card.vue';
-  import detailContentCard from './components/detail/detail-content-card.vue';
-  import grouponCardList from './components/groupon/groupon-card-list.vue';
-  import { useDurationTime, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
-  import CombinationApi from '@/sheep/api/promotion/combination';
-  import SpuApi from '@/sheep/api/product/spu';
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		isEmpty
+	} from 'lodash';
+	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';
+	import detailSkeleton from './components/detail/detail-skeleton.vue';
+	import detailCommentCard from './components/detail/detail-comment-card.vue';
+	import detailContentCard from './components/detail/detail-content-card.vue';
+	import grouponCardList from './components/groupon/groupon-card-list.vue';
+	import {
+		useDurationTime,
+		formatGoodsSwiper,
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
+	import CombinationApi from '@/sheep/api/promotion/combination';
+	import SpuApi from '@/sheep/api/product/spu';
 
-  const headerBg = '';
-  const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
-  const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
-  const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
+	const headerBg = '';
+	const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
+	const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
+	const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
-  onPageScroll(() => {});
-  const state = reactive({
-    skeletonLoading: true, // 骨架屏
-    goodsId: 0, // 商品ID
-    goodsInfo: {}, // 商品信息
-    goodsSwiper: [], // 商品轮播图
-    showSelectSku: false, // 显示规格弹框
-    selectedSkuPrice: {}, // 选中的规格价格
-    activity: {}, // 团购活动
-    grouponId: 0, // 团购ID
-    grouponNum: 0, // 团购人数
-    grouponAction: 'create', // 团购操作
-    combinationHeadId: null, // 拼团团长编号
-  });
+	onPageScroll(() => {});
+	const state = reactive({
+		skeletonLoading: true, // 骨架屏
+		goodsId: 0, // 商品ID
+		goodsInfo: {}, // 商品信息
+		goodsSwiper: [], // 商品轮播图
+		showSelectSku: false, // 显示规格弹框
+		selectedSkuPrice: {}, // 选中的规格价格
+		activity: {}, // 团购活动
+		grouponId: 0, // 团购ID
+		grouponNum: 0, // 团购人数
+		grouponAction: 'create', // 团购操作
+		combinationHeadId: null, // 拼团团长编号
+	});
 
-  // 倒计时
-  const endTime = computed(() => {
-    return useDurationTime(state.activity.endTime);
-  });
+	// 倒计时
+	const endTime = computed(() => {
+		return useDurationTime(state.activity.endTime);
+	});
 
-  // 规格变更
-  function onSkuChange(e) {
-    state.selectedSkuPrice = e;
-  }
+	// 规格变更
+	function onSkuChange(e) {
+		state.selectedSkuPrice = e;
+	}
 
-  function onSkuClose() {
-    state.showSelectSku = false;
-  }
+	function onSkuClose() {
+		state.showSelectSku = false;
+	}
 
-  // 发起拼团
-  function onCreateGroupon() {
-    state.grouponAction = 'create';
-    state.grouponId = 0;
-    state.showSelectSku = true;
-  }
+	// 发起拼团
+	function onCreateGroupon() {
+		state.grouponAction = 'create';
+		state.grouponId = 0;
+		state.showSelectSku = true;
+	}
 
-  /**
-   * 去参团
-   * @param record 团长的团购记录
-   */
-  function onJoinGroupon(record) {
-    state.grouponAction = 'join';
-    state.grouponId = record.activityId;
-    state.combinationHeadId = record.id;
-    state.grouponNum = record.userSize;
-    state.showSelectSku = true;
-  }
+	/**
+	 * 去参团
+	 * @param record 团长的团购记录
+	 */
+	function onJoinGroupon(record) {
+		state.grouponAction = 'join';
+		state.grouponId = record.activityId;
+		state.combinationHeadId = record.id;
+		state.grouponNum = record.userSize;
+		state.showSelectSku = true;
+	}
 
-  // 立即购买
-  function onBuy(sku) {
-    sheep.$router.go('/pages/order/confirm', {
-      data: JSON.stringify({
-        order_type: 'goods',
-        combinationActivityId: state.activity.id,
-        combinationHeadId: state.combinationHeadId,
-        items: [
-          {
-            skuId: sku.id,
-            count: sku.count,
-          },
-        ],
-      }),
-    });
-  }
+	// 立即购买
+	function onBuy(sku) {
+		sheep.$router.go('/pages/order/confirm', {
+			data: JSON.stringify({
+				order_type: 'goods',
+				combinationActivityId: state.activity.id,
+				combinationHeadId: state.combinationHeadId,
+				items: [{
+					skuId: sku.id,
+					count: sku.count,
+				}, ],
+			}),
+		});
+	}
 
-  // 分享信息
-  // TODO @芋艿：分享的接入
-  const shareInfo = computed(() => {
-    if (isEmpty(state.activity)) return {};
-    return sheep.$platform.share.getShareInfo(
-      {
-        title: state.activity.name,
-        image: sheep.$url.cdn(state.goodsInfo.picUrl),
-        params: {
-          page: '3',
-          query: state.activity.id,
-        },
-      },
-      {
-        type: 'goods', // 商品海报
-        title: state.activity.name, // 商品标题
-        image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-        price: fen2yuan(state.goodsInfo.price), // 商品价格
-        marketPrice: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
-      },
-    );
-  });
+	// 分享信息
+	// TODO @芋艿：分享的接入
+	const shareInfo = computed(() => {
+		if (isEmpty(state.activity)) return {};
+		return sheep.$platform.share.getShareInfo({
+			title: state.activity.name,
+			image: sheep.$url.cdn(state.goodsInfo.picUrl),
+			params: {
+				page: '3',
+				query: state.activity.id,
+			},
+		}, {
+			type: 'goods', // 商品海报
+			title: state.activity.name, // 商品标题
+			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+			price: fen2yuan(state.goodsInfo.price), // 商品价格
+			marketPrice: fen2yuan(state.goodsInfo.marketPrice), // 商品原价
+		}, );
+	});
 
-  onLoad(async (options) => {
-    // 非法参数
-    if (!options.id) {
-      state.goodsInfo = null;
-      return;
-    }
-    state.grouponId = options.id;
-    // 加载活动信息
-    const { code, data: activity } = await CombinationApi.getCombinationActivity(state.grouponId);
-    state.activity = activity;
-    // 加载商品信息
-    const { data: spu } = await SpuApi.getSpuDetail(activity.spuId);
-    state.goodsId = spu.id;
-    activity.products.forEach((product) => {
-      spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
-    });
-    // 关闭骨架屏
-    state.skeletonLoading = false;
-    if (code === 0) {
-      state.goodsInfo = spu;
-      state.grouponNum = activity.userSize;
-      state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
-    } else {
-      // 未找到商品
-      state.goodsInfo = null;
-    }
-  });
+	onLoad(async (options) => {
+		// 非法参数
+		if (!options.id) {
+			state.goodsInfo = null;
+			return;
+		}
+		state.grouponId = options.id;
+		// 加载活动信息
+		const {
+			code,
+			data: activity
+		} = await CombinationApi.getCombinationActivity(state.grouponId);
+		state.activity = activity;
+		// 加载商品信息
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(activity.spuId);
+		state.goodsId = spu.id;
+		activity.products.forEach((product) => {
+			spu.price = Math.min(spu.price, product.combinationPrice); // 设置 SPU 的最低价格
+		});
+		// 关闭骨架屏
+		state.skeletonLoading = false;
+		if (code === 0) {
+			state.goodsInfo = spu;
+			state.grouponNum = activity.userSize;
+			state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
+		} else {
+			// 未找到商品
+			state.goodsInfo = null;
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
-	.new-kk{
-		display:flex;
-		aling-item:center;
+	.detail-cell-card {
+		// background-color: white;
 	}
-	.image{
+
+
+
+	.new-class {
+		top: -10px;
+		// z-index: 1;
+		position: relative;
+	}
+
+	.new-kk {
+		display: flex;
+		aling-item: center;
+	}
+
+	.image {
 		height: 142px;
 	}
-  .detail-card {
-    background-color: $white;
-    margin: 14rpx 20rpx;
-    border-radius: 10rpx;
-    overflow: hidden;
-	padding: 4px 0px;
-  }
-	.title-card.bj{
+
+	.detail-card {
+		background-color: rgba(246, 246, 246, 1);
+		margin: 0rpx 20rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+		padding: 4px 0px;
+	}
+
+	.title-card.bj {
 		background-image: url('data:image/png;base64,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');
 	}
-  // 价格标题卡片
-  .title-card {
-    width: 710rpx;
-    box-sizing: border-box;
-    // height: 320rpx;
-    background-size: 100% 100%;
-    border-radius: 10px;
-    background-repeat: no-repeat;
 
-    .price-box {
-      .price-text {
-        font-size: 24px;
-		    margin-left: 0.5rem;
-        font-weight: 500;
-        color: #ffffff;
-        line-height: normal;
-        font-family: OPPOSANS;
+	// 价格标题卡片
+	.title-card {
+		width: 100%;
+		box-sizing: border-box;
+		// height: 320rpx;
+		background-size: 100% 100%;
+		border-radius: 13px;
+		background-repeat: no-repeat;
+		margin: 0;
+		padding-bottom: 25px;
+		padding-top: 10px;
 
-        &::before {
-          content: '￥';
-          font-size: 30rpx;
-        }
-      }
-    }
-    .origin-price {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #ffffff;
-      opacity: 0.7;
-	  margin-left: 15px;
+		.price-box {
+			.price-text {
+				font-size: 24px;
+				margin-left: 0.5rem;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: normal;
+				font-family: OPPOSANS;
 
-      .origin-price-text {
-        text-decoration: line-through;
+				&::before {
+					content: '￥';
+					font-size: 30rpx;
+				}
+			}
+		}
 
-        font-family: OPPOSANS;
+		.origin-price {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #ffffff;
+			opacity: 0.7;
+			margin-left: 15px;
 
-        &::before {
-          content: '￥';
-        }
-      }
-    }
+			.origin-price-text {
+				text-decoration: line-through;
 
-    .tig {
-      border: 2rpx solid #ffffff;
-      border-radius: 4rpx;
-      width: 126rpx;
-      height: 38rpx;
+				font-family: OPPOSANS;
 
-      .tig-icon {
-        margin-left: -2rpx;
-        width: 40rpx;
-        height: 40rpx;
-        background: #ffffff;
-        border-radius: 4rpx 0 0 4rpx;
+				&::before {
+					content: '￥';
+				}
+			}
+		}
 
-        .groupon-tag {
-          width: 32rpx;
-          height: 32rpx;
-        }
-      }
+		.tig {
+			border: 2rpx solid #ffffff;
+			border-radius: 4rpx;
+			width: 126rpx;
+			height: 38rpx;
 
-      .tig-title {
-        font-size: 24rpx;
-        font-weight: 500;
-        line-height: normal;
-        color: #ffffff;
-        width: 86rpx;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    }
+			.tig-icon {
+				margin-left: -2rpx;
+				width: 40rpx;
+				height: 40rpx;
+				background: #ffffff;
+				border-radius: 4rpx 0 0 4rpx;
 
-    .countdown-title {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: black;
-    }
+				.groupon-tag {
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
 
-    .countdown-time {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #ffffff;
-      .countdown-h {
-        font-size: 24rpx;
-        font-family: OPPOSANS;
-        font-weight: 500;
-        color: #ffffff;
-        padding: 0 4rpx;
-        height: 40rpx;
-        background: rgba(#000000, 0.1);
-        border-radius: 6rpx;
-      }
-      .countdown-num {
-        font-size: 24rpx;
-        font-family: OPPOSANS;
-        font-weight: 500;
-        color: #ffffff;
-        width: 40rpx;
-        height: 40rpx;
-        background: rgba(#000000, 0.1);
-        border-radius: 6rpx;
-      }
-    }
+			.tig-title {
+				font-size: 24rpx;
+				font-weight: 500;
+				line-height: normal;
+				color: #ffffff;
+				width: 86rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
 
-    .title-text {
-      font-size: 30rpx;
-      font-weight: bold;
-      line-height: 42rpx;
-      color: black;
-    }
+		.countdown-title {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: black;
+		}
 
-    .subtitle-text {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: black;
-      line-height: 42rpx;
-      opacity: 0.9;
-    }
-  }
+		.countdown-time {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #ffffff;
 
-  // 购买
-  .buy-box {
-    .disabled-btn-box[disabled] {
-      background-color: transparent;
-    }
-    .check-btn-box {
-      width: 248rpx;
-      height: 80rpx;
-      font-size: 24rpx;
-      font-weight: 600;
-      margin-left: -36rpx;
-      background-image: url('@/static/images/groupon-btn.png');
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      color: #ffffff;
-      line-height: normal;
-      border-radius: 0px 40rpx 40rpx 0px;
-    }
-    .disabled-btn-box {
-      width: 248rpx;
-      height: 80rpx;
-      font-size: 24rpx;
-      font-weight: 600;
-      margin-left: -36rpx;
-      background-image: url('@/static/images/activity-btn-disabled.png');
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      color: #999999;
-      line-height: normal;
-      border-radius: 0px 40rpx 40rpx 0px;
-    }
+			.countdown-h {
+				font-size: 24rpx;
+				font-family: OPPOSANS;
+				font-weight: 500;
+				color: #ffffff;
+				padding: 0 4rpx;
+				height: 40rpx;
+				background: rgba(#000000, 0.1);
+				border-radius: 6rpx;
+			}
 
-    .origin-price-btn {
-      width: 236rpx;
-      height: 80rpx;
-      background: rgba(#ff5651, 0.1);
-      color: #ff6000;
-      border-radius: 40rpx 0px 0px 40rpx;
-      line-height: normal;
-      font-size: 24rpx;
-      font-weight: 500;
+			.countdown-num {
+				font-size: 24rpx;
+				font-family: OPPOSANS;
+				font-weight: 500;
+				color: #ffffff;
+				width: 40rpx;
+				height: 40rpx;
+				background: rgba(#000000, 0.1);
+				border-radius: 6rpx;
+			}
+		}
 
-      .btn-title {
-        font-size: 28rpx;
-      }
-    }
-    .btn-price {
-      font-family: OPPOSANS;
+		.title-text {
+			font-size: 30rpx;
+			font-weight: bold;
+			line-height: 42rpx;
+			color: black;
+		}
 
-      &::before {
-        content: '￥';
-      }
-    }
-    .more-item-box {
-      .more-item {
-        width: 156rpx;
-        height: 58rpx;
-        font-size: 26rpx;
-        font-weight: 500;
-        color: #999999;
-        border-radius: 10rpx;
-      }
-      .more-item-hover {
-        background: rgba(#ffefe5, 0.32);
-        color: #ff6000;
-      }
-    }
-  }
+		.subtitle-text {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: black;
+			line-height: 42rpx;
+			opacity: 0.9;
+		}
+	}
 
-  .groupon-box {
-    background: v-bind(grouponBg) no-repeat;
-    background-size: 100% 100%;
-  }
 
-  //活动卡片
-  .activity-box {
-    width: 100%;
-    height: 80rpx;
-    box-sizing: border-box;
-    margin-bottom: 10rpx;
 
-    .activity-title {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #ffffff;
-      line-height: 42rpx;
 
-      .activity-icon {
-        width: 38rpx;
-        height: 38rpx;
-      }
-    }
+	// 购买
+	.buy-box {
+		.disabled-btn-box[disabled] {
+			background-color: transparent;
+		}
 
-    .activity-go {
-      width: 70rpx;
-      height: 32rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      font-weight: 500;
-      color: #ff6000;
-      font-size: 24rpx;
-      line-height: normal;
-    }
-  }
+		.check-btn-box {
+			width: 248rpx;
+			height: 80rpx;
+			font-size: 24rpx;
+			font-weight: 600;
+			margin-left: -36rpx;
+			background-image: url('@/static/images/groupon-btn.png');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			color: #ffffff;
+			line-height: normal;
+			border-radius: 0px 40rpx 40rpx 0px;
+		}
 
-  .model-box {
-    .title {
-      font-size: 36rpx;
-      font-weight: bold;
-      color: #333333;
-    }
+		.disabled-btn-box {
+			width: 248rpx;
+			height: 80rpx;
+			font-size: 24rpx;
+			font-weight: 600;
+			margin-left: -36rpx;
+			background-image: url('@/static/images/activity-btn-disabled.png');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			color: #999999;
+			line-height: normal;
+			border-radius: 0px 40rpx 40rpx 0px;
+		}
 
-    .subtitle {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #333333;
-    }
-  }
+		.origin-price-btn {
+			width: 236rpx;
+			height: 80rpx;
+			background: rgba(#ff5651, 0.1);
+			color: #ff6000;
+			border-radius: 40rpx 0px 0px 40rpx;
+			line-height: normal;
+			font-size: 24rpx;
+			font-weight: 500;
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-  body{
-	  background:#f6f6f6 !important;
-  }
+			.btn-title {
+				font-size: 28rpx;
+			}
+		}
+
+		.btn-price {
+			font-family: OPPOSANS;
+
+			&::before {
+				content: '￥';
+			}
+		}
+
+		.more-item-box {
+			.more-item {
+				width: 156rpx;
+				height: 58rpx;
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #999999;
+				border-radius: 10rpx;
+			}
+
+			.more-item-hover {
+				background: rgba(#ffefe5, 0.32);
+				color: #ff6000;
+			}
+		}
+	}
+
+	.groupon-box {
+		background: v-bind(grouponBg) no-repeat;
+		background-size: 100% 100%;
+	}
+
+	//活动卡片
+	.activity-box {
+		width: 100%;
+		height: 80rpx;
+		box-sizing: border-box;
+		margin-bottom: 10rpx;
+
+		.activity-title {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #ffffff;
+			line-height: 42rpx;
+
+			.activity-icon {
+				width: 38rpx;
+				height: 38rpx;
+			}
+		}
+
+		.activity-go {
+			width: 70rpx;
+			height: 32rpx;
+			background: #ffffff;
+			border-radius: 16rpx;
+			font-weight: 500;
+			color: #ff6000;
+			font-size: 24rpx;
+			line-height: normal;
+		}
+	}
+
+	.model-box {
+		.title {
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.subtitle {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+	}
+
+	body {
+		background: #f6f6f6 !important;
+	}
 </style>
+
+
+
+<style scoped lang="scss">
+	.new-bottom {
+		position: relative;
+		top: -20px;
+	}
+
+	.new-groupon-card-list {
+		background-color: white;
+		border-radius: 13px;
+		margin: 0;
+		padding:0;
+	}
+
+	.new-detail-card {
+		background-color: white;
+		border-radius: 13px;
+		// margin-top: -17px;
+	}
+
+	.new-main {
+		position: relative;
+		top: -32px;
+		// z-index: 2;
+	}
+
+	.new-sub {
+		padding: 14px 13px;
+		// position: relative;
+		top: -31px;
+		// z-index: 2;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/goods/point.vue b/pages/goods/point.vue
index b5d44e3..8708b9a 100644
--- a/pages/goods/point.vue
+++ b/pages/goods/point.vue
@@ -96,7 +96,7 @@
           >
             <view class="price-box ss-flex">
               <image
-                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
                 style="width: 36rpx;height: 36rpx;margin: 0 4rpx;"
               ></image>
               <text class="point-text ss-m-r-16">
@@ -372,7 +372,7 @@
       font-size: 24rpx;
       font-weight: 600;
       margin-left: -36rpx;
-      background-image: v-bind(btnBg);
+      background-image: url('https://zysc.fjptzykj.com:3000/shangcheng/ae81b6671e07f250d4bbccc9707409e970cd5ecee9d4fd861fd0bb926812dda9.png');
       background-repeat: no-repeat;
       background-size: 100% 100%;
       color: #ffffff;
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 8b65f67..e9ca676 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -13,35 +13,42 @@
 				<!-- 商品图轮播 -->
 				<su-swiper class="ss-m-b-14" isPreview :list="state.goodsSwiper" dotStyle="tag" imageMode="widthFix"
 					dotCur="bg-mask-40" :seizeHeight="750" />
-
-				<!-- 价格+标题 -->
-				<view class="title-card bj ss-m-y-14 ss-m-x-20 ss-p-x-20 ss-p-y-34">
-					<view class="price-box ss-flex ss-row-between ss-m-b-18">
-						<view class="ss-flex">
-							<view class="tig ss-flex ss-col-center">
+				<view class="new-main">
+					<!-- 价格+标题 -->
+					<view class="title-card bj ss-m-y-14 ss-p-x-20">
+						<view class="price-box ss-flex ss-row-between ss-m-b-18">
+							<view class="ss-flex new-ss-flex">
+								<!-- <view class="tig ss-flex ss-col-center">
 								<view class="tig-icon ss-flex ss-col-center ss-row-center">
 									<text class="cicon-alarm"></text>
 								</view>
 								<view class="tig-title">秒杀价</view>
+							</view> -->
+								<view class="new-tig-title ss-m-r-16">秒杀价</view>
+								<view class="price-text ss-m-r-16">
+									{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+								</view>
+
+								<view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice">
+									
+									<view class="origin-price-text">
+										{{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
+									</view>
+								</view>
 							</view>
-							<view class="price-text ss-m-r-16">
-								{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+							<view class="countdown-box" v-if="endTime.ms > 0">
+								<view class="countdown-title">距结束仅剩</view>
+								<view class="ss-flex countdown-time">
+									<view class="ss-flex countdown-h">{{ endTime.h }}</view>
+									<view class="ss-m-x-4">:</view>
+									<view class="countdown-num ss-flex ss-row-center">{{ endTime.m }}</view>
+									<view class="ss-m-x-4">:</view>
+									<view class="countdown-num ss-flex ss-row-center">{{ endTime.s }}</view>
+								</view>
 							</view>
-							
+							<view class="countdown-title" v-else> 活动已结束 </view>
 						</view>
-						<view class="countdown-box" v-if="endTime.ms > 0">
-							<view class="countdown-title ss-m-b-20">距结束仅剩</view>
-							<view class="ss-flex countdown-time">
-								<view class="ss-flex countdown-h">{{ endTime.h }}</view>
-								<view class="ss-m-x-4">:</view>
-								<view class="countdown-num ss-flex ss-row-center">{{ endTime.m }}</view>
-								<view class="ss-m-x-4">:</view>
-								<view class="countdown-num ss-flex ss-row-center">{{ endTime.s }}</view>
-							</view>
-						</view>
-						<view class="countdown-title" v-else> 活动已结束 </view>
-					</view>
-					<view class="ss-flex ss-row-between ss-m-b-10">
+						<!-- <view class="ss-flex ss-row-between ss-m-b-10">
 						<view class="origin-price ss-flex ss-col-center" v-if="state.goodsInfo.marketPrice">
 							原价
 							<view class="origin-price-text">
@@ -49,59 +56,65 @@
 							</view>
 						</view>
 						<detail-progress :percent="state.percent" />
+					</view> -->
+					</view>
+					<view class="new-sub">
+						<view class="new-title">
+							<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo?.name }}</view>
+							<!-- <view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view> -->
+						</view>
+						<!-- 功能卡片 -->
+						<view class="detail-cell-card detail-card ss-flex-col">
+							<detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
+						</view>
+						<!-- 规格与数量弹框 -->
+						<s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
+							:single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
+							@close="state.showSelectSku = false" />
+
+
+						<!-- 评价 -->
+						<detail-comment-card class="detail-comment-selector" :goodsId="state.goodsInfo.id" />
+						<!-- 详情 -->
+						<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
+
+						<!-- 详情tabbar -->
+						<detail-tabbar v-model="state.goodsInfo">
+							<!-- TODO: 缺货中 已售罄 判断 设计-->
+							<view class="buy-box ss-flex ss-col-center ss-p-r-20">
+								<button class="ss-reset-button origin-price-btn ss-flex-col"
+									v-if="state.goodsInfo.marketPrice"
+									@tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
+									<view>
+										<view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
+										<view>原价购买</view>
+									</view>
+								</button>
+								<button v-else class="ss-reset-button origin-price-btn ss-flex-col">
+									<view class="no-original" :class="
+									state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''
+								  ">
+										秒杀价
+									</view>
+								</button>
+								<button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true"
+									:class="
+								  timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0
+									? 'check-btn-box'
+									: 'disabled-btn-box'
+								" :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED">
+									<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>立即秒杀</view>
+									</view>
+									<view v-else>{{ timeStatusEnum }}</view>
+								</button>
+							</view>
+						</detail-tabbar>
 					</view>
 				</view>
-				<view class="title-card ss-m-y-14 ss-m-x-20 ss-p-x-20 ss-p-y-34">
-					<view class="title-text ss-line-2 ss-m-b-6">{{ state.goodsInfo?.name }}</view>
-					<view class="subtitle-text ss-line-1">{{ state.goodsInfo.introduction }}</view>
-				</view>
-				<!-- 功能卡片 -->
-				<view class="detail-cell-card detail-card ss-flex-col">
-					<detail-cell-sku :sku="state.selectedSku" @tap="state.showSelectSku = true" />
-				</view>
-				<!-- 规格与数量弹框 -->
-				<s-select-seckill-sku v-model="state.goodsInfo" :show="state.showSelectSku"
-					:single-limit-count="activity.singleLimitCount" @buy="onBuy" @change="onSkuChange"
-					@close="state.showSelectSku = false" />
 			</view>
-
-			<!-- 评价 -->
-			<detail-comment-card class="detail-comment-selector" :goodsId="state.goodsInfo.id" />
-			<!-- 详情 -->
-			<detail-content-card class="detail-content-selector" :content="state.goodsInfo.description" />
-
-			<!-- 详情tabbar -->
-			<detail-tabbar v-model="state.goodsInfo">
-				<!-- TODO: 缺货中 已售罄 判断 设计-->
-				<view class="buy-box ss-flex ss-col-center ss-p-r-20">
-					<button class="ss-reset-button origin-price-btn ss-flex-col" v-if="state.goodsInfo.marketPrice"
-						@tap="sheep.$router.go('/pages/goods/index', { id: state.goodsInfo.id })">
-						<view>
-							<view class="btn-price">{{ fen2yuan(state.goodsInfo.marketPrice) }}</view>
-							<view>原价购买</view>
-						</view>
-					</button>
-					<button v-else class="ss-reset-button origin-price-btn ss-flex-col">
-						<view class="no-original" :class="
-                state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED ? '' : ''
-              ">
-							秒杀价
-						</view>
-					</button>
-					<button class="ss-reset-button btn-box ss-flex-col" @tap="state.showSelectSku = true" :class="
-              timeStatusEnum === TimeStatusEnum.STARTED && state.goodsInfo.stock != 0
-                ? 'check-btn-box'
-                : 'disabled-btn-box'
-            " :disabled="state.goodsInfo.stock === 0 || timeStatusEnum !== TimeStatusEnum.STARTED">
-						<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>立即秒杀</view>
-						</view>
-						<view v-else>{{ timeStatusEnum }}</view>
-					</button>
-				</view>
-			</detail-tabbar>
 		</block>
 	</s-layout>
 </template>
@@ -185,21 +198,21 @@
 
 	// 分享信息 TODO 芋艿：待接入
 	const shareInfo = computed(() => {
-		if (isEmpty(activity)) return {};
-		return sheep.$platform.share.getShareInfo({
-			title: activity.value.name,
-			image: sheep.$url.cdn(state.goodsInfo.picUrl),
-			params: {
-				page: '4',
-				query: activity.value.id,
-			},
-		}, {
-			type: 'goods', // 商品海报
-			title: activity.value.name, // 商品标题
-			image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
-			price: state.goodsInfo.price, // 商品价格
-			marketPrice: state.goodsInfo.marketPrice, // 商品原价
-		}, );
+		// if (isEmpty(activity)) return {};
+		// return sheep.$platform.share.getShareInfo({
+		// 	title: activity.value.name,
+		// 	image: sheep.$url.cdn(state.goodsInfo.picUrl),
+		// 	params: {
+		// 		page: '4',
+		// 		query: activity.value.id,
+		// 	},
+		// }, {
+		// 	type: 'goods', // 商品海报
+		// 	title: activity.value.name, // 商品标题
+		// 	image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图
+		// 	price: state.goodsInfo.price, // 商品价格
+		// 	marketPrice: state.goodsInfo.marketPrice, // 商品原价
+		// }, );
 	});
 
 	const activity = ref();
@@ -281,17 +294,22 @@
 
 	.title-card.bj {
 		background-image: url('data:image/png;base64,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');
+
 	}
 
 	// 价格标题卡片
 	.title-card {
-		width: 710rpx;
+		width: 100%;
 		box-sizing: border-box;
-		// height: 320rpx;
 		background-size: 100% 100%;
-		border-radius: 10rpx;
+		border-radius: 20px;
 		background-repeat: no-repeat;
-		background: white;
+		margin: 0;
+		padding-bottom: 28px;
+		padding-top: 10px;
+		// position: relative;
+		// top: -30px;
+
 		.price-box {
 			.price-text {
 				font-size: 30rpx;
@@ -356,9 +374,10 @@
 		}
 
 		.countdown-title {
-			font-size: 26rpx;
+			font-size: 20rpx;
 			font-weight: 500;
 			color: #ffffff;
+			text-align: center;
 		}
 
 		.countdown-time {
@@ -370,22 +389,28 @@
 				font-size: 24rpx;
 				font-family: OPPOSANS;
 				font-weight: 500;
-				color: #ffffff;
+				color: #ff4428;
 				padding: 0 4rpx;
-				height: 40rpx;
+				// height: 40rpx;
 				background: rgba(#000000, 0.1);
 				border-radius: 6rpx;
+				padding: 2px;
+				background: white;
+
 			}
 
 			.countdown-num {
 				font-size: 24rpx;
 				font-family: OPPOSANS;
 				font-weight: 500;
-				color: #ffffff;
-				width: 40rpx;
-				height: 40rpx;
+				color: #ff4428;
+				width: 35rpx;
+				// height: 40rpx;
 				background: rgba(#000000, 0.1);
 				border-radius: 6rpx;
+				border-radius: 6rpx;
+				padding: 2px;
+				background: white;
 			}
 		}
 
@@ -416,10 +441,10 @@
 		}
 
 		.title-text {
-			font-size: 30rpx;
+			font-size: 24px;
 			font-weight: bold;
 			line-height: 42rpx;
-			color: block;
+			color: black;
 		}
 
 		.subtitle-text {
@@ -549,4 +574,49 @@
 		width: 100%;
 		height: 100%;
 	}
+
+	.new-tig-title {
+		font-size: 12px;
+		color: white;
+	}
+
+	.price-text {
+		font-size: 24px !important;
+	}
+
+	::v-deep .ui-swiper .ui-swiper-dot.tag {
+		bottom: 35px !important;
+	}
+
+	.new-ss-flex {
+		align-items: baseline !important;
+	}
+
+	.new-title {
+		width: 100%;
+		
+		// top: -54px;
+		// position: relative;
+		
+		// height: 41px;
+		padding: 14px 13px;
+		    padding-bottom: 4px;
+	}
+
+	.new-main {
+		position: relative;
+		top: -29px;
+		.new-sub{
+			border-radius: 20px;
+			position: relative;
+			top: -29px;
+			background: #f6f6f6;
+		}
+	}
+	.title-text {
+		font-size: 16px;
+		font-weight: bold;
+		line-height: 42rpx;
+		color: black;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bde6bac..34aece9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,14 +1,22 @@
 <!-- 首页，支持店铺装修 -->
 <template>
   <view v-if="template">
+	
     <s-layout
       title="首页"
-      navbar="custom"
+      navbar="normal"
+	  tools="search"
       tabbar="/pages/index/index"
       :bgStyle="template.page"
       :navbarStyle="template.navigationBar"
       onShareAppMessage
+	   @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
+	   headerBtns='headerBtns'
+	   navbarbackgroundColor="rgba(248,83,42)"
+	   opacityBgUi='ll'
+	   :navBg="true"
     >
+	<view class="new-bg"></view>
       <s-block
         v-for="(item, index) in template.components"
         :key="index"
@@ -88,4 +96,11 @@
   onPageScroll(() => {});
 </script>
 
-<style></style>
+<style lang="scss">
+	.new-bg{
+		background:rgba(248,83,42);
+		width:100%;
+		height:50px;
+		position: absolute;
+	}
+</style>
diff --git a/pages/index/page.vue b/pages/index/page.vue
index b5d8ef3..ce97834 100644
--- a/pages/index/page.vue
+++ b/pages/index/page.vue
@@ -1,13 +1,6 @@
 <!-- 自定义页面：支持装修 -->
 <template>
-  <s-layout
-    :title="state.name"
-    navbar="custom"
-    :bgStyle="state.page"
-    :navbarStyle="state.navigationBar"
-    onShareAppMessage
-    showLeftButton
-  >
+  <s-layout navbar="normal" :bgStyle="{ color: '#FE832A'}">
     <s-block v-for="(item, index) in state.components" :key="index" :styles="item.property.style">
       <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
     </s-block>
diff --git a/pages/index/user.vue b/pages/index/user.vue
index 1cabb8d..98b0bf4 100644
--- a/pages/index/user.vue
+++ b/pages/index/user.vue
@@ -2,11 +2,21 @@
 <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 :type="item.id" :data="item.property" :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>
+		<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>
 
@@ -41,13 +51,40 @@
 	onPageScroll(() => {});
 </script>
 
-<style>
-	.new-main{
-		
+<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;
+		}
 	}
+
+	/* .new-main {} */
+
 	.seckill1 {
 		position: absolute;
-		top: 117px;
 		z-index: 22;
 		left: 50%;
 		transform: translateX(-50%);
@@ -62,4 +99,11 @@
 	view {
 		position: relative;
 	}
+	::v-deep .ss{
+		z-index: 99999;
+		&>view{
+			margin-top: 94px;
+		}
+	}
+	
 </style>
\ No newline at end of file
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 436f1f0..1203b9b 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -6,24 +6,24 @@
     <!-- 商品信息 -->
     <view class="order-card-box ss-m-b-14">
       <s-goods-item
-              v-for="item in state.orderInfo.items"
-              :key="item.skuId"
-              :img="item.picUrl"
-              :title="item.spuName"
-              :skuText="item.properties.map((property) => property.valueName).join(' ')"
-              :price="item.price"
-              :num="item.count"
-              marginBottom="10"
+        v-for="item in state.orderInfo.items"
+        :key="item.skuId"
+        :img="item.picUrl"
+        :title="item.spuName"
+        :skuText="item.properties.map((property) => property.valueName).join(' ')"
+        :price="item.price"
+        :num="item.count"
+        marginBottom="10"
       />
       <view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
         <view class="item-title">订单备注</view>
         <view class="ss-flex ss-col-center">
           <uni-easyinput
-                  maxlength="20"
-                  placeholder="建议留言前先与商家沟通"
-                  v-model="state.orderPayload.remark"
-                  :inputBorder="false"
-                  :clearable="false"
+            maxlength="20"
+            placeholder="建议留言前先与商家沟通"
+            v-model="state.orderPayload.remark"
+            :inputBorder="false"
+            :clearable="false"
           />
         </view>
       </view>
@@ -41,63 +41,94 @@
           </view>
         </view>
         <view
-                class="order-item ss-flex ss-col-center ss-row-between"
-                v-if="state.orderInfo.type === 0 && state.orderInfo.pointsStatus === 1"
+          v-if="state.orderPayload.pointActivityId"
+          class="order-item ss-flex ss-col-center ss-row-between"
+        >
+          <view class="item-title">兑换积分</view>
+          <view class="ss-flex ss-col-center">
+            <image
+              src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
+              class="score-img"
+            />
+            <text class="item-value ss-m-r-24">
+              {{ state.orderInfo.usePoint }}
+            </text>
+          </view>
+        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0 || state.orderPayload.pointActivityId"
         >
           <view class="item-title">积分抵扣</view>
           <view class="ss-flex ss-col-center">
-            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
+            {{ state.pointStatus || state.orderPayload.pointActivityId ? '剩余积分' : '当前积分' }}
             <image
-                    :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-                    class="score-img"
+              src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
+              class="score-img"
             />
             <text class="item-value ss-m-r-24">
-              {{ state.pointStatus ? state.orderInfo.totalPoint - state.orderInfo.usedPoint : (state.orderInfo.totalPoint || 0) }}
+              {{
+                state.pointStatus || state.orderPayload.pointActivityId
+                  ? state.orderInfo.totalPoint - state.orderInfo.usePoint
+                  : state.orderInfo.totalPoint || 0
+              }}
             </text>
-            <checkbox-group @change="changeIntegral">
-              <checkbox :checked='state.pointStatus' :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
+            <checkbox-group @change="changeIntegral" v-if="!state.orderPayload.pointActivityId">
+              <checkbox
+                :checked="state.pointStatus"
+                :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0"
+              />
             </checkbox-group>
           </view>
         </view>
         <!-- 快递配置时，信息的展示 -->
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 1'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 1"
+        >
           <view class="item-title">运费</view>
           <view class="ss-flex ss-col-center">
             <text class="item-value ss-m-r-24" v-if="state.orderInfo.price.deliveryPrice > 0">
               +￥{{ fen2yuan(state.orderInfo.price.deliveryPrice) }}
             </text>
-            <view class='item-value ss-m-r-24' v-else>免运费</view>
+            <view class="item-value ss-m-r-24" v-else>免运费</view>
           </view>
         </view>
         <!-- 门店自提时，需要填写姓名和手机号 -->
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 2"
+        >
           <view class="item-title">联系人</view>
           <view class="ss-flex ss-col-center">
             <uni-easyinput
-                    maxlength="20"
-                    placeholder="请填写您的联系姓名"
-                    v-model="addressState.receiverName"
-                    :inputBorder="false"
-                    :clearable="false"
+              maxlength="20"
+              placeholder="请填写您的联系姓名"
+              v-model="addressState.receiverName"
+              :inputBorder="false"
+              :clearable="false"
             />
           </view>
         </view>
-        <view class="order-item ss-flex ss-col-center ss-row-between" v-if='addressState.deliveryType === 2'>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="addressState.deliveryType === 2"
+        >
           <view class="item-title">联系电话</view>
           <view class="ss-flex ss-col-center">
             <uni-easyinput
-                    maxlength="20"
-                    placeholder="请填写您的联系电话"
-                    v-model="addressState.receiverMobile"
-                    :inputBorder="false"
-                    :clearable="false"
+              maxlength="20"
+              placeholder="请填写您的联系电话"
+              v-model="addressState.receiverMobile"
+              :inputBorder="false"
+              :clearable="false"
             />
           </view>
         </view>
         <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
         <view
-                class="order-item ss-flex ss-col-center ss-row-between"
-                v-if="state.orderInfo.type === 0"
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.type === 0"
         >
           <view class="item-title">优惠券</view>
           <view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
@@ -105,24 +136,29 @@
               -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
             </text>
             <text
-                    class="item-value"
-                    :class="state.couponInfo.length > 0 ? 'text-red' : 'text-disabled'"
-                    v-else
+              class="item-value"
+              :class="
+                state.couponInfo.filter((coupon) => coupon.match).length > 0
+                  ? 'text-red'
+                  : 'text-disabled'
+              "
+              v-else
             >
               {{
-              state.couponInfo.length > 0 ? state.couponInfo.length + ' 张可用' : '暂无可用优惠券'
+                state.couponInfo.filter((coupon) => coupon.match).length > 0
+                  ? state.couponInfo.filter((coupon) => coupon.match).length + ' 张可用'
+                  : '暂无可用优惠券'
               }}
             </text>
             <text class="_icon-forward item-icon" />
           </view>
         </view>
         <view
-                class="order-item ss-flex ss-col-center ss-row-between"
-                v-if="state.orderInfo.price.discountPrice > 0"
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.discountPrice > 0"
         >
           <view class="item-title">活动优惠</view>
-          <view class="ss-flex ss-col-center">
-            <!--                @tap="state.showDiscount = true" TODO 芋艿：后续要把优惠信息打进去 -->
+          <view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
             <text class="item-value text-red">
               -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
             </text>
@@ -130,8 +166,8 @@
           </view>
         </view>
         <view
-                class="order-item ss-flex ss-col-center ss-row-between"
-                v-if="state.orderInfo.price.vipPrice > 0"
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
         >
           <view class="item-title">会员优惠</view>
           <view class="ss-flex ss-col-center">
@@ -152,17 +188,17 @@
 
     <!-- 选择优惠券弹框 -->
     <s-coupon-select
-            v-model="state.couponInfo"
-            :show="state.showCoupon"
-            @confirm="onSelectCoupon"
-            @close="state.showCoupon = false"
+      v-model="state.couponInfo"
+      :show="state.showCoupon"
+      @confirm="onSelectCoupon"
+      @close="state.showCoupon = false"
     />
 
-    <!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
+    <!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
     <s-discount-list
-            v-model="state.orderInfo"
-            :show="state.showDiscount"
-            @close="state.showDiscount = false"
+      v-model="state.orderInfo"
+      :show="state.showDiscount"
+      @close="state.showDiscount = false"
     />
 
     <!-- 底部 -->
@@ -174,8 +210,8 @@
           </view>
         </view>
         <button
-                class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
-                @tap="onConfirm"
+          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
+          @tap="onConfirm"
         >
           提交订单
         </button>
@@ -185,12 +221,12 @@
 </template>
 
 <script setup>
-  import { reactive, ref } from 'vue';
+  import { reactive, ref, watch } from 'vue';
   import { onLoad } from '@dcloudio/uni-app';
   import AddressSelection from '@/pages/order/addressSelection.vue';
   import sheep from '@/sheep';
   import OrderApi from '@/sheep/api/trade/order';
-  import CouponApi from '@/sheep/api/promotion/coupon';
+  import TradeConfigApi from '@/sheep/api/trade/config';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
 
   const state = reactive({
@@ -208,8 +244,8 @@
 
   const addressState = ref({
     addressInfo: {}, // 选择的收货地址
-    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
-    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+    deliveryType: 1, // 收货方式：1-快递配送，2-门店自提
+    isPickUp: true, // 门店自提是否开启
     pickUpInfo: {}, // 选择的自提门店信息
     receiverName: '', // 收件人名称
     receiverMobile: '', // 收件人手机
@@ -226,7 +262,7 @@
 
   // 选择优惠券
   async function onSelectCoupon(couponId) {
-    state.orderPayload.couponId = couponId || 0;
+    state.orderPayload.couponId = couponId;
     await getOrderInfo();
     state.showCoupon = false;
   }
@@ -266,13 +302,14 @@
       remark: state.orderPayload.remark,
       deliveryType: addressState.value.deliveryType,
       addressId: addressState.value.addressInfo.id, // 收件地址编号
-      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
-      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
-      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
       pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
+      pointActivityId: state.orderPayload.pointActivityId,
     });
     if (code !== 0) {
       return;
@@ -283,9 +320,15 @@
     }
 
     // 跳转到支付页面
-    sheep.$router.redirect('/pages/pay/index', {
-      id: data.payOrderId,
-    });
+    if (data.payOrderId && data.payOrderId > 0) {
+      sheep.$router.redirect('/pages/pay/index', {
+        id: data.payOrderId,
+      });
+    } else {
+      sheep.$router.redirect('/pages/order/detail', {
+        id: data.id,
+      });
+    }
   }
 
   // 检查库存 & 计算订单价格
@@ -296,37 +339,26 @@
       couponId: state.orderPayload.couponId,
       deliveryType: addressState.value.deliveryType,
       addressId: addressState.value.addressInfo.id, // 收件地址编号
-      pickUpStoreId: addressState.value.pickUpInfo.id,//自提门店编号
-      receiverName: addressState.value.receiverName,// 选择门店自提时，该字段为联系人名
-      receiverMobile: addressState.value.receiverMobile,// 选择门店自提时，该字段为联系人手机
+      pickUpStoreId: addressState.value.pickUpInfo.id, //自提门店编号
+      receiverName: addressState.value.receiverName, // 选择门店自提时，该字段为联系人名
+      receiverMobile: addressState.value.receiverMobile, // 选择门店自提时，该字段为联系人手机
       pointStatus: state.pointStatus,
       combinationActivityId: state.orderPayload.combinationActivityId,
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
+      pointActivityId: state.orderPayload.pointActivityId,
     });
     if (code !== 0) {
       return;
     }
     state.orderInfo = data;
+    state.couponInfo = data.coupons || [];
     // 设置收货地址
     if (state.orderInfo.address) {
       addressState.value.addressInfo = state.orderInfo.address;
     }
   }
 
-  // 获取可用优惠券
-  async function getCoupons() {
-    const { code, data } = await CouponApi.getMatchCouponList(
-            state.orderInfo.price.payPrice,
-            state.orderInfo.items.map((item) => item.spuId),
-            state.orderPayload.items.map((item) => item.skuId),
-            state.orderPayload.items.map((item) => item.categoryId),
-    );
-    if (code === 0) {
-      state.couponInfo = data;
-    }
-  }
-
   onLoad(async (options) => {
     if (!options.data) {
       sheep.$helper.toast('参数不正确，请检查！');
@@ -334,7 +366,22 @@
     }
     state.orderPayload = JSON.parse(options.data);
     await getOrderInfo();
-    await getCoupons();
+    // 获取交易配置
+    const { data, code } = await TradeConfigApi.getTradeConfig();
+    if (code === 0) {
+      addressState.value.isPickUp = data.deliveryPickUpEnabled;
+    }
+  });
+
+  // 使用 watch 监听地址和配送方式的变化
+  watch(addressState, async (newAddress, oldAddress) => {
+    // 如果收货地址或配送方式有变化，则重新计算价格
+    if (
+      newAddress.addressInfo.id !== oldAddress.addressInfo.id ||
+      newAddress.deliveryType !== oldAddress.deliveryType
+    ) {
+      await getOrderInfo();
+    }
   });
 </script>
 
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 2541b38..8dc2545 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -42,7 +42,7 @@
 		<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,16 +68,7 @@
 
 		<!-- 用户组件：用户卡片 -->
 		<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" />
 		<!-- 用户组件：用户资产 -->
@@ -133,30 +124,7 @@
 	:deep(.uni-border-bottom){
 		  height:0;
 	}
-	.new-huiy{
-		width:100%;
-		height:100px;
-		.new-button{
-			background:white;
-			padding:8px;
-			text-align:center;
-			position: absolute;
-			border-radius: 20px;
-			right: 29px;
-			top: 31px;
-			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-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index e949ab6..3dd68c6 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -5,7 +5,7 @@
 		<!-- couponList -->
       <view
         class="coupon-item new-class"
-        :style="[couponBg, { marginLeft: `${data.space}px` }]"
+        :style="[item.canTake ? couponBg : couponBgFalse, { marginLeft: `${data.space}px` }]"
         v-for="(item, index) in couponList"
         :key="index"
       >
@@ -22,7 +22,7 @@
           <template v-slot:btn>
             <!-- 两列时，领取按钮坚排 -->
             <button
-              v-if="columns === 2"
+              v-if="item.canTake"
               @click.stop="onGetCoupon(item.id)"
               class="ss-reset-button card-btn vertical"
               :style="[btnStyles]"
@@ -33,9 +33,8 @@
               v-else
               class="ss-reset-button card-btn"
               :style="[btnStyles]"
-              @click.stop="onGetCoupon(item.id)"
             >
-              立即领取
+              已领取
             </button>
           </template>
         </su-coupon>
@@ -66,6 +65,11 @@
   const couponBg = {
     background: `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`,
   };
+  
+  const couponBgFalse = {
+	background: `url('https://zysc.fjptzykj.com:3000/shangcheng/94dfaa69257a102da3e28aa9b82cc7e04be5cea38555941972f6b5a3c2fc47a3.png') no-repeat top center / 100% 100%`,
+  };
+  
   const btnStyles = {
     background: button.bgColor,
     color: button.color,
@@ -140,15 +144,16 @@
 		margin-right: 2px !important;
 	}
   .card-btn {
-    width: 140rpx;
-    height: 50rpx;
+	  writing-mode: tb-rl;
+    width: 35px;
+    height: auto;
     border-radius: 25rpx;
     font-size: 24rpx;
     line-height: 50rpx;
     &.vertical {
       width: 50rpx;
       height: 140rpx;
-      margin: auto 20rpx auto 0;
+      margin: 0;
 
       .btn-text {
         font-size: 24rpx;
diff --git a/sheep/components/s-empty/s-empty.vue b/sheep/components/s-empty/s-empty.vue
index 27f8c4a..a0f9cd6 100644
--- a/sheep/components/s-empty/s-empty.vue
+++ b/sheep/components/s-empty/s-empty.vue
@@ -3,8 +3,8 @@
     class="ss-flex-col ss-col-center ss-row-center empty-box"
     :style="[{ paddingTop: paddingTop + 'rpx' }]"
   >
-    <view class=""><image class="empty-icon" :src="icon" mode="widthFix"></image></view>
-    <view class="empty-text ss-m-t-28 ss-m-b-40">
+    <!-- <view class=""><image class="empty-icon" :src="icon" mode="widthFix"></image></view> -->
+    <view class="empty-text ss-m-b-40">
       <text v-if="text !== ''">{{ text }}</text>
     </view>
     <button class="ss-reset-button empty-btn" v-if="showAction" @tap="clickAction">
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index a9e12da..00e6e2e 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -11,11 +11,7 @@
       <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>
+      <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"
@@ -27,13 +23,40 @@
         >
           {{ 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 }]"
         >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <!-- 活动价格 -->
+          <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>
@@ -60,13 +83,40 @@
         >
           {{ 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 }]"
         >
-          <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-          {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+          <!-- 活动价格 -->
+          <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>
@@ -74,13 +124,9 @@
     <!-- 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>
+        <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"
-      ></image>
+      <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"
@@ -110,16 +156,42 @@
             </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 }]"
           >
-            <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+            <!-- 活动价格 -->
+            <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) &&
@@ -155,7 +227,7 @@
       <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="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>
@@ -163,8 +235,8 @@
         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 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"
@@ -189,21 +261,44 @@
               </view>
             </view>
           </slot>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
+          <!-- 活动信息 -->
+          <view class="iconBox" v-if="data.promotionType > 0 || data.rewardActivity">
+            <view class="card" v-if="discountText">{{ discountText }}</view>
             <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 }]"
+              class="card2"
+              v-for="item in getRewardActivityRuleItemDescriptions(data.rewardActivity).slice(0, 1)"
+              :key="item"
             >
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              {{ 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-flex ss-col-bottom font-OPPOSANS"
+              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
               :style="[{ color: originPriceColor }]"
             >
               <text class="price-unit ss-font-20">{{ priceUnit }}</text>
@@ -217,22 +312,20 @@
       </view>
 
       <slot name="cart">
-        <view class="buy-box ss-flex ss-col-center ss-row-center" v-if="buttonShow"> 去购买 </view>
+        <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>
+        <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"
-      ></image>
-
+      />
       <view class="sl-goods-content">
         <view>
           <view
@@ -262,10 +355,37 @@
               </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 }]">
-              <text class="price-unit ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+              <!-- 活动价格 -->
+              <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="
@@ -285,9 +405,9 @@
         </view>
       </view>
 
-      <slot name="cart"
-        ><view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view></slot
-      >
+      <slot name="cart">
+        <view class="buy-box ss-flex ss-col-center ss-row-center">去购买</view>
+      </slot>
     </view>
   </view>
 </template>
@@ -297,39 +417,41 @@
    * 商品卡片
    *
    * @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 {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									- 销售数量颜色
+   * @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 										- 点击卡片
+   * @event {Function()} click                    - 点击卡片
    *
    */
-  import { computed, reactive, getCurrentInstance, onMounted, nextTick } from 'vue';
+  import { computed, getCurrentInstance, nextTick, onMounted } 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';
-
-  // 数据
-  const state = reactive({});
+  import {
+    fen2yuan,
+    formatExchange,
+    formatSales,
+    formatStock,
+    getRewardActivityRuleItemDescriptions,
+  } from '@/sheep/hooks/useGoods';
+  import { isArray } from 'lodash-es';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
 
   // 接收参数
   const props = defineProps({
@@ -338,27 +460,39 @@
       default() {
         return {
           // 商品价格
-          price: { show: true },
+          price: {
+            show: true,
+          },
           // 库存
-          stock: { show: true },
+          stock: {
+            show: true,
+          },
           // 商品名称
-          name: { show: true },
+          name: {
+            show: true,
+          },
           // 商品介绍
-          introduction: { show: true },
+          introduction: {
+            show: true,
+          },
           // 市场价
-          marketPrice: { show: true },
+          marketPrice: {
+            show: true,
+          },
           // 销量
-          salesCount: { show: true },
+          salesCount: {
+            show: true,
+          },
         };
       },
     },
     tagStyle: {
       type: Object,
-      default: {},
+      default: () => ({}),
     },
     data: {
       type: Object,
-      default: {},
+      default: () => ({}),
     },
     size: {
       type: String,
@@ -418,6 +552,17 @@
     },
   });
 
+  // 优惠文案
+  const discountText = computed(() => {
+    const promotionType = props.data.promotionType;
+    if (promotionType === 4) {
+      return '限时优惠';
+    } else if (promotionType === 6) {
+      return '会员价';
+    }
+    return undefined;
+  });
+
   // 组件样式
   const elStyles = computed(() => {
     return {
@@ -433,10 +578,18 @@
   const salesAndStock = computed(() => {
     let text = [];
     if (props.goodsFields.salesCount?.show) {
-      text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
+      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) {
-      text.push(formatStock(props.data.stock_show_type, props.data.stock));
+      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(' | ');
   });
@@ -451,10 +604,14 @@
   // 获取卡片实时高度
   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.select(`#${elId}`).fields({
+        size: true,
+        scrollOffset: true,
+      });
       view.exec((data) => {
         let totalHeight = 0;
         const goodsPriceCard = data[0];
@@ -469,6 +626,7 @@
       });
     }
   }
+
   onMounted(() => {
     nextTick(() => {
       getGoodsPriceCardWH();
@@ -482,12 +640,13 @@
     left: 0;
     top: 0;
     z-index: 2;
+
     .tag-icon {
       width: 72rpx;
       height: 44rpx;
-	  border-radius:8px;
     }
   }
+
   .seckill-tag {
     position: absolute;
     left: 0;
@@ -502,6 +661,13 @@
     color: #ffffff;
     line-height: 32rpx;
   }
+
+  .point-img {
+    width: 30rpx;
+    height: 30rpx;
+    margin: 0 4rpx;
+  }
+
   .groupon-tag {
     position: absolute;
     left: 0;
@@ -516,14 +682,17 @@
     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;
@@ -581,19 +750,18 @@
     // width: 100%;
     background-color: $white;
     position: relative;
-	padding: 0 10px;
-	    padding-top: 10px;
 
     .sm-img-box {
       // width: 228rpx;
       width: 100%;
       height: 208rpx;
-	  border-radius:8px;
     }
+
     .sm-goods-content {
       padding: 20rpx 16rpx;
       box-sizing: border-box;
     }
+
     .sm-goods-title {
       font-size: 26rpx;
       color: #333;
@@ -608,8 +776,7 @@
   // md
   .md-goods-card {
     overflow: hidden;
-    width: auto;
-	    padding: 10px 10px;
+    width: 100%;
     position: relative;
     z-index: 1;
     background-color: $white;
@@ -624,6 +791,7 @@
       color: #333;
       width: 100%;
     }
+
     .md-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -659,12 +827,14 @@
     position: relative;
     z-index: 1;
     background-color: $white;
-    height: 280rpx;
-
+    // height: 280rpx;
+	border-radius:10px !important;
+	padding: 10px;
     .lg-img-box {
-      width: 280rpx;
-      height: 280rpx;
+      width: 180rpx;
+      height: 180rpx;
       margin-right: 20rpx;
+	  border-radius:10px;
     }
 
     .lg-goods-title {
@@ -674,6 +844,7 @@
       // line-height: 36rpx;
       // width: 410rpx;
     }
+
     .lg-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -700,6 +871,7 @@
       font-size: 24rpx;
       color: #ffffff;
     }
+
     .tag-box {
       width: 100%;
     }
@@ -713,10 +885,12 @@
     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;
@@ -727,6 +901,7 @@
       color: #333;
       font-weight: 500;
     }
+
     .sl-goods-subtitle {
       font-size: 24rpx;
       font-weight: 400;
@@ -753,4 +928,33 @@
       color: #ffffff;
     }
   }
+
+  .card {
+    width: fit-content;
+    height: fit-content;
+    padding: 2rpx 10rpx;
+    background-color: red;
+    color: #ffffff;
+    font-size: 24rpx;
+    margin-top: 5rpx;
+  }
+
+  .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;
+  }
 </style>
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 35b8a71..6561d3b 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -213,6 +213,7 @@
 	.goods-sm-box {
 		margin: 0 auto;
 		box-sizing: border-box;
+		padding: 0 10px;
 
 		.goods-card-box {
 			flex-shrink: 0;
diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue
index 079d265..07f4230 100644
--- a/sheep/components/s-layout/s-layout.vue
+++ b/sheep/components/s-layout/s-layout.vue
@@ -14,6 +14,9 @@
         :opacityBgUi="opacityBgUi"
         @search="(e) => emits('search', e)"
         :defaultSearch="defaultSearch"
+		:headerBtns = "headerBtns" 
+		:backgroundColor="navbarbackgroundColor"
+		:navBg="navBg"
       />
 
       <!-- 顶部导航栏-情况2：装修组件导航栏-标准 -->
@@ -73,6 +76,14 @@
       type: String,
       default: '',
     },
+	headerBtns: {
+		type: String,
+		default: '',
+	},
+	navbarbackgroundColor:{
+		type: String,
+		default: '',
+	},
     navbar: {
       type: String,
       default: 'normal',
@@ -136,6 +147,10 @@
       type: Boolean,
       default: false,
     },
+	navBg: {
+	  type: Boolean,
+	  default: false,
+	},
   });
   const emits = defineEmits(['search']);
 
diff --git a/sheep/components/s-point-block/s-point-block.vue b/sheep/components/s-point-block/s-point-block.vue
index 9de154c..0845269 100644
--- a/sheep/components/s-point-block/s-point-block.vue
+++ b/sheep/components/s-point-block/s-point-block.vue
@@ -1,328 +1,291 @@
 <!-- 装修商品组件：【积分商城】商品卡片 -->
 <template>
-  <!-- 商品卡片 -->
-  <view>
-    <!-- 布局1. 单列大图（上图，下内容）-->
-    <view
-      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
-      class="goods-sl-box"
-    >
-      <view
-        class="goods-box"
-        v-for="item in state.spuList"
-        :key="item.id"
-        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
-      >
-        <s-goods-column
-          class=""
-          size="sl"
-          :goodsFields="data.fields"
-          :tagStyle="data.badge"
-          :data="item"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
-        >
-          <!-- 购买按钮 -->
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
+	<!-- 商品卡片 -->
+	<view>
+		<!-- 布局1. 单列大图（上图，下内容）-->
+		<view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length" class="goods-sl-box">
+			<view class="goods-box" v-for="item in state.spuList" :key="item.id"
+				:style="[{ marginBottom: data.space * 2 + 'rpx' }]">
+				<s-goods-column class="" size="sl" :goodsFields="data.fields" :tagStyle="data.badge" :data="item"
+					:titleColor="data.fields.name?.color" :subTitleColor="data.fields.introduction.color"
+					:topRadius="data.borderRadiusTop" :bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/point', { id: item.activityId })">
+					<!-- 购买按钮 -->
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
 
-    <!-- 布局2. 单列小图（左图，右内容） -->
-    <view
-      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
-      class="goods-lg-box"
-    >
-      <view
-        class="goods-box"
-        :style="[{ marginBottom: data.space + 'px' }]"
-        v-for="item in state.spuList"
-        :key="item.id"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="lg"
-          :goodsFields="data.fields"
-          :data="item"
-          :tagStyle="data.badge"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @tap="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
-        >
-          <!-- 购买按钮 -->
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
+		<!-- 布局2. 单列小图（左图，右内容） -->
+		<view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length" class="goods-lg-box">
+			<view class="goods-box" :style="[{ marginBottom: data.space + 'px' }]" v-for="item in state.spuList"
+				:key="item.id">
+				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :data="item"
+					:tagStyle="data.badge" :titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@tap="sheep.$router.go('/pages/goods/point', { id: item.activityId })">
+					<!-- 购买按钮 -->
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
 
-    <!-- 布局3. 双列（每一列：上图，下内容）-->
-    <view
-      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
-      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
-    >
-      <view class="goods-list-box">
-        <view
-          class="left-list"
-          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.leftSpuList"
-          :key="item.id"
-        >
-          <s-goods-column
-            class="goods-md-box"
-            size="md"
-            :goodsFields="data.fields"
-            :tagStyle="data.badge"
-            :data="item"
-            :titleColor="data.fields.name?.color"
-            :subTitleColor="data.fields.introduction.color"
-            :topRadius="data.borderRadiusTop"
-            :bottomRadius="data.borderRadiusBottom"
-            :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
-            @getHeight="calculateGoodsColumn($event, 'left')"
-          >
-            <!-- 购买按钮 -->
-            <template v-slot:cart>
-              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-      </view>
-      <view class="goods-list-box">
-        <view
-          class="right-list"
-          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.rightSpuList"
-          :key="item.id"
-        >
-          <s-goods-column
-            class="goods-md-box"
-            size="md"
-            :goodsFields="data.fields"
-            :tagStyle="data.badge"
-            :data="item"
-            :titleColor="data.fields.name?.color"
-            :subTitleColor="data.fields.introduction.color"
-            :topRadius="data.borderRadiusTop"
-            :bottomRadius="data.borderRadiusBottom"
-            :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
-            @getHeight="calculateGoodsColumn($event, 'right')"
-          >
-            <!-- 购买按钮 -->
-            <template v-slot:cart>
-              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-      </view>
-    </view>
-  </view>
+		<!-- 布局3. 双列（每一列：上图，下内容）-->
+		<view v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
+			class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top">
+			<view class="goods-list-box">
+				<view class="left-list" :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+					v-for="item in state.leftSpuList" :key="item.id">
+					<s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
+						:data="item" :titleColor="data.fields.name?.color"
+						:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+						:bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
+						@click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
+						@getHeight="calculateGoodsColumn($event, 'left')">
+						<!-- 购买按钮 -->
+						<template v-slot:cart>
+							<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+								{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+			</view>
+			<view class="goods-list-box">
+				<view class="right-list" :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+					v-for="item in state.rightSpuList" :key="item.id">
+					<s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
+						:data="item" :titleColor="data.fields.name?.color"
+						:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+						:bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
+						@click="sheep.$router.go('/pages/goods/point', { id: item.activityId })"
+						@getHeight="calculateGoodsColumn($event, 'right')">
+						<!-- 购买按钮 -->
+						<template v-slot:cart>
+							<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+								{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 商品卡片
-   */
-  import { computed, onMounted, reactive, ref } from 'vue';
-  import sheep from '@/sheep';
-  import SpuApi from '@/sheep/api/product/spu';
-  import PointApi from '@/sheep/api/promotion/point';
-  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+	/**
+	 * 商品卡片
+	 */
+	import {
+		computed,
+		onMounted,
+		reactive,
+		ref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SpuApi from '@/sheep/api/product/spu';
+	import PointApi from '@/sheep/api/promotion/point';
+	import {
+		PromotionActivityTypeEnum
+	} from '@/sheep/util/const';
 
-  // 布局类型
-  const LayoutTypeEnum = {
-    // 单列大图
-    ONE_COL_BIG_IMG: 'oneColBigImg',
-    // 双列
-    TWO_COL: 'twoCol',
-    // 单列小图
-    ONE_COL_SMALL_IMG: 'oneColSmallImg',
-  };
+	// 布局类型
+	const LayoutTypeEnum = {
+		// 单列大图
+		ONE_COL_BIG_IMG: 'oneColBigImg',
+		// 双列
+		TWO_COL: 'twoCol',
+		// 单列小图
+		ONE_COL_SMALL_IMG: 'oneColSmallImg',
+	};
 
-  const state = reactive({
-    spuList: [],
-    leftSpuList: [],
-    rightSpuList: [],
-  });
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-  });
+	const state = reactive({
+		spuList: [],
+		leftSpuList: [],
+		rightSpuList: [],
+	});
+	const props = defineProps({
+		data: {
+			type: Object,
+			default () {},
+		},
+		styles: {
+			type: Object,
+			default () {},
+		},
+	});
 
-  const { layoutType, btnBuy, activityIds } = props.data || {};
-  const { marginLeft, marginRight } = props.styles || {};
+	const {
+		layoutType,
+		btnBuy,
+		activityIds
+	} = props.data || {};
+	const {
+		marginLeft,
+		marginRight
+	} = props.styles || {};
 
-  // 购买按钮样式
-  const buyStyle = computed(() => {
-    if (btnBuy.type === 'text') {
-      // 文字按钮：线性渐变背景颜色
-      return {
-        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-      };
-    }
-    if (btnBuy.type === 'img') {
-      // 图片按钮
-      return {
-        width: '54rpx',
-        height: '54rpx',
-        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-        backgroundSize: '100% 100%',
-      };
-    }
-  });
+	// 购买按钮样式
+	const buyStyle = computed(() => {
+		if (btnBuy.type === 'text') {
+			// 文字按钮：线性渐变背景颜色
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
+		if (btnBuy.type === 'img') {
+			// 图片按钮
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
 
-  //region 商品瀑布流布局
-  // 下一个要处理的商品索引
-  let count = 0;
-  // 左列的高度
-  let leftHeight = 0;
-  // 右列的高度
-  let rightHeight = 0;
+	//region 商品瀑布流布局
+	// 下一个要处理的商品索引
+	let count = 0;
+	// 左列的高度
+	let leftHeight = 0;
+	// 右列的高度
+	let rightHeight = 0;
 
-  /**
-   * 计算商品在左列还是右列
-   * @param height 商品的高度
-   * @param where 添加到哪一列
-   */
-  function calculateGoodsColumn(height = 0, where = 'left') {
-    // 处理完
-    if (!state.spuList[count]) return;
-    // 增加列的高度
-    if (where === 'left') leftHeight += height;
-    if (where === 'right') rightHeight += height;
-    // 添加到矮的一列
-    if (leftHeight <= rightHeight) {
-      state.leftSpuList.push(state.spuList[count]);
-    } else {
-      state.rightSpuList.push(state.spuList[count]);
-    }
-    // 计数
-    count++;
-  }
+	/**
+	 * 计算商品在左列还是右列
+	 * @param height 商品的高度
+	 * @param where 添加到哪一列
+	 */
+	function calculateGoodsColumn(height = 0, where = 'left') {
+		// 处理完
+		if (!state.spuList[count]) return;
+		// 增加列的高度
+		if (where === 'left') leftHeight += height;
+		if (where === 'right') rightHeight += height;
+		// 添加到矮的一列
+		if (leftHeight <= rightHeight) {
+			state.leftSpuList.push(state.spuList[count]);
+		} else {
+			state.rightSpuList.push(state.spuList[count]);
+		}
+		// 计数
+		count++;
+	}
 
-  //endregion
+	//endregion
 
-  /**
-   * 根据商品编号列表，获取商品列表
-   * @param ids 商品编号列表
-   * @return {Promise<undefined>} 商品列表
-   */
-  async function getPointActivityDetailList(ids) {
-    const { data } = await PointApi.getPointActivityListByIds(ids);
-    return data;
-  }
+	/**
+	 * 根据商品编号列表，获取商品列表
+	 * @param ids 商品编号列表
+	 * @return {Promise<undefined>} 商品列表
+	 */
+	async function getPointActivityDetailList(ids) {
+		const {
+			data
+		} = await PointApi.getPointActivityListByIds(ids);
+		return data;
+	}
 
-  /**
-   * 根据商品编号，获取商品详情
-   * @param ids 商品编号列表
-   * @return {Promise<undefined>} 商品列表
-   */
-  async function getSpuDetail(ids) {
-    const { data: spu } = await SpuApi.getSpuDetail(ids);
-    return spu;
-  }
+	/**
+	 * 根据商品编号，获取商品详情
+	 * @param ids 商品编号列表
+	 * @return {Promise<undefined>} 商品列表
+	 */
+	async function getSpuDetail(ids) {
+		const {
+			data: spu
+		} = await SpuApi.getSpuDetail(ids);
+		return spu;
+	}
 
-  // 初始化
-  onMounted(async () => {
-    // 加载活动列表
-    const activityList = await getPointActivityDetailList(activityIds.join(','));
-    // 循环获取活动商品SPU详情并添加到spuList
-    for (const activity of activityList) {
-      state.spuList.push(await getSpuDetail(activity.spuId));
-    }
+	// 初始化
+	onMounted(async () => {
+		// 加载活动列表
+		const activityList = await getPointActivityDetailList(activityIds.join(','));
+		// 循环获取活动商品SPU详情并添加到spuList
+		for (const activity of activityList) {
+			state.spuList.push(await getSpuDetail(activity.spuId));
+		}
 
-    // 循环活动列表
-    activityList.forEach((activity) => {
-      // 查找对应的 spu 并更新价格
-      const spu = state.spuList.find((spu) => activity.spuId === spu.id);
-      if (spu) {
-        spu.pointStock = activity.stock
-        spu.pointTotalStock = activity.totalStock
-        spu.point = activity.point
-        spu.pointPrice = activity.price
-        // 赋值活动ID，为了点击跳转详情页
-        spu.activityId = activity.id;
-        // 赋值活动类型
-        spu.activityType = PromotionActivityTypeEnum.POINT.type;
-      }
-    });
+		// 循环活动列表
+		activityList.forEach((activity) => {
+			// 查找对应的 spu 并更新价格
+			const spu = state.spuList.find((spu) => activity.spuId === spu.id);
+			if (spu) {
+				spu.pointStock = activity.stock
+				spu.pointTotalStock = activity.totalStock
+				spu.point = activity.point
+				spu.pointPrice = activity.price
+				// 赋值活动ID，为了点击跳转详情页
+				spu.activityId = activity.id;
+				// 赋值活动类型
+				spu.activityType = PromotionActivityTypeEnum.POINT.type;
+			}
+		});
 
-    // 只有双列布局时需要
-    if (layoutType === LayoutTypeEnum.TWO_COL) {
-      // 分列
-      calculateGoodsColumn();
-    }
-  });
+		// 只有双列布局时需要
+		if (layoutType === LayoutTypeEnum.TWO_COL) {
+			// 分列
+			calculateGoodsColumn();
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
-  .goods-md-wrap {
-    width: 100%;
-  }
+	.goods-md-wrap {
+		width: 100%;
+	}
 
-  .goods-list-box {
-    width: 50%;
-    box-sizing: border-box;
+	.goods-list-box {
+		width: 50%;
+		box-sizing: border-box;
 
-    .left-list {
-      &:nth-last-child(1) {
-        margin-bottom: 0 !important;
-      }
-    }
+		.left-list {
+			&:nth-last-child(1) {
+				margin-bottom: 0 !important;
+			}
+		}
 
-    .right-list {
-      &:nth-last-child(1) {
-        margin-bottom: 0 !important;
-      }
-    }
-  }
+		.right-list {
+			&:nth-last-child(1) {
+				margin-bottom: 0 !important;
+			}
+		}
+	}
 
-  .goods-box {
-    &:nth-last-of-type(1) {
-      margin-bottom: 0 !important;
-    }
-  }
+	.goods-box {
+		&:nth-last-of-type(1) {
+			margin-bottom: 0 !important;
+		}
+	}
 
-  .goods-md-box,
-  .goods-sl-box,
-  .goods-lg-box {
-    position: relative;
+	.goods-md-box,
+	.goods-sl-box,
+	.goods-lg-box {
+		position: relative;
 
-    .cart-btn {
-      position: absolute;
-      bottom: 18rpx;
-      right: 20rpx;
-      z-index: 11;
-      height: 50rpx;
-      line-height: 50rpx;
-      padding: 0 20rpx;
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #fff;
-    }
-  }
-</style>
+		.cart-btn {
+			position: absolute;
+			bottom: 18rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 3314108..aa08fd2 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -336,7 +336,7 @@
 	.goods-sm-box {
 		margin: 0 auto;
 		box-sizing: border-box;
-
+		padding:0 10px;
 		.goods-card-box {
 			flex-shrink: 0;
 			overflow: hidden;
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 789d464..ebfded8 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
@@ -11,8 +11,8 @@
             mode="aspectFill"
           />
         </view>
-        <view class="header-right ss-flex-col ss-row-between ss-flex-1">
-          <view class="goods-title ss-line-2">
+        <view class="header-right ss-flex-col ss-flex-1">
+         <!-- <view class="goods-title ss-line-2">
             <view class="tig ss-flex ss-col-center">
               <view class="tig-icon ss-flex ss-col-center ss-row-center">
                 <view class="groupon-tag">
@@ -24,14 +24,17 @@
             <view class="info-title">
               {{ goodsInfo.name }}
             </view>
-          </view>
+          </view> -->
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
             <view class="price-text"> {{ fen2yuan(goodsInfo.price) }}</view>
 
-            <view class="stock-text ss-m-l-20">
-              库存{{ state.selectedSku.stock || goodsInfo.stock }}件
-            </view>
           </view>
+		  <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
+		  
+		    <view class="stock-text">
+		      限量:{{ state.selectedSku.stock || goodsInfo.stock }}
+		    </view>
+		  </view>
         </view>
       </view>
       <view class="modal-content ss-flex-1">
@@ -427,7 +430,7 @@
       }
 
       .price-text {
-        font-size: 30rpx;
+        font-size: 48rpx;
         font-weight: 500;
         color: $red;
         font-family: OPPOSANS;
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 5f0b90d..1233cbf 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
@@ -5,7 +5,7 @@
     <!-- SKU 信息 -->
     <view class="ss-modal-box bg-white ss-flex-col">
       <view class="modal-header ss-flex ss-col-center">
-        <!-- 规格图 -->
+        <!-- 规格图片 -->
         <view class="header-left ss-m-r-30">
           <image
             class="sku-image"
@@ -19,8 +19,19 @@
           <view class="goods-title ss-line-2">{{ state.goodsInfo.name }}</view>
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
             <!-- 价格 -->
-            <view class="price-text">
-              {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+            <view v-if="state.goodsInfo.activity_type === PromotionActivityTypeEnum.POINT.type"
+                  class="price-text ss-flex">
+              <image
+                v-if="!isEmpty(state.selectedSku)"
+                src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
+                class="point-img"
+              ></image>
+              <text class="point-text ss-m-r-16">
+                {{ getShowPriceText }}
+              </text>
+            </view>
+            <view v-else class="price-text">
+              ￥{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
             </view>
             <!-- 秒杀价格标签 -->
             <view class="tig ss-flex ss-col-center">
@@ -92,12 +103,15 @@
   import { computed, reactive, watch } from 'vue';
   import sheep from '@/sheep';
   import { convertProductPropertyList, fen2yuan } from '@/sheep/hooks/useGoods';
-  import { min } from 'lodash';
+  import { isEmpty, min } from 'lodash-es';
+  import { PromotionActivityTypeEnum } from '@/sheep/util/const';
+
   const emits = defineEmits(['change', 'addCart', 'buy', 'close']);
   const props = defineProps({
     modelValue: {
       type: Object,
-      default() {},
+      default() {
+      },
     },
     show: {
       type: Boolean,
@@ -114,7 +128,14 @@
     selectedSku: {},
     currentPropertyArray: [],
   });
-
+  const getShowPriceText = computed(() => {
+    let priceText = `￥${fen2yuan(state.goodsInfo.price)}`;
+    if (!isEmpty(state.selectedSku)) {
+      const sku = state.selectedSku;
+      priceText = `${sku.point}${!sku.pointPrice ? '' : `+￥${fen2yuan(sku.pointPrice)}`}`;
+    }
+    return priceText;
+  });
   const propertyList = convertProductPropertyList(state.goodsInfo.skus);
   // SKU 列表
   const skuList = computed(() => {
@@ -125,10 +146,6 @@
     return skuPrices;
   });
 
-  if (!state.goodsInfo.is_sku) {
-    state.selectedSku = state.goodsInfo.skus[0];
-  }
-
   watch(
     () => state.selectedSku,
     (newVal) => {
@@ -311,6 +328,12 @@
     }
   }
 
+  .point-img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 4rpx;
+  }
+
   .ss-modal-box {
     border-radius: 30rpx 30rpx 0 0;
     max-height: 1000rpx;
@@ -348,11 +371,6 @@
         font-weight: 500;
         color: $red;
         font-family: OPPOSANS;
-
-        &::before {
-          content: '￥';
-          font-size: 24rpx;
-        }
       }
 
       .stock-text {
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index a11206e..20626cc 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -1,7 +1,7 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50">
-		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
+	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;">
+		<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">
 					<image class="avatar-img" :src="
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index 683914a..faa3ac4 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/sheep/components/s-wallet-card/s-wallet-card.vue
@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户资产 -->
 <template>
-  <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
+  <view class="ss-wallet-menu-wrap ss-flex ss-col-center" style="z-index: 9999;">
     <view
       class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
       @tap="sheep.$router.go('/pages/user/wallet/money')"
@@ -77,7 +77,7 @@
     }
 
     .menu-item {
-      height: 160rpx;
+      height: 105rpx;
 
       .menu-title {
         font-size: 24rpx;
diff --git a/sheep/hooks/useGoods.js b/sheep/hooks/useGoods.js
index f23a6ab..1b66cfa 100644
--- a/sheep/hooks/useGoods.js
+++ b/sheep/hooks/useGoods.js
@@ -82,7 +82,10 @@ export function formatGoodsSwiper(urlList) {
         const isVideo = VIDEO_SUFFIX_LIST.some((suffix) => url.includes(suffix));
         const type = isVideo ? 'video' : 'image';
         const src = $url.cdn(url);
-        return { type, src };
+        return {
+          type,
+          src,
+        };
       }) || []
   );
 }
@@ -336,6 +339,27 @@ export function fen2yuan(price) {
   return (price / 100.0).toFixed(2);
 }
 
+/**
+ * 将分转成元
+ *
+ * 如果没有小数点，则不展示小数点部分
+ *
+ * @param price 分，例如说 100 分
+ * @returns {string} 元，例如说 1 元
+ */
+export function fen2yuanSimple(price) {
+  return fen2yuan(price).replace(/\.?0+$/, '');
+}
+
+/**
+ * 将折扣百分比转化为“打x者”的 x 部分
+ *
+ * @param discountPercent
+ */
+export function formatDiscountPercent(discountPercent) {
+  return (discountPercent / 10.0).toFixed(1).replace(/\.?0+$/, '');
+}
+
 /**
  * 从商品 SKU 数组中，转换出商品属性的数组
  *
@@ -380,6 +404,99 @@ export function convertProductPropertyList(skus) {
   return result;
 }
 
+export function appendSettlementProduct(spus, settlementInfos) {
+  if (!settlementInfos || settlementInfos.length === 0) {
+    return;
+  }
+  for (const spu of spus) {
+    const settlementInfo = settlementInfos.find((info) => info.spuId === spu.id);
+    if (!settlementInfo) {
+      return;
+    }
+    // 选择价格最小的 SKU 设置到 SPU 上
+    const settlementSku = settlementInfo.skus
+      .filter((sku) => sku.promotionPrice > 0)
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+    if (settlementSku) {
+      spu.promotionType = settlementSku.promotionType;
+      spu.promotionPrice = settlementSku.promotionPrice;
+    }
+    // 设置【满减送】活动
+    if (settlementInfo.rewardActivity) {
+      spu.rewardActivity = settlementInfo.rewardActivity;
+    }
+  }
+}
+
+// 获得满减送活动的规则描述（group）
+export function getRewardActivityRuleGroupDescriptions(activity) {
+  if (!activity || !activity.rules || activity.rules.length === 0) {
+    return [];
+  }
+  const result = [
+    { name: '满减', values: [] },
+    { name: '赠品', values: [] },
+    { name: '包邮', values: [] },
+  ];
+  activity.rules.forEach((rule) => {
+    const conditionTypeStr =
+      activity.conditionType === 10 ? `满 ${fen2yuanSimple(rule.limit)} 元` : `满 ${rule.limit} 件`;
+    // 满减
+    if (rule.limit) {
+      result[0].values.push(`${conditionTypeStr} 减 ${fen2yuanSimple(rule.discountPrice)} 元`);
+    }
+    // 赠品
+    if (rule.point || (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0)) {
+      let tips = [];
+      if (rule.point) {
+        tips.push(`送 ${rule.point} 积分`);
+      }
+      if (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0) {
+        tips.push(`送 ${rule.giveCouponTemplateCounts.length} 张优惠券`);
+      }
+      result[1].values.push(`${conditionTypeStr} ${tips.join('、')}`);
+    }
+    // 包邮
+    if (rule.freeDelivery) {
+      result[2].values.push(`${conditionTypeStr} 包邮`);
+    }
+  });
+  // 移除 values 为空的元素
+  result.forEach((item) => {
+    if (item.values.length === 0) {
+      result.splice(result.indexOf(item), 1);
+    }
+  });
+  return result;
+}
+
+// 获得满减送活动的规则描述（item）
+export function getRewardActivityRuleItemDescriptions(activity) {
+  if (!activity || !activity.rules || activity.rules.length === 0) {
+    return [];
+  }
+  const result = [];
+  activity.rules.forEach((rule) => {
+    const conditionTypeStr =
+      activity.conditionType === 10 ? `满${fen2yuanSimple(rule.limit)}元` : `满${rule.limit}件`;
+    // 满减
+    if (rule.limit) {
+      result.push(`${conditionTypeStr}减${fen2yuanSimple(rule.discountPrice)}元`);
+    }
+    // 赠品
+    if (rule.point) {
+      result.push(`${conditionTypeStr}送${rule.point}积分`);
+    }
+    if (rule.giveCouponTemplateCounts && rule.giveCouponTemplateCounts.length > 0) {
+      result.push(`${conditionTypeStr}送${rule.giveCouponTemplateCounts.length}张优惠券`);
+    }
+    // 包邮
+    if (rule.freeDelivery) {
+      result.push(`${conditionTypeStr}包邮`);
+    }
+  });
+  return result;
+}
 /**
  * 格式化满减送活动的规则
  *
@@ -395,4 +512,4 @@ export function formatRewardActivityRule(activity, rule) {
     return `满 ${rule.limit} 件减 ${fen2yuan(rule.discountPrice)} 元`;
   }
   return '';
-}
+}
\ No newline at end of file
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
index 4d6c84e..67b528b 100644
--- a/sheep/ui/su-coupon/su-coupon.vue
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -254,7 +254,7 @@
 
   .md-coupon-card {
     width: 296rpx;
-    height: 74px;
+    height: 63px;
     border-radius: 10rpx;
     overflow: hidden;
 
@@ -269,6 +269,7 @@
       font-weight: bold;
       color: v-bind('textColor');
       vertical-align: text-bottom;
+	  margin-bottom: 5px;
     }
 
     .value-unit {
@@ -348,4 +349,10 @@
       }
     }
   }
+  // .card-right{
+	 //  .card-btn{
+		//   width:auto;
+		//   height:auto;
+	 //  }
+  // }
 </style>
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
index fb34cf1..741b4dc 100644
--- a/sheep/ui/su-navbar/su-navbar.vue
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -1,483 +1,517 @@
 <!-- 自定义导航栏 -->
 <template>
-  <view class="uni-navbar" :class="{ 'uni-dark': dark }">
-    <view
-      :class="{
+	<view class="uni-navbar" :class="{ 'uni-dark': dark }">
+		<view :class="{
         'uni-navbar--fixed': fixed,
         'uni-navbar--shadow': shadow,
         'uni-navbar--border': border,
-      }"
-      class="uni-navbar__content"
-    >
-      <view class="fixed-bg" :class="[opacity ? '' : opacityBgUi]"></view>
-      <su-status-bar v-if="statusBar" />
-      <view
-        :style="{
+      }" class="uni-navbar__content">
+			<view class="fixed-bg" :class="[opacity ? '' : opacityBgUi]"></view>
+			<su-status-bar v-if="statusBar" :navBg = "navBg" />
+			<view :style="{
           color: themeColor,
           height: navbarHeight,
           background: backgroundColor,
-        }"
-        class="uni-navbar__header"
-      >
-        <view
-          class="uni-navbar__header-btns uni-navbar__header-btns-left"
-          :style="{ width: leftIconWidth }"
-        >
-          <slot name="left">
-            <view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
-              <view class="icon-box ss-flex">
-                <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
-                  <text class="sicon-back" v-if="hasHistory" />
-                  <text class="sicon-home" v-else />
-                </view>
-                <view class="line"></view>
-                <view
-                  class="icon-button icon-button-right ss-flex ss-row-center"
-                  @tap="showMenuTools"
-                >
-                  <text class="sicon-more" />
-                </view>
-              </view>
-            </view>
-            <view
-              :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }"
-              class="uni-navbar-btn-text"
-              v-if="
-                titleAlign === 'left' &&
-                title.length &&
-                sheep.$platform.name !== 'WechatOfficialAccount'
-              "
-            >
-              <text :style="{ color: themeColor, fontSize: '18px' }">{{ title }}</text>
-            </view>
-          </slot>
-        </view>
-        <view v-if="tools === 'search'" class="ss-flex-1">
-          <slot name="center">
-            <uni-search-bar
-              class="ss-flex-1 search-box"
-              :radius="20"
-              placeholder="请输入关键词"
-              cancelButton="none"
-              v-model="searchModel"
-              @confirm="onSearch"
-            />
-          </slot>
-        </view>
-        <view v-else class="uni-navbar__header-container" @tap="onClickTitle">
-          <slot name="center">
-            <view
-              v-if="tools === 'title' && titleAlign === 'center' && title.length"
-              class="uni-navbar__header-container-inner"
-            >
-              <text :style="{ color: themeColor, fontSize: '36rpx' }" class="ss-line-1">{{
+        }" class="uni-navbar__header">
+				<view v-if="headerBtns != 'headerBtns'" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{ width: leftIconWidth }">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<view class="icon-box ss-flex">
+								<view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
+									<text class="sicon-back" v-if="hasHistory" />
+									<text class="sicon-home" v-else />
+								</view>
+								<view class="line"></view>
+								<view class="icon-button icon-button-right ss-flex ss-row-center" @tap="showMenuTools">
+									<text class="sicon-more" />
+								</view>
+							</view>
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="
+								titleAlign === 'left' &&
+								title.length &&
+								sheep.$platform.name !== 'WechatOfficialAccount'
+							  ">
+							<text :style="{ color: themeColor, fontSize: '18px' }">{{ title }}</text>
+						</view>
+					</slot>
+				</view>
+				<!-- <view class="new-view" v-if="headerBtns === 'headerBtns'" @click="onSearch">
+					<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;`"
+					@click="onSearch">
+					<slot name="center">
+						<uni-search-bar class="ss-flex-1 search-box" :radius="20" placeholder="请输入关键词"
+							cancelButton="none" v-model="searchModel" @confirm="onSearch" />
+					</slot>
+				</view>
+				<view v-else class="uni-navbar__header-container" @tap="onClickTitle">
+					<slot name="center">
+						<view v-if="tools === 'title' && titleAlign === 'center' && title.length"
+							class="uni-navbar__header-container-inner">
+							<text :style="{ color: themeColor, fontSize: '36rpx' }" class="ss-line-1">{{
                 title
               }}</text>
-            </view>
-          </slot>
-        </view>
-      </view>
-    </view>
-    <view class="uni-navbar__placeholder" v-if="placeholder">
-      <su-status-bar v-if="statusBar" />
-      <view class="uni-navbar__placeholder-view" :style="{ height: navbarHeight }" />
-    </view>
-    <!-- 头部问题 -->
-    <!-- #ifdef MP -->
-    <!-- <view :style="[capsuleStyle]"></view> -->
-    <!-- #endif -->
-  </view>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="placeholder">
+			<su-status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" :style="{ height: navbarHeight }" />
+		</view>
+		<!-- 头部问题 -->
+		<!-- #ifdef MP -->
+		<!-- <view :style="[capsuleStyle]"></view> -->
+		<!-- #endif -->
+	</view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
-  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
-  import { computed, ref } from 'vue';
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		showMenuTools,
+		closeMenuTools
+	} from '@/sheep/hooks/useModal';
+	import {
+		computed,
+		ref
+	} from 'vue';
 
-  /**
-   * NavBar 自定义导航栏
-   * @description 导航栏组件，主要用于头部导航
-   * @property {Boolean} dark 开启黑暗模式
-   * @property {String} title 标题文字
-   * @property {String} rightText 右侧按钮文本
-   * @property {String} leftIcon 左侧按钮图标
-   * @property {String} rightIcon 右侧按钮图标
-   * @property {String} color 图标和文字颜色
-   * @property {String} backgroundColor 导航栏背景颜色
-   * @property {Boolean} fixed = [true|false] 是否固定顶部
-   * @property {Boolean} statusBar = [true|false] 是否包含状态栏
-   * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
-   * @event {Function} clickLeft 左侧按钮点击时触发
-   * @event {Function} clickRight 右侧按钮点击时触发
-   * @event {Function} clickTitle 中间标题点击时触发
-   */
+	/**
+	 * NavBar 自定义导航栏
+	 * @description 导航栏组件，主要用于头部导航
+	 * @property {Boolean} dark 开启黑暗模式
+	 * @property {String} title 标题文字
+	 * @property {String} rightText 右侧按钮文本
+	 * @property {String} leftIcon 左侧按钮图标
+	 * @property {String} rightIcon 右侧按钮图标
+	 * @property {String} color 图标和文字颜色
+	 * @property {String} backgroundColor 导航栏背景颜色
+	 * @property {Boolean} fixed = [true|false] 是否固定顶部
+	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @event {Function} clickLeft 左侧按钮点击时触发
+	 * @event {Function} clickRight 右侧按钮点击时触发
+	 * @event {Function} clickTitle 中间标题点击时触发
+	 */
 
-  const getVal = (val) => (typeof val === 'number' ? val + 'px' : val);
+	const getVal = (val) => (typeof val === 'number' ? val + 'px' : val);
 
-  const emits = defineEmits(['clickLeft', 'clickRight', 'clickTitle', 'search']);
-  const props = defineProps({
-    dark: {
-      type: Boolean,
-      default: false,
-    },
-    modelValue: {
-      type: String,
-      default: '',
-    },
-    title: {
-      type: String,
-      default: '',
-    },
-    titleAlign: {
-      type: String,
-      default: 'center', // left | center
-    },
-    rightText: {
-      type: String,
-      default: '',
-    },
-    leftIcon: {
-      type: String,
-      default: 'left',
-    },
-    rightIcon: {
-      type: String,
-      default: '',
-    },
-    fixed: {
-      type: [Boolean, String],
-      default: true,
-    },
-    placeholder: {
-      type: [Boolean, String],
-      default: true,
-    },
-    color: {
-      type: String,
-      default: '',
-    },
-    backgroundColor: {
-      type: String,
-      default: '',
-    },
-    opacity: {
-      type: [Boolean, String],
-      default: false,
-    },
-    opacityBgUi: {
-      type: String,
-      default: 'bg-white',
-    },
-    statusBar: {
-      type: [Boolean, String],
-      default: false,
-    },
-    shadow: {
-      type: [Boolean, String],
-      default: false,
-    },
-    border: {
-      type: [Boolean, String],
-      default: false,
-    },
-    height: {
-      type: [Number, String],
-      default: 44,
-    },
-    leftWidth: {
-      type: [Number, String],
-      default: 80,
-    },
-    rightWidth: {
-      type: [Number, String],
-      default: 0,
-    },
-    tools: {
-      type: String,
-      default: 'title',
-    },
-    defaultSearch: {
-      type: String,
-      default: '',
-    },
-  });
+	const emits = defineEmits(['clickLeft', 'clickRight', 'clickTitle', 'search']);
+	const props = defineProps({
+		navBg: {
+			type: Boolean,
+			default: false,
+		},
+		dark: {
+			type: Boolean,
+			default: false,
+		},
+		headerBtns: {
+			type: String,
+			default: '',
+		},
+		modelValue: {
+			type: String,
+			default: '',
+		},
+		title: {
+			type: String,
+			default: '',
+		},
+		titleAlign: {
+			type: String,
+			default: 'center', // left | center
+		},
+		rightText: {
+			type: String,
+			default: '',
+		},
+		leftIcon: {
+			type: String,
+			default: 'left',
+		},
+		rightIcon: {
+			type: String,
+			default: '',
+		},
+		fixed: {
+			type: [Boolean, String],
+			default: true,
+		},
+		placeholder: {
+			type: [Boolean, String],
+			default: true,
+		},
+		color: {
+			type: String,
+			default: '',
+		},
+		backgroundColor: {
+			type: String,
+			default: '',
+		},
+		opacity: {
+			type: [Boolean, String],
+			default: false,
+		},
+		opacityBgUi: {
+			type: String,
+			default: 'bg-white',
+		},
+		statusBar: {
+			type: [Boolean, String],
+			default: false,
+		},
+		shadow: {
+			type: [Boolean, String],
+			default: false,
+		},
+		border: {
+			type: [Boolean, String],
+			default: false,
+		},
+		height: {
+			type: [Number, String],
+			default: 44,
+		},
+		leftWidth: {
+			type: [Number, String],
+			default: 80,
+		},
+		rightWidth: {
+			type: [Number, String],
+			default: 0,
+		},
+		tools: {
+			type: String,
+			default: 'title',
+		},
+		defaultSearch: {
+			type: String,
+			default: '',
+		},
+	});
 
-  const capsuleStyle = computed(() => {
-    return {
-      width: sheep.$platform.capsule.width + 'px',
-      height: sheep.$platform.capsule.height + 'px',
-      margin: '0 ' + (sheep.$platform.device.windowWidth - sheep.$platform.capsule.right) + 'px',
-    };
-  });
+	const capsuleStyle = computed(() => {
+		return {
+			width: sheep.$platform.capsule.width + 'px',
+			height: sheep.$platform.capsule.height + 'px',
+			margin: '0 ' + (sheep.$platform.device.windowWidth - sheep.$platform.capsule.right) + 'px',
+		};
+	});
 
-  const searchModel = computed(() => {
-    return props.defaultSearch;
-  });
+	// const searchModel = computed(() => {
+	//   return props.defaultSearch;
+	// });
+	const searchModel = computed({
+		get() {
+			return props.defaultSearch;
+		},
+		set(newValue) {
+			sheep.$router.go('/pages/index/search');
+			// props.defaultSearch = newValue
+		}
+	})
 
-  const themeBgColor = computed(() => {
-    if (props.dark) {
-      // 默认值
-      if (props.backgroundColor) {
-        return props.backgroundColor;
-      } else {
-        return props.dark ? '#333' : '#FFF';
-      }
-    }
-    return props.backgroundColor || '#FFF';
-  });
-  const themeColor = computed(() => {
-    if (props.dark) {
-      // 默认值
-      if (props.color) {
-        return props.color;
-      } else {
-        return props.dark ? '#fff' : '#333';
-      }
-    }
-    return props.color || '#333';
-  });
-  const navbarHeight = computed(() => {
-    return getVal(props.height);
-  });
-  const leftIconWidth = computed(() => {
-    return getVal(props.leftWidth);
-  });
-  const rightIconWidth = computed(() => {
-    return getVal(props.rightWidth);
-  });
+	const themeBgColor = computed(() => {
+		if (props.dark) {
+			// 默认值
+			if (props.backgroundColor) {
+				return props.backgroundColor;
+			} else {
+				return props.dark ? '#333' : '#FFF';
+			}
+		}
+		return props.backgroundColor || '#FFF';
+	});
+	const themeColor = computed(() => {
+		if (props.dark) {
+			// 默认值
+			if (props.color) {
+				return props.color;
+			} else {
+				return props.dark ? '#fff' : '#333';
+			}
+		}
+		return props.color || '#333';
+	});
+	const navbarHeight = computed(() => {
+		return getVal(props.height);
+	});
+	const leftIconWidth = computed(() => {
+		return getVal(props.leftWidth);
+	});
+	const rightIconWidth = computed(() => {
+		return getVal(props.rightWidth);
+	});
 
-  function onSearch(e) {
-    emits('search', e.value);
-  }
+	function onSearch(e) {
+		sheep.$router.go('/pages/index/search');
+		// emits('search', e.value);
+	}
 
-  onLoad(() => {
-    if (uni.report && props.title !== '') {
-      uni.report('title', props.title);
-    }
-  });
+	onLoad(() => {
+		if (uni.report && props.title !== '') {
+			uni.report('title', props.title);
+		}
+	});
 
-  const hasHistory = sheep.$router.hasHistory();
+	const hasHistory = sheep.$router.hasHistory();
 
-  function onClickLeft() {
-    if (hasHistory) {
-      sheep.$router.back();
-    } else {
-      sheep.$router.go('/pages/index/index');
-    }
-    emits('clickLeft');
-  }
-  function onClickRight() {
-    showMenuTools();
-  }
-  function onClickTitle() {
-    emits('clickTitle');
-  }
+	function onClickLeft() {
+		if (hasHistory) {
+			sheep.$router.back();
+		} else {
+			sheep.$router.go('/pages/index/index');
+		}
+		emits('clickLeft');
+	}
+
+	function onClickRight() {
+		showMenuTools();
+	}
+
+	function onClickTitle() {
+		emits('clickTitle');
+	}
 </script>
 
 <style lang="scss" scoped>
-  .bg-main {
-    background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)) !important;
-    color: #fff !important;
-  }
-  .icon-box {
-    background: #ffffff;
-    box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
-    border-radius: 30rpx;
-    width: 134rpx;
-    height: 56rpx;
-    margin-left: 8rpx;
-    .line {
-      width: 2rpx;
-      height: 24rpx;
-      background: #e5e5e7;
-    }
-    .sicon-back {
-      font-size: 32rpx;
-      color: #000;
-    }
-    .sicon-home {
-      font-size: 32rpx;
-      color: #000;
-    }
-    .sicon-more {
-      font-size: 32rpx;
-      color: #000;
-    }
-    .icon-button {
-      width: 67rpx;
-      height: 56rpx;
-      &-left:hover {
-        background: rgba(0, 0, 0, 0.16);
-        border-radius: 30rpx 0px 0px 30rpx;
-      }
-      &-right:hover {
-        background: rgba(0, 0, 0, 0.16);
-        border-radius: 0px 30rpx 30rpx 0px;
-      }
-    }
-  }
+	.bg-main {
+		background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)) !important;
+		color: #fff !important;
+	}
 
-  $nav-height: 44px;
+	.icon-box {
+		background: #ffffff;
+		box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
+		border-radius: 30rpx;
+		width: 134rpx;
+		height: 56rpx;
+		margin-left: 8rpx;
 
-  .fixed-bg {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    z-index: 1;
-    pointer-events: none;
-  }
+		.line {
+			width: 2rpx;
+			height: 24rpx;
+			background: #e5e5e7;
+		}
 
-  .uni-nav-bar-text {
-    /* #ifdef APP-PLUS */
-    font-size: 34rpx;
-    /* #endif */
-    /* #ifndef APP-PLUS */
-    font-size: 14px;
-    /* #endif */
-  }
+		.sicon-back {
+			font-size: 32rpx;
+			color: #000;
+		}
 
-  .uni-nav-bar-right-text {
-    font-size: 12px;
-  }
+		.sicon-home {
+			font-size: 32rpx;
+			color: #000;
+		}
 
-  .uni-navbar__content {
-    position: relative;
-    // background-color: #fff;
-    // box-sizing: border-box;
-    background-color: transparent;
-  }
+		.sicon-more {
+			font-size: 32rpx;
+			color: #000;
+		}
 
-  .uni-navbar__content_view {
-    // box-sizing: border-box;
-  }
+		.icon-button {
+			width: 67rpx;
+			height: 56rpx;
 
-  .uni-navbar-btn-text {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: flex-start;
-    align-items: center;
-    line-height: 18px;
-  }
+			&-left:hover {
+				background: rgba(0, 0, 0, 0.16);
+				border-radius: 30rpx 0px 0px 30rpx;
+			}
 
-  .uni-navbar__header {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    padding: 0 10px;
-    flex-direction: row;
-    justify-content: space-between;
-    height: $nav-height;
-    font-size: 12px;
-    position: relative;
-    z-index: 2;
-  }
+			&-right:hover {
+				background: rgba(0, 0, 0, 0.16);
+				border-radius: 0px 30rpx 30rpx 0px;
+			}
+		}
+	}
 
-  .uni-navbar__header-btns {
-    /* #ifndef APP-NVUE */
-    overflow: hidden;
-    display: flex;
-    /* #endif */
-    flex-wrap: nowrap;
-    flex-direction: row;
-    // min-width: 120rpx;
-    min-width: 40rpx;
-    // padding: 0 6px;
-    justify-content: center;
-    align-items: center;
-    /* #ifdef H5 */
-    cursor: pointer;
-    /* #endif */
-  }
+	$nav-height: 44px;
 
-  .uni-navbar__header-btns-left {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    width: 120rpx;
-    justify-content: flex-start;
-    align-items: center;
-  }
+	.fixed-bg {
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		z-index: 1;
+		pointer-events: none;
+	}
 
-  .uni-navbar__header-btns-right {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: row;
-    // width: 150rpx;
-    // padding-right: 30rpx;
-    justify-content: flex-end;
-    align-items: center;
-  }
-  .uni-navbar__header-container {
-    /* #ifndef APP-NVUE */
-    // display: flex;
-    /* #endif */
-    // flex: 1;
-    // padding: 0 10px;
-    // overflow: hidden;
-    position: absolute;
-    left: 50%;
-    transform: translateX(-50%) translateY(-50%);
-    top: 50%;
-  }
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: 14px;
+		/* #endif */
+	}
 
-  .uni-navbar__header-container-inner {
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex: 1;
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    font-size: 12px;
-    overflow: hidden;
-    // box-sizing: border-box;
-  }
+	.uni-nav-bar-right-text {
+		font-size: 12px;
+	}
 
-  .uni-navbar__placeholder-view {
-    height: $nav-height;
-  }
+	.uni-navbar__content {
+		position: relative;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
+	}
 
-  .uni-navbar--fixed {
-    position: fixed;
-    z-index: 998;
-    /* #ifdef H5 */
-    left: var(--window-left);
-    right: var(--window-right);
-    /* #endif */
-    /* #ifndef H5 */
-    left: 0;
-    right: 0;
-    /* #endif */
-  }
+	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
 
-  .uni-navbar--shadow {
-    box-shadow: 0 1px 6px #ccc;
-  }
+	.uni-navbar-btn-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		line-height: 18px;
+	}
 
-  .uni-navbar--border {
-    border-bottom-width: 1rpx;
-    border-bottom-style: solid;
-    border-bottom-color: #eee;
-  }
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 0 10px;
+		flex-direction: row;
+		// justify-content: space-between;
+		height: $nav-height;
+		font-size: 12px;
+		position: relative;
+		z-index: 2;
+	}
 
-  .uni-ellipsis-1 {
-    overflow: hidden;
-    /* #ifndef APP-NVUE */
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    /* #endif */
-    /* #ifdef APP-NVUE */
-    lines: 1;
-    text-overflow: ellipsis;
-    /* #endif */
-  }
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		flex-direction: row;
+		// min-width: 120rpx;
+		min-width: 40rpx;
+		// padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
 
-  // 暗主题配置
-  .uni-dark {
-  }
-</style>
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 120rpx;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		// display: flex;
+		/* #endif */
+		// flex: 1;
+		// padding: 0 10px;
+		// overflow: hidden;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%) translateY(-50%);
+		top: 50%;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 998;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+	}
+
+	.uni-navbar--shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	// 暗主题配置
+	.uni-dark {}
+
+	.new-view {
+		width: 40px;
+		height: 100%;
+		margin-right: 15px;
+
+		.new-image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	:deep(.uni-searchbar__box) {
+		height: 31px !important;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/ui/su-status-bar/su-status-bar.vue b/sheep/ui/su-status-bar/su-status-bar.vue
index 9af07f9..15387f0 100644
--- a/sheep/ui/su-status-bar/su-status-bar.vue
+++ b/sheep/ui/su-status-bar/su-status-bar.vue
@@ -1,16 +1,26 @@
 <!-- 自定义状态栏 -->
 <template>
-  <view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar" :class="navBg? 'ss' : ''">
+		<slot />
+	</view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-
-  const statusBarHeight = sheep.$platform.device.statusBarHeight + 'px';
+	import sheep from '@/sheep';
+	const props = defineProps({
+		navBg: {
+			type: Boolean,
+			default: false,
+		}
+	})
+	const statusBarHeight = sheep.$platform.device.statusBarHeight - 2 + 'px';
 </script>
 <style lang="scss">
-  .uni-status-bar {
-    // width: 750rpx;
-    height: var(--status-bar-height);
-  }
-</style>
+	.uni-status-bar {
+		// width: 750rpx;
+		height: var(--status-bar-height);
+	}
+	.ss {
+		background: rgba(248, 83, 42);
+	}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
index 2befbcc..4a20367 100644
--- a/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
+++ b/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue
@@ -226,7 +226,7 @@
 </script>
 
 <style lang="scss">
-	$uni-searchbar-height: 36px;
+	$uni-searchbar-height: 31px;
 
 	.uni-searchbar {
 		/* #ifndef APP-NVUE */