diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index a1714bba..23e9e33a 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -1,385 +1,433 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
-    <!--顶部背景图-->
-    <view
-        class="page-bg"
-        :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
-    ></view>
-    <!-- 时间段轮播图 -->
-    <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
-      <swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
-              indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
-        <block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
-          <swiper-item class="borRadius14">
-            <image :src="picUrl" class="slide-image borRadius14" lazy-load />
-          </swiper-item>
-        </block>
-      </swiper>
-    </view>
-    <!-- 时间段列表 -->
-    <view class="flex align-center justify-between ss-p-25">
-      <!-- 左侧图标 -->
-      <view class="time-icon">
-        <!-- TODO 芋艿：图片统一维护 -->
-        <image class="ss-w-100 ss-h-100" src="http://mall.yudao.iocoder.cn/static/images/priceTag.png" />
-      </view>
-      <scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
-        <view v-for="(config, index) in timeConfigList" :key="index"
-              :class="['item', { active: activeTimeIndex === index}]"
-              :id="`timeItem${index}`"
-              @tap="handleChangeTimeConfig(index)">
-          <!-- 活动起始时间 -->
-          <view class="time">{{ config.startTime }}</view>
-          <!-- 活动状态 -->
-          <view class="status">{{ config.status }}</view>
-        </view>
-      </scroll-view>
-    </view>
+	<s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
+		<!--顶部背景图-->
+		<view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"></view>
+		<!-- 时间段轮播图 -->
+		<view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
+			<swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
+				indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+				<block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
+					<swiper-item class="borRadius14">
+						<image :src="picUrl" class="slide-image borRadius14" lazy-load />
+					</swiper-item>
+				</block>
+			</swiper>
+		</view>
+		<!-- 时间段列表 -->
+		<view class="flex align-center justify-between ss-p-25">
+			<!-- 左侧图标 -->
+			<view class="time-icon">
+				<!-- TODO 芋艿：图片统一维护 -->
+				<image class="ss-w-100 ss-h-100" src="http://mall.yudao.iocoder.cn/static/images/priceTag.png" />
+			</view>
+			<scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
+				<view v-for="(config, index) in timeConfigList" :key="index"
+					:class="['item', { active: activeTimeIndex === index}]" :id="`timeItem${index}`"
+					@tap="handleChangeTimeConfig(index,config.id)">
+					<!-- 活动起始时间 -->
+					<view class="time">{{ config.startTime }}</view>
+					<!-- 活动状态 -->
+					<view class="status">{{ config?.status }}</view>
+				</view>
+			</scroll-view>
+		</view>
 
-    <!-- 内容区 -->
-    <view class="list-content">
-      <!-- 活动倒计时 -->
-      <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" v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">
-            <view class="countdown-title ss-m-r-12">距结束</view>
-            <view class="ss-flex countdown-time">
-              <view class="ss-flex countdown-h">{{ countDown.h }}</view>
-              <view class="ss-m-x-4">:</view>
-              <view class="countdown-num ss-flex ss-row-center">{{ countDown.m }}</view>
-              <view class="ss-m-x-4">:</view>
-              <view class="countdown-num ss-flex ss-row-center">{{ countDown.s }}</view>
-            </view>
-          </view>
-          <view v-else> {{ activeTimeConfig?.status }} </view>
-        </view>
-      </view>
+		<!-- 内容区 -->
+		<view class="list-content">
+			<!-- 活动倒计时 -->
+			<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" v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">
+						<view class="countdown-title ss-m-r-12">距结束</view>
+						<view class="ss-flex countdown-time">
+							<view class="ss-flex countdown-h">{{ countDown.h }}</view>
+							<view class="ss-m-x-4">:</view>
+							<view class="countdown-num ss-flex ss-row-center">{{ countDown.m }}</view>
+							<view class="ss-m-x-4">:</view>
+							<view class="countdown-num ss-flex ss-row-center">{{ countDown.s }}</view>
+						</view>
+					</view>
+					<view v-else> {{ activeTimeConfig?.status }} </view>
+				</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="activity in activityList" :key="activity.id">
-          <s-goods-column
-            size="lg"
-            :data="{ ...activity, price: activity.seckillPrice }"
-            :goodsFields="goodsFields"
-            :seckillTag="true"
-            @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
-          >
-            <!-- 抢购进度 -->
-            <template #activity>
-              <view class="limit">限量 <text class="ss-m-l-5">{{ activity.stock}} {{activity.unitName}}</text></view>
-              <su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
-            </template>
-            <!-- 抢购按钮 -->
-            <template #cart>
-              <button :class="['ss-reset-button cart-btn', { disabled: activeTimeConfig.status === TimeStatusEnum.END }]">
-                <span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span>
-                <span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span>
-                <span v-else>已结束</span>
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-        <uni-load-more
-          v-if="activityTotal > 0"
-          :status="loadStatus"
-          :content-text="{
+			<!-- 活动列表 -->
+			<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="activity in activityList" :key="activity.id">
+					<s-goods-column size="lg" :data="{ ...activity, price: activity.seckillPrice }"
+						:goodsFields="goodsFields" :seckillTag="true">
+						<!-- 抢购进度 -->
+						<template #activity>
+							<view class="limit">限量 <text class="ss-m-l-5">{{ activity.stock}}
+									{{activity.unitName}}</text></view>
+							<su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
+						</template>
+						<!-- 抢购按钮 -->
+						<template #cart>
+							<button
+								:class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+								v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">
+								<span>未开始</span>
+							</button>
+							<button
+								:class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+								@click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
+								v-else-if='activeTimeConfig?.status === TimeStatusEnum.STARTED'>
+								<span>马上抢</span>
+							</button>
+							<button
+								:class="['ss-reset-button cart-btn', { disabled: activeTimeConfig?.status === TimeStatusEnum.END}]"
+								v-else>
+								<span>已结束</span>
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+				<uni-load-more v-if="activityTotal > 0" :status="loadStatus" :content-text="{
             contentdown: '上拉加载更多',
-          }"
-          @tap="loadMore"
-        />
-      </scroll-view>
-    </view>
-  </s-layout>
+          }" @tap="loadMore" />
+			</scroll-view>
+		</view>
+	</s-layout>
 </template>
 <script setup>
-  import {reactive, computed, ref, nextTick} from 'vue';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import { useDurationTime } from '@/sheep/hooks/useGoods';
-  import SeckillApi from "@/sheep/api/promotion/seckill";
-  import dayjs from "dayjs";
-  import {TimeStatusEnum} from "@/sheep/util/const";
+	import {
+		reactive,
+		computed,
+		ref,
+		nextTick
+	} from 'vue';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		useDurationTime
+	} from '@/sheep/hooks/useGoods';
+	import SeckillApi from "@/sheep/api/promotion/seckill";
+	import dayjs from "dayjs";
+	import {
+		TimeStatusEnum
+	} from "@/sheep/util/const";
 
-  // 计算页面高度
-  const { safeAreaInsets, safeArea } = sheep.$platform.device;
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
-  const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
+	// 计算页面高度
+	const {
+		safeAreaInsets,
+		safeArea
+	} = sheep.$platform.device;
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const pageHeight = (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
+	const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
 
-  // 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
-  const goodsFields = {
-    name: { show: true },
-    introduction: { show: true },
-    price: { show: true },
-    marketPrice: { show: true },
-  };
+	// 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
+	const goodsFields = {
+		name: {
+			show: true
+		},
+		introduction: {
+			show: true
+		},
+		price: {
+			show: true
+		},
+		marketPrice: {
+			show: true
+		},
+	};
 
-  //#region 时间段
-  // 时间段列表
-  const timeConfigList = ref([])
-  // 查询时间段
-  const getSeckillConfigList = async () => {
-    const { data } = await SeckillApi.getSeckillConfigList()
-    const now = dayjs();
-    const today = now.format('YYYY-MM-DD')
-    // 判断时间段的状态
-    data.forEach((config, index) => {
-      const startTime = dayjs(`${today} ${config.startTime}`)
-      const endTime = dayjs(`${today} ${config.endTime}`)
-      if (now.isBefore(startTime)) {
-        config.status = TimeStatusEnum.WAIT_START;
-      } else if (now.isAfter(endTime)) {
-        config.status = TimeStatusEnum.END;
-      } else {
-        config.status = TimeStatusEnum.STARTED;
-        activeTimeIndex.value = index;
-      }
-    })
-    timeConfigList.value = data
-    // 默认选中进行中的活动
-    handleChangeTimeConfig(activeTimeIndex.value);
-    // 滚动到进行中的时间段
-    scrollToTimeConfig(activeTimeIndex.value)
-  }
+	//#region 时间段
+	// 时间段列表
+	const timeConfigList = ref([])
+	// 查询时间段
+	const getSeckillConfigList = async () => {
+		const {
+			data
+		} = await SeckillApi.getSeckillConfigList()
+		const now = dayjs();
+		const today = now.format('YYYY-MM-DD')
+		const select = ref([])
+		console.log('数据', data)
+		// 判断时间段的状态
+		data.forEach((config, index) => {
+			const startTime = dayjs(`${today} ${config.startTime}`)
+			const endTime = dayjs(`${today} ${config.endTime}`)
+			select.value[index] = config.id;
+			if (now.isBefore(startTime)) {
+				config.status = TimeStatusEnum.WAIT_START;
+				// select.value[index] = config.id;
+				console.log('未开始',select.value,activeTimeIndex.value)
+			} else if (now.isAfter(endTime)) {
+				config.status = TimeStatusEnum.END;
+				// select.value[index] = config.id;
+				console.log('已结束',select.value,activeTimeIndex.value)
+			} else {
+				config.status = TimeStatusEnum.STARTED;
+				// select.value[index] = config.id;
+				activeTimeIndex.value = index
+				console.log('进行中',select.value,activeTimeIndex.value)
+			}
+		})
+		timeConfigList.value = data
+		console.log('传递',select.value,activeTimeIndex.value)
+		// 默认选中进行中的活动
+		handleChangeTimeConfig(activeTimeIndex.value, select.value[activeTimeIndex.value]);
+		// 滚动到进行中的时间段
+		scrollToTimeConfig(activeTimeIndex.value)
+	}
 
-  // 滚动到指定时间段
-  const activeTimeElId = ref('') // 当前选中的时间段的元素ID
-  const scrollToTimeConfig = (index) => {
-    nextTick(() => activeTimeElId.value = `timeItem${index}`)
-  }
+	// 滚动到指定时间段
+	const activeTimeElId = ref('') // 当前选中的时间段的元素ID
+	const scrollToTimeConfig = (index) => {
+		nextTick(() => activeTimeElId.value = `timeItem${index}`)
+	}
 
-  // 切换时间段
-  const activeTimeIndex = ref(0) // 当前选中的时间段的索引
-  const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]) // 当前选中的时间段
-  const handleChangeTimeConfig = (index) => {
-    activeTimeIndex.value = index
+	// 切换时间段
+	const activeTimeIndex = ref(0) // 当前选中的时间段的索引
+	const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]) // 当前选中的时间段
+	const handleChangeTimeConfig = (index, id) => {
+		console.log('点击',index + '+' + id)
+		activeTimeIndex.value = index
 
-    // 查询活动列表
-    activityPageParams.pageNo = 1
-    activityList.value = []
-    getActivityList();
-  }
+		// 查询活动列表
+		activityPageParams.pageNo = 1
+		activityPageParams.configId = id;
+		activityList.value = []
+		getActivityList();
+	}
 
-  // 倒计时
-  const countDown = computed(() => {
-    const endTime = activeTimeConfig.value?.endTime
-    if (endTime) {
-      return useDurationTime(`${dayjs().format('YYYY-MM-DD')} ${endTime}`);
-    }
-  });
+	// 倒计时
+	const countDown = computed(() => {
+		const endTime = activeTimeConfig.value?.endTime
+		if (endTime) {
+			return useDurationTime(`${dayjs().format('YYYY-MM-DD')} ${endTime}`);
+		}
+	});
 
-  //#endregion
+	//#endregion
 
-  //#region 分页查询活动列表
+	//#region 分页查询活动列表
 
-  // 查询活动列表
-  const activityPageParams = reactive({
-    id: 0, // 时间段 ID
-    pageNo: 1, // 页码
-    pageSize: 5, // 每页数量
-  })
-  const activityTotal = ref(0) // 活动总数
-  const activityList = ref([]) // 活动列表
-  const loadStatus = ref('') // 页面加载状态
-  async function getActivityList() {
-    loadStatus.value = 'loading';
-    const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams)
-    data.list.forEach(activity => {
-      // 计算抢购进度
-      activity.percent = parseInt(100 * (activity.totalStock - activity.stock) / activity.totalStock);
-    })
-    activityList.value = activityList.value.concat(...data.list);
-    activityTotal.value = data.total;
+	// 查询活动列表
+	const activityPageParams = reactive({
+		configId: 0, // 时间段 ID
+		pageNo: 1, // 页码
+		pageSize: 5, // 每页数量
+	})
+	const activityTotal = ref(0) // 活动总数
+	const activityList = ref([]) // 活动列表
+	const loadStatus = ref('') // 页面加载状态
+	async function getActivityList() {
+		loadStatus.value = 'loading';
+		const {
+			data
+		} = await SeckillApi.getSeckillActivityPage(activityPageParams)
+		data.list.forEach(activity => {
+			// 计算抢购进度
+			activity.percent = parseInt(100 * (activity.totalStock - activity.stock) / activity.totalStock);
+		})
+		activityList.value = activityList.value.concat(...data.list);
+		activityTotal.value = data.total;
 
-    loadStatus.value = activityList.value.length < activityTotal.value ? 'more' : 'noMore';
-  }
+		loadStatus.value = activityList.value.length < activityTotal.value ? 'more' : 'noMore';
+	}
 
-  // 加载更多
-  function loadMore() {
-    if (loadStatus.value !== 'noMore') {
-      activityPageParams.pageNo += 1
-      getActivityList();
-    }
-  }
-  // 上拉加载更多
-  onReachBottom(() => loadMore());
+	// 加载更多
+	function loadMore() {
+		if (loadStatus.value !== 'noMore') {
+			activityPageParams.pageNo += 1
+			getActivityList();
+		}
+	}
+	// 上拉加载更多
+	onReachBottom(() => loadMore());
 
-  //#endregion
+	//#endregion
 
-  // 页面初始化
-  onLoad(async () => {
-    await getSeckillConfigList()
-  });
+	// 页面初始化
+	onLoad(async () => {
+		await getSeckillConfigList()
+	});
 </script>
 <style lang="scss" scoped>
-  // 顶部背景图
-  .page-bg {
-    width: 100%;
-    height: 458rpx;
-    background: v-bind(headerBg) no-repeat;
-    background-size: 100% 100%;
-  }
+	// 顶部背景图
+	.page-bg {
+		width: 100%;
+		height: 458rpx;
+		background: v-bind(headerBg) no-repeat;
+		background-size: 100% 100%;
+	}
 
-  // 时间段轮播图
-  .header {
-    width: 710rpx;
-    height: 330rpx;
-    margin: -276rpx auto 0 auto;
-    border-radius: 14rpx;
-    overflow: hidden;
-    swiper{
-      height: 330rpx !important;
-      border-radius: 14rpx;
-      overflow: hidden;
-    }
+	// 时间段轮播图
+	.header {
+		width: 710rpx;
+		height: 330rpx;
+		margin: -276rpx auto 0 auto;
+		border-radius: 14rpx;
+		overflow: hidden;
 
-    image {
-      width: 100%;
-      height: 100%;
-      border-radius: 14rpx;
-      overflow: hidden;
-      img{
-        border-radius: 14rpx;
-      }
-    }
-  }
+		swiper {
+			height: 330rpx !important;
+			border-radius: 14rpx;
+			overflow: hidden;
+		}
 
-  // 时间段列表：左侧图标
-  .time-icon {
-    width: 75rpx;
-    height: 70rpx;
-  }
-  // 时间段列表
-  .time-list {
-    width: 596rpx;
-    white-space: nowrap;
-    // 时间段
-    .item {
-      display: inline-block;
-      font-size: 20rpx;
-      color: #666;
-      text-align: center;
-      box-sizing: border-box;
-      margin-right: 30rpx;
-      width: 130rpx;
-      // 开始时间
-      .time {
-        font-size: 36rpx;
-        font-weight: 600;
-        color: #333;
-      }
-      // 选中的时间段
-      &.active {
-        .time {
-          color: var(--ui-BG-Main);
-        }
-        // 状态
-        .status {
-          height: 30rpx;
-          line-height: 30rpx;
-          border-radius: 15rpx;
-          width: 128rpx;
-          background: linear-gradient(90deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%);
-          color: #fff;
-        }
-      }
-    }
-  }
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 14rpx;
+			overflow: hidden;
 
-  // 内容区
-  .list-content {
-    position: relative;
-    z-index: 3;
-    margin: 0 20rpx 0 20rpx;
-    background: #fff;
-    border-radius: 20rpx 20rpx 0 0;
-    .content-header {
-      width: 100%;
-      border-radius: 20rpx 20rpx 0 0;
-      height: 150rpx;
-      background: linear-gradient(180deg, #fff4f7, #ffe6ec);
+			img {
+				border-radius: 14rpx;
+			}
+		}
+	}
 
-      .content-header-box {
-        width: 678rpx;
-        height: 64rpx;
-        background: rgba($color: #fff, $alpha: 0.66);
-        border-radius: 32px;
-        // 场次倒计时内容
-        .countdown-title {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: #333333;
-          line-height: 28rpx;
-        }
-        // 场次倒计时
-        .countdown-time {
-          font-size: 28rpx;
-          color: rgba(#ed3c30, 0.23);
-          // 场次倒计时：小时部分
-          .countdown-h {
-            font-size: 24rpx;
-            font-family: OPPOSANS;
-            font-weight: 500;
-            color: #ffffff;
-            padding: 0 4rpx;
-            height: 40rpx;
-            background: rgba(#ed3c30, 0.23);
-            border-radius: 6rpx;
-          }
-          // 场次倒计时：分钟、秒
-          .countdown-num {
-            font-size: 24rpx;
-            font-family: OPPOSANS;
-            font-weight: 500;
-            color: #ffffff;
-            width: 40rpx;
-            height: 40rpx;
-            background: rgba(#ed3c30, 0.23);
-            border-radius: 6rpx;
-          }
-        }
-      }
-    }
-    // 活动列表
-    .scroll-box {
-      height: 900rpx;
-      // 活动
-      .goods-box {
-        position: relative;
-        // 抢购按钮
-        .cart-btn {
-          position: absolute;
-          bottom: 10rpx;
-          right: 20rpx;
-          z-index: 11;
-          height: 44rpx;
-          line-height: 50rpx;
-          padding: 0 20rpx;
-          border-radius: 25rpx;
-          font-size: 24rpx;
-          color: #fff;
-          background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+	// 时间段列表：左侧图标
+	.time-icon {
+		width: 75rpx;
+		height: 70rpx;
+	}
 
-          &.disabled {
-            background: $gray-b;
-            color: #fff;
-          }
-        }
-        // 秒杀限量商品数
-        .limit {
-          font-size: 22rpx;
-          color: $dark-9;
-          margin-bottom: 5rpx;
-        }
-      }
-    }
-  }
-</style>
+	// 时间段列表
+	.time-list {
+		width: 596rpx;
+		white-space: nowrap;
+
+		// 时间段
+		.item {
+			display: inline-block;
+			font-size: 20rpx;
+			color: #666;
+			text-align: center;
+			box-sizing: border-box;
+			margin-right: 30rpx;
+			width: 130rpx;
+
+			// 开始时间
+			.time {
+				font-size: 36rpx;
+				font-weight: 600;
+				color: #333;
+			}
+
+			// 选中的时间段
+			&.active {
+				.time {
+					color: var(--ui-BG-Main);
+				}
+
+				// 状态
+				.status {
+					height: 30rpx;
+					line-height: 30rpx;
+					border-radius: 15rpx;
+					width: 128rpx;
+					background: linear-gradient(90deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%);
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	// 内容区
+	.list-content {
+		position: relative;
+		z-index: 3;
+		margin: 0 20rpx 0 20rpx;
+		background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+
+		.content-header {
+			width: 100%;
+			border-radius: 20rpx 20rpx 0 0;
+			height: 150rpx;
+			background: linear-gradient(180deg, #fff4f7, #ffe6ec);
+
+			.content-header-box {
+				width: 678rpx;
+				height: 64rpx;
+				background: rgba($color: #fff, $alpha: 0.66);
+				border-radius: 32px;
+
+				// 场次倒计时内容
+				.countdown-title {
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 28rpx;
+				}
+
+				// 场次倒计时
+				.countdown-time {
+					font-size: 28rpx;
+					color: rgba(#ed3c30, 0.23);
+
+					// 场次倒计时：小时部分
+					.countdown-h {
+						font-size: 24rpx;
+						font-family: OPPOSANS;
+						font-weight: 500;
+						color: #ffffff;
+						padding: 0 4rpx;
+						height: 40rpx;
+						background: rgba(#ed3c30, 0.23);
+						border-radius: 6rpx;
+					}
+
+					// 场次倒计时：分钟、秒
+					.countdown-num {
+						font-size: 24rpx;
+						font-family: OPPOSANS;
+						font-weight: 500;
+						color: #ffffff;
+						width: 40rpx;
+						height: 40rpx;
+						background: rgba(#ed3c30, 0.23);
+						border-radius: 6rpx;
+					}
+				}
+			}
+		}
+
+		// 活动列表
+		.scroll-box {
+			height: 900rpx;
+
+			// 活动
+			.goods-box {
+				position: relative;
+
+				// 抢购按钮
+				.cart-btn {
+					position: absolute;
+					bottom: 10rpx;
+					right: 20rpx;
+					z-index: 11;
+					height: 44rpx;
+					line-height: 50rpx;
+					padding: 0 20rpx;
+					border-radius: 25rpx;
+					font-size: 24rpx;
+					color: #fff;
+					background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+
+					&.disabled {
+						background: $gray-b;
+						color: #fff;
+					}
+				}
+
+				// 秒杀限量商品数
+				.limit {
+					font-size: 22rpx;
+					color: $dark-9;
+					margin-bottom: 5rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 11a45958..ea2d6d03 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -207,7 +207,7 @@
 
 	// 立即购买
 	function onBuy(e) {
-		if (!state.selectedSku.id) {
+		if (!e.id) {
 			sheep.$helper.toast('请选择商品规格');
 			return;
 		}
@@ -536,7 +536,7 @@
 	}
 
 	.disContT1 {
-		width: 300rpx;
+		width: 400rpx;
 		height: 50rpx;
 		// background-color: green;
 		display: flex;
@@ -545,10 +545,10 @@
 	}
 
 	.disContT2 {
-		width: 300rpx;
+		width: 200rpx;
 		height: 50rpx;
 		line-height: 50rpx;
-		// background-color: green;
+		// background-color: gold;
 		font-size: 30rpx;
 		text-align: end;
 		color: white;
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 3d42a2bf..cc606ef4 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -1,558 +1,552 @@
 <!-- 秒杀商品详情 -->
 <template>
-  <s-layout :onShareAppMessage="shareInfo" navbar="goods">
-    <!-- 标题栏 -->
-    <detailNavbar />
-    <!-- 骨架屏 -->
-    <detailSkeleton v-if="state.skeletonLoading" />
-    <!-- 下架/售罄提醒 -->
-    <s-empty
-      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'"
-      text="活动不存在或已结束"
-      icon="/static/soldout-empty.png"
-      showAction
-      actionText="再逛逛"
-      actionUrl="/pages/goods/list"
-    />
-    <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"
-        />
+	<s-layout :onShareAppMessage="shareInfo" navbar="goods">
+		<!-- 标题栏 -->
+		<detailNavbar />
+		<!-- 骨架屏 -->
+		<detailSkeleton v-if="state.skeletonLoading" />
+		<!-- 下架/售罄提醒 -->
+		<s-empty v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== 'seckill'" text="活动不存在或已结束"
+			icon="/static/soldout-empty.png" showAction actionText="再逛逛" actionUrl="/pages/goods/list" />
+		<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" />
 
-        <!-- 价格+标题 -->
-        <view class="title-card 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="price-text ss-m-r-16">
-                {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
-              </view>
-              <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>
-            <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-60">
-            <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>
-            <detail-progress :percent="state.percent" />
-          </view>
+				<!-- 价格+标题 -->
+				<view class="title-card 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="price-text ss-m-r-16">
+								{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+							</view>
+							<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>
+						<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-60">
+						<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>
+						<detail-progress :percent="state.percent" />
+					</view>
 
-          <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="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>
+				<!-- 功能卡片 -->
+				<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" />
+			<!-- 评价 -->
+			<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="
+			<!-- 详情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="
+              ">
+							秒杀价
+						</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>
+            " :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>
 
 <script setup>
-  import { reactive, computed, ref, unref } from 'vue';
-  import { onLoad, onPageScroll } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import { isEmpty, min } from 'lodash-es';
-  import { useDurationTime, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods';
-  import detailNavbar from './components/detail/detail-navbar.vue';
-  import detailCellSku from './components/detail/detail-cell-sku.vue';
-  import detailTabbar from './components/detail/detail-tabbar.vue';
-  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 detailProgress from './components/detail/detail-progress.vue';
-  import SeckillApi from '@/sheep/api/promotion/seckill';
-  import SpuApi from '@/sheep/api/product/spu';
-  import { getTimeStatusEnum, TimeStatusEnum } from '@/sheep/util/const';
+	import {
+		reactive,
+		computed,
+		ref,
+		unref
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		isEmpty,
+		min
+	} from 'lodash-es';
+	import {
+		useDurationTime,
+		formatGoodsSwiper,
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
+	import detailNavbar from './components/detail/detail-navbar.vue';
+	import detailCellSku from './components/detail/detail-cell-sku.vue';
+	import detailTabbar from './components/detail/detail-tabbar.vue';
+	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 detailProgress from './components/detail/detail-progress.vue';
+	import SeckillApi from '@/sheep/api/promotion/seckill';
+	import SpuApi from '@/sheep/api/product/spu';
+	import {
+		getTimeStatusEnum,
+		TimeStatusEnum
+	} from '@/sheep/util/const';
 
-  const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-bg.png');
-  const btnBg = sheep.$url.css('/static/img/shop/goods/seckill-btn.png');
-  const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
-  const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
-  const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
+	const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-bg.png');
+	const btnBg = sheep.$url.css('/static/img/shop/goods/seckill-btn.png');
+	const disabledBtnBg = sheep.$url.css('/static/img/shop/goods/activity-btn-disabled.png');
+	const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
+	const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
-  onPageScroll(() => {});
-  const state = reactive({
-    skeletonLoading: true,
-    goodsInfo: {},
-    showSelectSku: false,
-    goodsSwiper: [],
-    selectedSku: {},
-    showModel: false,
-    total: 0,
-    percent: 0,
-    price: '',
-  });
+	onPageScroll(() => {});
+	const state = reactive({
+		skeletonLoading: true,
+		goodsInfo: {},
+		showSelectSku: false,
+		goodsSwiper: [],
+		selectedSku: {},
+		showModel: false,
+		total: 0,
+		percent: 0,
+		price: '',
+	});
 
-  const endTime = computed(() => {
-    return useDurationTime(activity.value.endTime);
-  });
+	const endTime = computed(() => {
+		return useDurationTime(activity.value.endTime);
+	});
 
-  // 规格变更
-  function onSkuChange(e) {
-    state.selectedSku = e;
-  }
+	// 规格变更
+	function onSkuChange(e) {
+		state.selectedSku = e;
+	}
 
-  // 立即购买
-  function onBuy(sku) {
-    sheep.$router.go('/pages/order/confirm', {
-      data: JSON.stringify({
-        order_type: 'goods',
-        buy_type: 'seckill',
-        seckillActivityId: activity.value.id,
-        items: [
-          {
-            skuId: sku.id,
-            count: sku.count,
-          },
-        ],
-      }),
-    });
-  }
+	// 立即购买
+	function onBuy(sku) {
+		sheep.$router.go('/pages/order/confirm', {
+			data: JSON.stringify({
+				order_type: 'goods',
+				buy_type: 'seckill',
+				seckillActivityId: activity.value.id,
+				items: [{
+					skuId: sku.id,
+					count: sku.count,
+				}, ],
+			}),
+		});
+	}
 
-  // 分享信息
-  const shareInfo = computed(() => {
-    if (isEmpty(unref(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 shareInfo = computed(() => {
+		if (isEmpty(unref(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();
-  const timeStatusEnum = ref('');
+	const activity = ref();
+	const timeStatusEnum = ref('');
 
-  // 查询活动
-  const getActivity = async (id) => {
-    const { data } = await SeckillApi.getSeckillActivity(id);
-    activity.value = data;
-    timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
-    state.percent = 100 - data.stock / data.totalStock * 100;
-    // 查询商品
-    await getSpu(data.spuId);
-  };
+	// 查询活动
+	const getActivity = async (id) => {
+		const {
+			data
+		} = await SeckillApi.getSeckillActivity(id);
+		activity.value = data;
+		timeStatusEnum.value = getTimeStatusEnum(activity.value.startTime, activity.value.endTime);
+		console.log('处理后',timeStatusEnum.value)
+		state.percent = 100 - data.stock / data.totalStock * 100;
+		// 查询商品
+		await getSpu(data.spuId);
+	};
 
-  // 查询商品
-  const getSpu = async (id) => {
-    const { data } = await SpuApi.getSpuDetail(id);
-    data.activity_type = 'seckill';
-    state.goodsInfo = data;
-    // 处理轮播图
-    state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
+	// 查询商品
+	const getSpu = async (id) => {
+		const {
+			data
+		} = await SpuApi.getSpuDetail(id);
+		data.activity_type = 'seckill';
+		state.goodsInfo = data;
+		// 处理轮播图
+		state.goodsSwiper = formatGoodsSwiper(state.goodsInfo.sliderPicUrls);
 
-    // 默认显示最低价
-    state.goodsInfo.price = min([
-      state.goodsInfo.price,
-      ...activity.value.products.map((spu) => spu.seckillPrice),
-    ]);
+		// 默认显示最低价
+		state.goodsInfo.price = min([
+			state.goodsInfo.price,
+			...activity.value.products.map((spu) => spu.seckillPrice),
+		]);
 
-    // 价格、库存使用活动的
-    data.skus.forEach((sku) => {
-      const product = activity.value.products.find((product) => product.skuId === sku.id);
-      if (product) {
-        sku.price = product.seckillPrice;
-        sku.stock = Math.min(sku.stock, product.stock);
-      } else {
-        // 找不到可能是没配置，则不能发起秒杀
-        sku.stock = 0;
-      }
-      // 设置限购数量
-      if (activity.value.totalLimitCount > 0 && activity.value.singleLimitCount > 0) {
-        sku.limitCount = Math.min(activity.value.totalLimitCount, activity.value.singleLimitCount);
-      } else if (activity.value.totalLimitCount > 0) {
-        sku.limitCount = activity.value.totalLimitCount;
-      } else if (activity.value.singleLimitCount > 0) {
-        sku.limitCount = activity.value.singleLimitCount;
-      }
-    });
+		// 价格、库存使用活动的
+		data.skus.forEach((sku) => {
+			const product = activity.value.products.find((product) => product.skuId === sku.id);
+			if (product) {
+				sku.price = product.seckillPrice;
+				sku.stock = Math.min(sku.stock, product.stock);
+			} else {
+				// 找不到可能是没配置，则不能发起秒杀
+				sku.stock = 0;
+			}
+			// 设置限购数量
+			if (activity.value.totalLimitCount > 0 && activity.value.singleLimitCount > 0) {
+				sku.limitCount = Math.min(activity.value.totalLimitCount, activity.value.singleLimitCount);
+			} else if (activity.value.totalLimitCount > 0) {
+				sku.limitCount = activity.value.totalLimitCount;
+			} else if (activity.value.singleLimitCount > 0) {
+				sku.limitCount = activity.value.singleLimitCount;
+			}
+		});
 
-    state.skeletonLoading = false;
-	console.log('shuju',state)
-  };
+		state.skeletonLoading = false;
+		console.log('shuju', state)
+	};
 
-  onLoad((options) => {
-    // 非法参数
-    if (!options.id) {
-      state.goodsInfo = null;
-      return;
-    }
+	onLoad((options) => {
+		// 非法参数
+		if (!options.id) {
+			state.goodsInfo = null;
+			return;
+		}
 
-    // 查询活动
-    getActivity(options.id);
-  });
+		// 查询活动
+		getActivity(options.id);
+	});
 </script>
 
 <style lang="scss" scoped>
-  .disabled-btn-box[disabled] {
-    background-color: transparent;
-  }
-  .detail-card {
-    background-color: $white;
-    margin: 14rpx 20rpx;
-    border-radius: 10rpx;
-    overflow: hidden;
-  }
+	.disabled-btn-box[disabled] {
+		background-color: transparent;
+	}
 
-  // 价格标题卡片
-  .title-card {
-    width: 710rpx;
-    box-sizing: border-box;
-    // height: 320rpx;
-    background-size: 100% 100%;
-    border-radius: 10rpx;
-    background-image: v-bind(headerBg);
-    background-repeat: no-repeat;
+	.detail-card {
+		background-color: $white;
+		margin: 14rpx 20rpx;
+		border-radius: 10rpx;
+		overflow: hidden;
+	}
 
-    .price-box {
-      .price-text {
-        font-size: 30rpx;
-        font-weight: 500;
-        color: #fff;
-        line-height: normal;
-        font-family: OPPOSANS;
+	// 价格标题卡片
+	.title-card {
+		width: 710rpx;
+		box-sizing: border-box;
+		// height: 320rpx;
+		background-size: 100% 100%;
+		border-radius: 10rpx;
+		background-image: v-bind(headerBg);
+		background-repeat: no-repeat;
 
-        &::before {
-          content: '￥';
-          font-size: 30rpx;
-        }
-      }
-    }
+		.price-box {
+			.price-text {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: #fff;
+				line-height: normal;
+				font-family: OPPOSANS;
 
-    .origin-price {
-      font-size: 24rpx;
-      font-weight: 400;
-      color: #fff;
-      opacity: 0.7;
+				&::before {
+					content: '￥';
+					font-size: 30rpx;
+				}
+			}
+		}
 
-      .origin-price-text {
-        text-decoration: line-through;
+		.origin-price {
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #fff;
+			opacity: 0.7;
 
-        font-family: OPPOSANS;
+			.origin-price-text {
+				text-decoration: line-through;
 
-        &::before {
-          content: '￥';
-        }
-      }
-    }
+				font-family: OPPOSANS;
 
-    .tig {
-      border: 2rpx solid #ffffff;
-      border-radius: 4rpx;
-      width: 126rpx;
-      height: 38rpx;
+				&::before {
+					content: '￥';
+				}
+			}
+		}
 
-      .tig-icon {
-        width: 40rpx;
-        height: 40rpx;
-        margin-left: -2rpx;
-        background: #ffffff;
-        border-radius: 4rpx 0 0 4rpx;
+		.tig {
+			border: 2rpx solid #ffffff;
+			border-radius: 4rpx;
+			width: 126rpx;
+			height: 38rpx;
 
-        .cicon-alarm {
-          font-size: 32rpx;
-          color: #fc6e6f;
-        }
-      }
+			.tig-icon {
+				width: 40rpx;
+				height: 40rpx;
+				margin-left: -2rpx;
+				background: #ffffff;
+				border-radius: 4rpx 0 0 4rpx;
 
-      .tig-title {
-        width: 86rpx;
-        font-size: 24rpx;
-        font-weight: 500;
-        line-height: normal;
-        color: #ffffff;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-      }
-    }
+				.cicon-alarm {
+					font-size: 32rpx;
+					color: #fc6e6f;
+				}
+			}
 
-    .countdown-title {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #ffffff;
-    }
+			.tig-title {
+				width: 86rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+				line-height: normal;
+				color: #ffffff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
 
-    .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;
-      }
-    }
+		.countdown-title {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #ffffff;
+		}
 
-    .discounts-box {
-      .discounts-tag {
-        padding: 4rpx 10rpx;
-        font-size: 24rpx;
-        font-weight: 500;
-        border-radius: 4rpx;
-        color: var(--ui-BG-Main);
-        // background: rgba(#2aae67, 0.05);
-        background: var(--ui-BG-Main-tag);
-      }
+		.countdown-time {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: #ffffff;
 
-      .discounts-title {
-        font-size: 24rpx;
-        font-weight: 500;
-        color: var(--ui-BG-Main);
-        line-height: normal;
-      }
+			.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;
+			}
 
-      .cicon-forward {
-        color: var(--ui-BG-Main);
-        font-size: 24rpx;
-        line-height: normal;
-        margin-top: 4rpx;
-      }
-    }
+			.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;
+			}
+		}
 
-    .title-text {
-      font-size: 30rpx;
-      font-weight: bold;
-      line-height: 42rpx;
-      color: #fff;
-    }
+		.discounts-box {
+			.discounts-tag {
+				padding: 4rpx 10rpx;
+				font-size: 24rpx;
+				font-weight: 500;
+				border-radius: 4rpx;
+				color: var(--ui-BG-Main);
+				// background: rgba(#2aae67, 0.05);
+				background: var(--ui-BG-Main-tag);
+			}
 
-    .subtitle-text {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: #ffffff;
-      line-height: 42rpx;
-      opacity: 0.9;
-    }
-  }
+			.discounts-title {
+				font-size: 24rpx;
+				font-weight: 500;
+				color: var(--ui-BG-Main);
+				line-height: normal;
+			}
 
-  // 购买
-  .buy-box {
-    .check-btn-box {
-      width: 248rpx;
-      height: 80rpx;
-      font-size: 24rpx;
-      font-weight: 600;
-      margin-left: -36rpx;
-      background-image: v-bind(btnBg);
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      color: #ffffff;
-      line-height: normal;
-      border-radius: 0px 40rpx 40rpx 0px;
-    }
+			.cicon-forward {
+				color: var(--ui-BG-Main);
+				font-size: 24rpx;
+				line-height: normal;
+				margin-top: 4rpx;
+			}
+		}
 
-    .disabled-btn-box {
-      width: 248rpx;
-      height: 80rpx;
-      font-size: 24rpx;
-      font-weight: 600;
-      margin-left: -36rpx;
-      background-image: v-bind(disabledBtnBg);
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-      color: #999999;
-      line-height: normal;
-      border-radius: 0px 40rpx 40rpx 0px;
-    }
-    .btn-price {
-      font-family: OPPOSANS;
+		.title-text {
+			font-size: 30rpx;
+			font-weight: bold;
+			line-height: 42rpx;
+			color: #fff;
+		}
 
-      &::before {
-        content: '￥';
-      }
-    }
+		.subtitle-text {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #ffffff;
+			line-height: 42rpx;
+			opacity: 0.9;
+		}
+	}
 
-    .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;
-      .no-original {
-        font-size: 28rpx;
-      }
+	// 购买
+	.buy-box {
+		.check-btn-box {
+			width: 248rpx;
+			height: 80rpx;
+			font-size: 24rpx;
+			font-weight: 600;
+			margin-left: -36rpx;
+			background-image: v-bind(btnBg);
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			color: #ffffff;
+			line-height: normal;
+			border-radius: 0px 40rpx 40rpx 0px;
+		}
 
-      .btn-title {
-        font-size: 28rpx;
-      }
-    }
-  }
+		.disabled-btn-box {
+			width: 248rpx;
+			height: 80rpx;
+			font-size: 24rpx;
+			font-weight: 600;
+			margin-left: -36rpx;
+			background-image: v-bind(disabledBtnBg);
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			color: #999999;
+			line-height: normal;
+			border-radius: 0px 40rpx 40rpx 0px;
+		}
 
-  //秒杀卡片
-  .seckill-box {
-    background: v-bind(seckillBg) no-repeat;
-    background-size: 100% 100%;
-  }
+		.btn-price {
+			font-family: OPPOSANS;
 
-  .groupon-box {
-    background: v-bind(grouponBg) no-repeat;
-    background-size: 100% 100%;
-  }
+			&::before {
+				content: '￥';
+			}
+		}
 
-  //活动卡片
-  .activity-box {
-    width: 100%;
-    height: 80rpx;
-    box-sizing: border-box;
-    margin-bottom: 10rpx;
+		.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;
 
-    .activity-title {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #ffffff;
-      line-height: 42rpx;
+			.no-original {
+				font-size: 28rpx;
+			}
 
-      .activity-icon {
-        width: 38rpx;
-        height: 38rpx;
-      }
-    }
+			.btn-title {
+				font-size: 28rpx;
+			}
+		}
+	}
 
-    .activity-go {
-      width: 70rpx;
-      height: 32rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      font-weight: 500;
-      color: #ff6000;
-      font-size: 24rpx;
-      line-height: normal;
-    }
-  }
+	//秒杀卡片
+	.seckill-box {
+		background: v-bind(seckillBg) no-repeat;
+		background-size: 100% 100%;
+	}
 
-  .model-box {
-    .title {
-      font-size: 36rpx;
-      font-weight: bold;
-      color: #333333;
-    }
+	.groupon-box {
+		background: v-bind(grouponBg) no-repeat;
+		background-size: 100% 100%;
+	}
 
-    .subtitle {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: #333333;
-    }
-  }
+	//活动卡片
+	.activity-box {
+		width: 100%;
+		height: 80rpx;
+		box-sizing: border-box;
+		margin-bottom: 10rpx;
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-</style>
+		.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%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 4f01bcb8..b52d0f12 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -1,462 +1,433 @@
 <template>
-  <s-layout title="确认订单">
-    <!-- 头部地址选择【配送地址】【自提地址】 -->
-    <AddressSelection v-model="addressState" @change="getOrderInfo()"/>
+	<s-layout title="确认订单">
+		<!-- 头部地址选择【配送地址】【自提地址】 -->
+		<AddressSelection v-model="addressState" @change="getOrderInfo()" />
 
-    <!-- 商品信息 -->
-    <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"
-      />
-      <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"
-          />
-        </view>
-      </view>
-    </view>
+		<!-- 商品信息 -->
+		<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" />
+			<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" />
+				</view>
+			</view>
+		</view>
 
-    <!-- 价格信息 -->
-    <view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
-      <view class="total-box-content border-bottom">
-        <view class="order-item ss-flex ss-col-center ss-row-between">
-          <view class="item-title">商品金额</view>
-          <view class="ss-flex ss-col-center">
-            <text class="item-value ss-m-r-24">
-              ￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
-            </text>
-          </view>
-        </view>
-        <view
-          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">
-            {{ state.pointStatus ? '剩余积分' : '当前积分' }}
-            <image
-              :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-              class="score-img"
-            />
-            <text class="item-value ss-m-r-24">
-              {{ state.pointStatus ? 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>
-          </view>
-        </view>
-        <!-- 快递配置时，信息的展示 -->
-        <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>
-        </view>
-        <!-- 门店自提时，需要填写姓名和手机号 -->
-        <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"
-            />
-          </view>
-        </view>
-        <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"
-            />
-          </view>
-        </view>
-        <!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
-        <view
-          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">
-            <text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
-              -￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
-            </text>
-            <text
-              class="item-value"
-              :class="couponNumber > 0 ? 'text-red' : 'text-disabled'"
-              v-else
-            >
-              {{
+		<!-- 价格信息 -->
+		<view class="bg-white total-card-box ss-p-20 ss-m-b-14 ss-r-10">
+			<view class="total-box-content border-bottom">
+				<view class="order-item ss-flex ss-col-center ss-row-between">
+					<view class="item-title">商品金额</view>
+					<view class="ss-flex ss-col-center">
+						<text class="item-value ss-m-r-24">
+							￥{{ fen2yuan(state.orderInfo.price.totalPrice) }}
+						</text>
+					</view>
+				</view>
+				<view 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">
+						{{ state.pointStatus ? '剩余积分' : '当前积分' }}
+						<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img" />
+						<text class="item-value ss-m-r-24">
+							{{ state.pointStatus ? 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>
+					</view>
+				</view>
+				<!-- 快递配置时，信息的展示 -->
+				<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>
+				</view>
+				<!-- 门店自提时，需要填写姓名和手机号 -->
+				<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" />
+					</view>
+				</view>
+				<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" />
+					</view>
+				</view>
+				<!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
+				<view 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">
+						<text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
+							-￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
+						</text>
+						<text class="item-value" :class="couponNumber > 0 ? 'text-red' : 'text-disabled'" v-else>
+							{{
                 couponNumber > 0 ? couponNumber + ' 张可用' : '暂无可用优惠券'
               }}
-            </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"
-        >
-          <view class="item-title">活动优惠</view>
-          <view class="ss-flex ss-col-center"  @tap="state.showDiscount = true">
-            <text class="item-value text-red">
-              -￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
-            </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.vipPrice > 0"
-        >
-          <view class="item-title">会员优惠</view>
-          <view class="ss-flex ss-col-center">
-            <text class="item-value text-red">
-              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
-            </text>
-          </view>
-        </view>
-      </view>
-      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
-        <view class="total-num ss-m-r-20">
-          共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
-        </view>
-        <view>合计：</view>
-        <view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
-      </view>
-    </view>
+						</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">
+					<view class="item-title">活动优惠</view>
+					<view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
+						<text class="item-value text-red">
+							-￥{{ fen2yuan(state.orderInfo.price.discountPrice) }}
+						</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.vipPrice > 0">
+					<view class="item-title">会员优惠</view>
+					<view class="ss-flex ss-col-center">
+						<text class="item-value text-red">
+							-￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+						</text>
+					</view>
+				</view>
+			</view>
+			<view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
+				<view class="total-num ss-m-r-20">
+					共{{ state.orderInfo.items.reduce((acc, item) => acc + item.count, 0) }}件
+				</view>
+				<view>合计：</view>
+				<view class="total-num text-red"> ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}</view>
+			</view>
+		</view>
 
-    <!-- 选择优惠券弹框 -->
-    <s-coupon-select
-      v-model="state.couponInfo"
-      :show="state.showCoupon"
-      @confirm="onSelectCoupon"
-      @close="state.showCoupon = false"
-    />
+		<!-- 选择优惠券弹框 -->
+		<s-coupon-select v-model="state.couponInfo" :show="state.showCoupon" @confirm="onSelectCoupon"
+			@close="state.showCoupon = false" />
 
-    <!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
-    <s-discount-list
-      v-model="state.orderInfo"
-      :show="state.showDiscount"
-      @close="state.showDiscount = false"
-    />
+		<!-- 满额折扣弹框 TODO 芋艿：后续要把优惠信息打进去 -->
+		<s-discount-list v-model="state.orderInfo" :show="state.showDiscount" @close="state.showDiscount = false" />
 
-    <!-- 底部 -->
-    <su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
-      <view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
-        <view class="total-box-footer ss-flex ss-col-center">
-          <view class="total-num ss-font-30 text-red">
-            ￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
-          </view>
-        </view>
-        <button
-          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
-          @tap="onConfirm"
-        >
-          提交订单
-        </button>
-      </view>
-    </su-fixed>
-  </s-layout>
+		<!-- 底部 -->
+		<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
+			<view class="footer-box border-top ss-flex ss-row-between ss-p-x-20 ss-col-center">
+				<view class="total-box-footer ss-flex ss-col-center">
+					<view class="total-num ss-font-30 text-red">
+						￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
+					</view>
+				</view>
+				<button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main" @tap="onConfirm">
+					提交订单
+				</button>
+			</view>
+		</su-fixed>
+	</s-layout>
 </template>
 
 <script setup>
-  import { reactive, ref } 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 { fen2yuan } from '@/sheep/hooks/useGoods';
+	import {
+		reactive,
+		ref
+	} 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 {
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
 
-  const state = reactive({
-    orderPayload: {},
-    orderInfo: {
-      items: [], // 商品项列表
-      price: {}, // 价格信息
-    },
-    showCoupon: false, // 是否展示优惠劵
-    couponInfo: [], // 优惠劵列表
-    showDiscount: false, // 是否展示营销活动
-    // ========== 积分 ==========
-    pointStatus: false, //是否使用积分
-  });
+	const state = reactive({
+		orderPayload: {},
+		orderInfo: {
+			items: [], // 商品项列表
+			price: {}, // 价格信息
+		},
+		showCoupon: false, // 是否展示优惠劵
+		couponInfo: [], // 优惠劵列表
+		showDiscount: false, // 是否展示营销活动
+		// ========== 积分 ==========
+		pointStatus: false, //是否使用积分
+	});
 
-  const addressState = ref({
-    addressInfo: {}, // 选择的收货地址
-    deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
-    isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
-    pickUpInfo: {}, // 选择的自提门店信息
-    receiverName: '', // 收件人名称
-    receiverMobile: '', // 收件人手机
-  });
+	const addressState = ref({
+		addressInfo: {}, // 选择的收货地址
+		deliveryType: 1, // 收货方式 1 - 快递配送；2 - 门店自提
+		isPickUp: true, // 门店自提是否开启 TODO puhui999: 默认开启，看看后端有开关的话接入
+		pickUpInfo: {}, // 选择的自提门店信息
+		receiverName: '', // 收件人名称
+		receiverMobile: '', // 收件人手机
+	});
 
-  // ========== 积分 ==========
-  /**
-   * 使用积分抵扣
-   */
-  const changeIntegral = async () => {
-    state.pointStatus = !state.pointStatus;
-    await getOrderInfo();
-  };
+	// ========== 积分 ==========
+	/**
+	 * 使用积分抵扣
+	 */
+	const changeIntegral = async () => {
+		state.pointStatus = !state.pointStatus;
+		await getOrderInfo();
+	};
 
-  // 选择优惠券
-  async function onSelectCoupon(couponId) {
-    state.orderPayload.couponId = couponId || 0;
-    await getOrderInfo();
-    state.showCoupon = false;
-  }
+	// 选择优惠券
+	async function onSelectCoupon(couponId) {
+		state.orderPayload.couponId = couponId || 0;
+		await getOrderInfo();
+		state.showCoupon = false;
+	}
 
-  // 提交订单
-  function onConfirm() {
-    if (addressState.value.deliveryType === 1 && !addressState.value.addressInfo.id) {
-      sheep.$helper.toast('请选择收货地址');
-      return;
-    }
-    if (addressState.value.deliveryType === 2) {
-      if (!addressState.value.pickUpInfo.id) {
-        sheep.$helper.toast('请选择自提门店地址');
-        return;
-      }
-      if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
-        sheep.$helper.toast('请填写联系人或联系人电话');
-        return;
-      }
-      if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
-        sheep.$helper.toast('请填写您的真实姓名');
-        return;
-      }
-      if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
-        sheep.$helper.toast('请填写正确的手机号');
-        return;
-      }
-    }
-    submitOrder();
-  }
+	// 提交订单
+	function onConfirm() {
+		if (addressState.value.deliveryType === 1 && !addressState.value.addressInfo.id) {
+			sheep.$helper.toast('请选择收货地址');
+			return;
+		}
+		if (addressState.value.deliveryType === 2) {
+			if (!addressState.value.pickUpInfo.id) {
+				sheep.$helper.toast('请选择自提门店地址');
+				return;
+			}
+			if (addressState.value.receiverName === '' || addressState.value.receiverMobile === '') {
+				sheep.$helper.toast('请填写联系人或联系人电话');
+				return;
+			}
+			if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(addressState.value.receiverName)) {
+				sheep.$helper.toast('请填写您的真实姓名');
+				return;
+			}
+			if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(addressState.value.receiverMobile)) {
+				sheep.$helper.toast('请填写正确的手机号');
+				return;
+			}
+		}
+		submitOrder();
+	}
 
-  // 创建订单&跳转
-  async function submitOrder() {
-    const { code, data } = await OrderApi.createOrder({
-      items: state.orderPayload.items,
-      couponId: state.orderPayload.couponId,
-      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,// 选择门店自提时，该字段为联系人手机
-      pointStatus: state.pointStatus,
-      combinationActivityId: state.orderPayload.combinationActivityId,
-      combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId,
-    });
-    if (code !== 0) {
-      return;
-    }
-    // 更新购物车列表，如果来自购物车
-    if (state.orderPayload.items[0].cartId > 0) {
-      sheep.$store('cart').getList();
-    }
+	// 创建订单&跳转
+	async function submitOrder() {
+		const {
+			code,
+			data
+		} = await OrderApi.createOrder({
+			items: state.orderPayload.items,
+			couponId: state.orderPayload.couponId,
+			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, // 选择门店自提时，该字段为联系人手机
+			pointStatus: state.pointStatus,
+			combinationActivityId: state.orderPayload.combinationActivityId,
+			combinationHeadId: state.orderPayload.combinationHeadId,
+			seckillActivityId: state.orderPayload.seckillActivityId,
+		});
+		if (code !== 0) {
+			return;
+		}
+		// 更新购物车列表，如果来自购物车
+		if (state.orderPayload.items[0].cartId > 0) {
+			sheep.$store('cart').getList();
+		}
 
-    // 跳转到支付页面
-    sheep.$router.redirect('/pages/pay/index', {
-      id: data.payOrderId,
-    });
-  }
+		// 跳转到支付页面
+		sheep.$router.redirect('/pages/pay/index', {
+			id: data.payOrderId,
+		});
+	}
 
-  // 检查库存 & 计算订单价格
-  async function getOrderInfo() {
-    // 计算价格
-    const { data, code } = await OrderApi.settlementOrder({
-      items: state.orderPayload.items,
-      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,// 选择门店自提时，该字段为联系人手机
-      pointStatus: state.pointStatus,
-      combinationActivityId: state.orderPayload.combinationActivityId,
-      combinationHeadId: state.orderPayload.combinationHeadId,
-      seckillActivityId: state.orderPayload.seckillActivityId,
-    });
-    if (code !== 0) {
-      return;
-    }
-    state.orderInfo = data;
-    // 设置收货地址
-    if (state.orderInfo.address) {
-      addressState.value.addressInfo = state.orderInfo.address;
-    }
-  }
+	// 检查库存 & 计算订单价格
+	async function getOrderInfo() {
+		// 计算价格
+		const {
+			data,
+			code
+		} = await OrderApi.settlementOrder({
+			items: state.orderPayload.items,
+			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, // 选择门店自提时，该字段为联系人手机
+			pointStatus: state.pointStatus,
+			combinationActivityId: state.orderPayload.combinationActivityId,
+			combinationHeadId: state.orderPayload.combinationHeadId,
+			seckillActivityId: state.orderPayload.seckillActivityId,
+		});
+		if (code !== 0) {
+			setTimeout(() => {
+				uni.navigateBack({
+					delta: 1
+				})
+			}, 1500)
+			return;
+		}
+		state.orderInfo = data;
+		// 设置收货地址
+		if (state.orderInfo.address) {
+			addressState.value.addressInfo = state.orderInfo.address;
+		}
+	}
 
-  // 获取可用优惠券
-  let couponNumber = ref(0)
-  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;
-	  couponNumber.value =  state.couponInfo.filter(item => item.match).length;
-    }
-  }
+	// 获取可用优惠券
+	let couponNumber = ref(0)
+	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;
+			couponNumber.value = state.couponInfo.filter(item => item.match).length;
+		}
+	}
 
-  onLoad(async (options) => {
-    if (!options.data) {
-      sheep.$helper.toast('参数不正确，请检查！');
-      return;
-    }
-    state.orderPayload = JSON.parse(options.data);
-    await getOrderInfo();
-    await getCoupons();
-	console.log('数据',state)
-  });
+	onLoad(async (options) => {
+		if (!options.data) {
+			sheep.$helper.toast('参数不正确，请检查！');
+			return;
+		}
+		state.orderPayload = JSON.parse(options.data);
+		await getOrderInfo();
+		await getCoupons();
+		console.log('数据', state)
+	});
 </script>
 
 <style lang="scss" scoped>
-  :deep() {
-    .uni-input-wrapper {
-      width: 320rpx;
-    }
+	:deep() {
+		.uni-input-wrapper {
+			width: 320rpx;
+		}
 
-    .uni-easyinput__content-input {
-      font-size: 28rpx;
-      height: 72rpx;
-      text-align: right !important;
-      padding-right: 0 !important;
+		.uni-easyinput__content-input {
+			font-size: 28rpx;
+			height: 72rpx;
+			text-align: right !important;
+			padding-right: 0 !important;
 
-      .uni-input-input {
-        font-weight: 500;
-        color: #333333;
-        font-size: 26rpx;
-        height: 32rpx;
-        margin-top: 4rpx;
-      }
-    }
+			.uni-input-input {
+				font-weight: 500;
+				color: #333333;
+				font-size: 26rpx;
+				height: 32rpx;
+				margin-top: 4rpx;
+			}
+		}
 
-    .uni-easyinput__content {
-      display: flex !important;
-      align-items: center !important;
-      justify-content: right !important;
-    }
-  }
+		.uni-easyinput__content {
+			display: flex !important;
+			align-items: center !important;
+			justify-content: right !important;
+		}
+	}
 
-  .score-img {
-    width: 36rpx;
-    height: 36rpx;
-    margin: 0 4rpx;
-  }
+	.score-img {
+		width: 36rpx;
+		height: 36rpx;
+		margin: 0 4rpx;
+	}
 
-  .order-item {
-    height: 80rpx;
+	.order-item {
+		height: 80rpx;
 
-    .item-title {
-      font-size: 28rpx;
-      font-weight: 400;
-    }
+		.item-title {
+			font-size: 28rpx;
+			font-weight: 400;
+		}
 
-    .item-value {
-      font-size: 28rpx;
-      font-weight: 500;
-      font-family: OPPOSANS;
-    }
+		.item-value {
+			font-size: 28rpx;
+			font-weight: 500;
+			font-family: OPPOSANS;
+		}
 
-    .text-disabled {
-      color: #bbbbbb;
-    }
+		.text-disabled {
+			color: #bbbbbb;
+		}
 
-    .item-icon {
-      color: $dark-9;
-    }
+		.item-icon {
+			color: $dark-9;
+		}
 
-    .remark-input {
-      text-align: right;
-    }
+		.remark-input {
+			text-align: right;
+		}
 
-    .item-placeholder {
-      color: $dark-9;
-      font-size: 26rpx;
-      text-align: right;
-    }
-  }
+		.item-placeholder {
+			color: $dark-9;
+			font-size: 26rpx;
+			text-align: right;
+		}
+	}
 
-  .total-box-footer {
-    height: 90rpx;
+	.total-box-footer {
+		height: 90rpx;
 
-    .total-num {
-      color: #333333;
-      font-family: OPPOSANS;
-    }
-  }
+		.total-num {
+			color: #333333;
+			font-family: OPPOSANS;
+		}
+	}
 
-  .footer-box {
-    height: 100rpx;
+	.footer-box {
+		height: 100rpx;
 
-    .submit-btn {
-      width: 240rpx;
-      height: 70rpx;
-      font-size: 28rpx;
-      font-weight: 500;
+		.submit-btn {
+			width: 240rpx;
+			height: 70rpx;
+			font-size: 28rpx;
+			font-weight: 500;
 
-      .goto-pay-text {
-        line-height: 28rpx;
-      }
-    }
+			.goto-pay-text {
+				line-height: 28rpx;
+			}
+		}
 
-    .cancel-btn {
-      width: 240rpx;
-      height: 80rpx;
-      font-size: 26rpx;
-      background-color: #e5e5e5;
-      color: $dark-9;
-    }
-  }
+		.cancel-btn {
+			width: 240rpx;
+			height: 80rpx;
+			font-size: 26rpx;
+			background-color: #e5e5e5;
+			color: $dark-9;
+		}
+	}
 
-  .title {
-    font-size: 36rpx;
-    font-weight: bold;
-    color: #333333;
-  }
+	.title {
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #333333;
+	}
 
-  .subtitle {
-    font-size: 28rpx;
-    color: #999999;
-  }
+	.subtitle {
+		font-size: 28rpx;
+		color: #999999;
+	}
 
-  .cicon-checkbox {
-    font-size: 36rpx;
-    color: var(--ui-BG-Main);
-  }
+	.cicon-checkbox {
+		font-size: 36rpx;
+		color: var(--ui-BG-Main);
+	}
 
-  .cicon-box {
-    font-size: 36rpx;
-    color: #999999;
-  }
-</style>
+	.cicon-box {
+		font-size: 36rpx;
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 926ecfde..6f19e8f2 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,495 +1,466 @@
 <!-- 订单列表 -->
 <template>
-  <s-layout title="我的订单">
-    <su-sticky bgColor="#fff">
-      <su-tabs
-        :list="tabMaps"
-        :scrollable="false"
-        @change="onTabsChange"
-        :current="state.currentTab"
-      />
-    </su-sticky>
-    <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
-    <view v-if="state.pagination.total > 0">
-      <view
-        class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
-        v-for="order in state.pagination.list"
-        :key="order.id"
-        @tap="onOrderDetail(order.id)"
-      >
-        <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
-          <view class="order-no">订单号：{{ order.no }}</view>
-          <view class="order-state ss-font-26" :class="formatOrderColor(order)">
-            {{ formatOrderStatus(order) }}
-          </view>
-        </view>
-        <view class="border-bottom" v-for="item in order.items" :key="item.id">
-          <s-goods-item
-            :img="item.picUrl"
-            :title="item.spuName"
-            :skuText="item.properties.map((property) => property.valueName).join(' ')"
-            :price="item.price"
-            :num="item.count"
-          />
-        </view>
-        <view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
-          <view class="ss-flex ss-col-center">
-            <view class="discounts-title pay-color"
-              >共 {{ order.productCount }} 件商品,总金额:</view
-            >
-            <view class="discounts-money pay-color"> ￥{{ fen2yuan(order.payPrice) }} </view>
-          </view>
-        </view>
-        <view
-          class="order-card-footer ss-flex ss-col-center ss-p-x-20"
-          :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'"
-        >
-          <view class="ss-flex ss-col-center">
-            <button
-              v-if="order.buttons.includes('combination')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onOrderGroupon(order)"
-            >
-              拼团详情
-            </button>
-            <button
-              v-if="order.buttons.length === 0"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onOrderDetail(order.id)"
-            >
-              查看详情
-            </button>
-            <button
-              v-if="order.buttons.includes('confirm')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onConfirm(order)"
-            >
-              确认收货
-            </button>
-            <button
-              v-if="order.buttons.includes('express')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onExpress(order.id)"
-            >
-              查看物流
-            </button>
-            <button
-              v-if="order.buttons.includes('cancel')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onCancel(order.id)"
-            >
-              取消订单
-            </button>
-            <button
-              v-if="order.buttons.includes('comment')"
-              class="tool-btn ss-reset-button"
-              @tap.stop="onComment(order.id)"
-            >
-              评价
-            </button>
-            <button
-              v-if="order.buttons.includes('delete')"
-              class="delete-btn ss-reset-button"
-              @tap.stop="onDelete(order.id)"
-            >
-              删除订单
-            </button>
-            <button
-              v-if="order.buttons.includes('pay')"
-              class="tool-btn ss-reset-button ui-BG-Main-Gradient"
-              @tap.stop="onPay(order.payOrderId)"
-            >
-              继续支付
-            </button>
-          </view>
-        </view>
-      </view>
-    </view>
+	<s-layout title="我的订单">
+		<su-sticky bgColor="#fff">
+			<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
+		</su-sticky>
+		<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
+		<view v-if="state.pagination.total > 0">
+			<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.list"
+				:key="order.id" @tap="onOrderDetail(order.id)">
+				<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+					<view class="order-no">订单号：{{ order.no }}</view>
+					<view class="order-state ss-font-26" :class="formatOrderColor(order)">
+						{{ formatOrderStatus(order) }}
+					</view>
+				</view>
+				<view class="border-bottom" v-for="item in order.items" :key="item.id">
+					<s-goods-item :img="item.picUrl" :title="item.spuName"
+						:skuText="item.properties.map((property) => property.valueName).join(' ')" :price="item.price"
+						:num="item.count" />
+				</view>
+				<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
+					<view class="ss-flex ss-col-center">
+						<view class="discounts-title pay-color">共 {{ order.productCount }} 件商品,总金额:</view>
+						<view class="discounts-money pay-color"> ￥{{ fen2yuan(order.payPrice) }} </view>
+					</view>
+				</view>
+				<view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+					:class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
+					<view class="ss-flex ss-col-center">
+						<button v-if="order.buttons.includes('combination') && order.status !== 0 && order.status !== 40" class="tool-btn ss-reset-button"
+							@tap.stop="onOrderGroupon(order)">
+							拼团详情
+						</button>
+						<button v-if="order.buttons.length === 0" class="tool-btn ss-reset-button"
+							@tap.stop="onOrderDetail(order.id)">
+							查看详情
+						</button>
+						<button v-if="order.buttons.includes('confirm')" class="tool-btn ss-reset-button"
+							@tap.stop="onConfirm(order)">
+							确认收货
+						</button>
+						<button v-if="order.buttons.includes('express')" class="tool-btn ss-reset-button"
+							@tap.stop="onExpress(order.id)">
+							查看物流
+						</button>
+						<button v-if="order.buttons.includes('cancel')" class="tool-btn ss-reset-button"
+							@tap.stop="onCancel(order.id)">
+							取消订单
+						</button>
+						<button v-if="order.buttons.includes('comment')" class="tool-btn ss-reset-button"
+							@tap.stop="onComment(order.id)">
+							评价
+						</button>
+						<button v-if="order.buttons.includes('delete')" class="delete-btn ss-reset-button"
+							@tap.stop="onDelete(order.id)">
+							删除订单
+						</button>
+						<button v-if="order.buttons.includes('pay')"
+							class="tool-btn ss-reset-button ui-BG-Main-Gradient" @tap.stop="onPay(order.payOrderId)">
+							继续支付
+						</button>
+					</view>
+				</view>
+			</view>
+		</view>
 
-    <!-- 加载更多 -->
-    <uni-load-more
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
+		<!-- 加载更多 -->
+		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
         contentdown: '上拉加载更多',
-      }"
-      @tap="loadMore"
-    />
-  </s-layout>
+      }" @tap="loadMore" />
+	</s-layout>
 </template>
 
 <script setup>
-  import { reactive } from 'vue';
-  import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
-  import {
-    fen2yuan,
-    formatOrderColor,
-    formatOrderStatus,
-    handleOrderButtons,
-  } from '@/sheep/hooks/useGoods';
-  import sheep from '@/sheep';
-  import _ from 'lodash-es';
-  import { isEmpty } from 'lodash-es';
-  import OrderApi from '@/sheep/api/trade/order';
-  import { resetPagination } from '@/sheep/util';
+	import {
+		reactive
+	} from 'vue';
+	import {
+		onLoad,
+		onReachBottom,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import {
+		fen2yuan,
+		formatOrderColor,
+		formatOrderStatus,
+		handleOrderButtons,
+	} from '@/sheep/hooks/useGoods';
+	import sheep from '@/sheep';
+	import _ from 'lodash-es';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import OrderApi from '@/sheep/api/trade/order';
+	import {
+		resetPagination
+	} from '@/sheep/util';
 
-  // 数据
-  const state = reactive({
-    currentTab: 0, // 选中的 tabMaps 下标
-    pagination: {
-      list: [],
-      total: 0,
-      pageNo: 1,
-      pageSize: 5,
-    },
-    loadStatus: '',
-  });
+	// 数据
+	const state = reactive({
+		currentTab: 0, // 选中的 tabMaps 下标
+		pagination: {
+			list: [],
+			total: 0,
+			pageNo: 1,
+			pageSize: 5,
+		},
+		loadStatus: '',
+	});
 
-  const tabMaps = [
-    {
-      name: '全部',
-    },
-    {
-      name: '待付款',
-      value: 0,
-    },
-    {
-      name: '待发货',
-      value: 10,
-    },
-    {
-      name: '待收货',
-      value: 20,
-    },
-    {
-      name: '待评价',
-      value: 30,
-    },
-  ];
+	const tabMaps = [{
+			name: '全部',
+		},
+		{
+			name: '待付款',
+			value: 0,
+		},
+		{
+			name: '待发货',
+			value: 10,
+		},
+		{
+			name: '待收货',
+			value: 20,
+		},
+		{
+			name: '待评价',
+			value: 30,
+		},
+	];
 
-  // 切换选项卡
-  function onTabsChange(e) {
-    if (state.currentTab === e.index) {
-      return;
-    }
-    // 重头加载代码
-    resetPagination(state.pagination);
-    state.currentTab = e.index;
-    getOrderList();
-  }
+	// 切换选项卡
+	function onTabsChange(e) {
+		if (state.currentTab === e.index) {
+			return;
+		}
+		// 重头加载代码
+		resetPagination(state.pagination);
+		state.currentTab = e.index;
+		getOrderList();
+	}
 
-  // 订单详情
-  function onOrderDetail(id) {
-    sheep.$router.go('/pages/order/detail', {
-      id,
-    });
-  }
+	// 订单详情
+	function onOrderDetail(id) {
+		sheep.$router.go('/pages/order/detail', {
+			id,
+		});
+	}
 
-  // 跳转拼团记录的详情
-  function onOrderGroupon(order) {
-    sheep.$router.go('/pages/activity/groupon/detail', {
-      id: order.combinationRecordId,
-    });
-  }
+	// 跳转拼团记录的详情
+	function onOrderGroupon(order) {
+		sheep.$router.go('/pages/activity/groupon/detail', {
+			id: order.combinationRecordId,
+		});
+	}
 
-  // 继续支付
-  function onPay(payOrderId) {
-    sheep.$router.go('/pages/pay/index', {
-      id: payOrderId,
-    });
-  }
+	// 继续支付
+	function onPay(payOrderId) {
+		sheep.$router.go('/pages/pay/index', {
+			id: payOrderId,
+		});
+	}
 
-  // 评价
-  function onComment(id) {
-    sheep.$router.go('/pages/goods/comment/add', {
-      id,
-    });
-  }
+	// 评价
+	function onComment(id) {
+		sheep.$router.go('/pages/goods/comment/add', {
+			id,
+		});
+	}
 
-  // 确认收货 TODO 芋艿：待测试
-  async function onConfirm(order, ignore = false) {
-    // 需开启确认收货组件
-    // todo: 芋艿：需要后续接入微信收货组件
-    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
-    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-    let isOpenBusinessView = true;
-    if (
-      sheep.$platform.name === 'WechatMiniProgram' &&
-      !isEmpty(order.wechat_extra_data) &&
-      isOpenBusinessView &&
-      !ignore
-    ) {
-      mpConfirm(order);
-      return;
-    }
+	// 确认收货 TODO 芋艿：待测试
+	async function onConfirm(order, ignore = false) {
+		// 需开启确认收货组件
+		// todo: 芋艿：需要后续接入微信收货组件
+		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+		let isOpenBusinessView = true;
+		if (
+			sheep.$platform.name === 'WechatMiniProgram' &&
+			!isEmpty(order.wechat_extra_data) &&
+			isOpenBusinessView &&
+			!ignore
+		) {
+			mpConfirm(order);
+			return;
+		}
 
-    // 正常的确认收货流程
-    const { code } = await OrderApi.receiveOrder(order.id);
-    if (code === 0) {
-      resetPagination(state.pagination);
-      await getOrderList();
-    }
-  }
+		// 正常的确认收货流程
+		const {
+			code
+		} = await OrderApi.receiveOrder(order.id);
+		if (code === 0) {
+			resetPagination(state.pagination);
+			await getOrderList();
+		}
+	}
 
-  // #ifdef MP-WEIXIN
-  // 小程序确认收货组件 TODO 芋艿：后续再接入
-  function mpConfirm(order) {
-    if (!wx.openBusinessView) {
-      sheep.$helper.toast(`请升级微信版本`);
-      return;
-    }
-    wx.openBusinessView({
-      businessType: 'weappOrderConfirm',
-      extraData: {
-        merchant_id: '1481069012',
-        merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
-        transaction_id: order.wechat_extra_data.transaction_id,
-      },
-      success(response) {
-        console.log('success:', response);
-        if (response.errMsg === 'openBusinessView:ok') {
-          if (response.extraData.status === 'success') {
-            onConfirm(order, true);
-          }
-        }
-      },
-      fail(error) {
-        console.log('error:', error);
-      },
-      complete(result) {
-        console.log('result:', result);
-      },
-    });
-  }
-  // #endif
+	// #ifdef MP-WEIXIN
+	// 小程序确认收货组件 TODO 芋艿：后续再接入
+	function mpConfirm(order) {
+		if (!wx.openBusinessView) {
+			sheep.$helper.toast(`请升级微信版本`);
+			return;
+		}
+		wx.openBusinessView({
+			businessType: 'weappOrderConfirm',
+			extraData: {
+				merchant_id: '1481069012',
+				merchant_trade_no: order.wechat_extra_data.merchant_trade_no,
+				transaction_id: order.wechat_extra_data.transaction_id,
+			},
+			success(response) {
+				console.log('success:', response);
+				if (response.errMsg === 'openBusinessView:ok') {
+					if (response.extraData.status === 'success') {
+						onConfirm(order, true);
+					}
+				}
+			},
+			fail(error) {
+				console.log('error:', error);
+			},
+			complete(result) {
+				console.log('result:', result);
+			},
+		});
+	}
+	// #endif
 
-  // 查看物流
-  async function onExpress(id) {
-    sheep.$router.go('/pages/order/express/log', {
-      id,
-    });
-  }
+	// 查看物流
+	async function onExpress(id) {
+		sheep.$router.go('/pages/order/express/log', {
+			id,
+		});
+	}
 
-  // 取消订单
-  async function onCancel(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要取消订单吗?',
-      success: async function (res) {
-        if (!res.confirm) {
-          return;
-        }
-        const { code } = await OrderApi.cancelOrder(orderId);
-        if (code === 0) {
-          // 修改数据的状态
-          let index = state.pagination.list.findIndex((order) => order.id === orderId);
-          const orderInfo = state.pagination.list[index];
-          orderInfo.status = 40;
-          handleOrderButtons(orderInfo);
-        }
-      },
-    });
-  }
+	// 取消订单
+	async function onCancel(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要取消订单吗?',
+			success: async function(res) {
+				if (!res.confirm) {
+					return;
+				}
+				const {
+					code
+				} = await OrderApi.cancelOrder(orderId);
+				if (code === 0) {
+					// 修改数据的状态
+					let index = state.pagination.list.findIndex((order) => order.id === orderId);
+					const orderInfo = state.pagination.list[index];
+					orderInfo.status = 40;
+					handleOrderButtons(orderInfo);
+				}
+			},
+		});
+	}
 
-  // 删除订单
-  function onDelete(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要删除订单吗?',
-      success: async function (res) {
-        if (res.confirm) {
-          const { code } = await OrderApi.deleteOrder(orderId);
-          if (code === 0) {
-            // 删除数据
-            let index = state.pagination.list.findIndex((order) => order.id === orderId);
-            state.pagination.list.splice(index, 1);
-          }
-        }
-      },
-    });
-  }
+	// 删除订单
+	function onDelete(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要删除订单吗?',
+			success: async function(res) {
+				if (res.confirm) {
+					const {
+						code
+					} = await OrderApi.deleteOrder(orderId);
+					if (code === 0) {
+						// 删除数据
+						let index = state.pagination.list.findIndex((order) => order.id === orderId);
+						state.pagination.list.splice(index, 1);
+					}
+				}
+			},
+		});
+	}
 
-  // 获取订单列表
-  async function getOrderList() {
-    state.loadStatus = 'loading';
-    let { code, data } = await OrderApi.getOrderPage({
-      pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize,
-      status: tabMaps[state.currentTab].value,
-      commentStatus: tabMaps[state.currentTab].value === 30 ? false : null,
-    });
-    if (code !== 0) {
-      return;
-    }
-    data.list.forEach((order) => handleOrderButtons(order));
-    state.pagination.list = _.concat(state.pagination.list, data.list);
-    state.pagination.total = data.total;
-    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-  }
+	// 获取订单列表
+	async function getOrderList() {
+		state.loadStatus = 'loading';
+		let {
+			code,
+			data
+		} = await OrderApi.getOrderPage({
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+			status: tabMaps[state.currentTab].value,
+			commentStatus: tabMaps[state.currentTab].value === 30 ? false : null,
+		});
+		if (code !== 0) {
+			return;
+		}
+		data.list.forEach((order) => handleOrderButtons(order));
+		state.pagination.list = _.concat(state.pagination.list, data.list);
+		state.pagination.total = data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
 
-  onLoad(async (options) => {
-    if (options.type) {
-      state.currentTab = options.type;
-    }
-    await getOrderList();
-  });
+	onLoad(async (options) => {
+		if (options.type) {
+			state.currentTab = options.type;
+		}
+		await getOrderList();
+	});
 
-  // 加载更多
-  function loadMore() {
-    if (state.loadStatus === 'noMore') {
-      return;
-    }
-    state.pagination.pageNo++;
-    getOrderList();
-  }
+	// 加载更多
+	function loadMore() {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getOrderList();
+	}
 
-  // 上拉加载更多
-  onReachBottom(() => {
-    loadMore();
-  });
+	// 上拉加载更多
+	onReachBottom(() => {
+		loadMore();
+	});
 
-  // 下拉刷新
-  onPullDownRefresh(() => {
-    resetPagination(state.pagination);
-    getOrderList();
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  });
+	// 下拉刷新
+	onPullDownRefresh(() => {
+		resetPagination(state.pagination);
+		getOrderList();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
 </script>
 
 <style lang="scss" scoped>
-  .score-img {
-    width: 36rpx;
-    height: 36rpx;
-    margin: 0 4rpx;
-  }
+	.score-img {
+		width: 36rpx;
+		height: 36rpx;
+		margin: 0 4rpx;
+	}
 
-  .tool-btn {
-    width: 160rpx;
-    height: 60rpx;
-    background: #f6f6f6;
-    font-size: 26rpx;
-    border-radius: 30rpx;
-    margin-right: 10rpx;
+	.tool-btn {
+		width: 160rpx;
+		height: 60rpx;
+		background: #f6f6f6;
+		font-size: 26rpx;
+		border-radius: 30rpx;
+		margin-right: 10rpx;
 
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
+		&:last-of-type {
+			margin-right: 0;
+		}
+	}
 
-  .delete-btn {
-    width: 160rpx;
-    height: 56rpx;
-    color: #ff3000;
-    background: #fee;
-    border-radius: 28rpx;
-    font-size: 26rpx;
-    margin-right: 10rpx;
-    line-height: normal;
+	.delete-btn {
+		width: 160rpx;
+		height: 56rpx;
+		color: #ff3000;
+		background: #fee;
+		border-radius: 28rpx;
+		font-size: 26rpx;
+		margin-right: 10rpx;
+		line-height: normal;
 
-    &:last-of-type {
-      margin-right: 0;
-    }
-  }
+		&:last-of-type {
+			margin-right: 0;
+		}
+	}
 
-  .apply-btn {
-    width: 140rpx;
-    height: 50rpx;
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    border: 2rpx solid #dcdcdc;
-    line-height: normal;
-    margin-left: 16rpx;
-  }
+	.apply-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		border: 2rpx solid #dcdcdc;
+		line-height: normal;
+		margin-left: 16rpx;
+	}
 
-  .swiper-box {
-    flex: 1;
+	.swiper-box {
+		flex: 1;
 
-    .swiper-item {
-      height: 100%;
-      width: 100%;
-    }
-  }
+		.swiper-item {
+			height: 100%;
+			width: 100%;
+		}
+	}
 
-  .order-list-card-box {
-    .order-card-header {
-      height: 80rpx;
+	.order-list-card-box {
+		.order-card-header {
+			height: 80rpx;
 
-      .order-no {
-        font-size: 26rpx;
-        font-weight: 500;
-      }
+			.order-no {
+				font-size: 26rpx;
+				font-weight: 500;
+			}
 
-      .order-state {
-      }
-    }
+			.order-state {}
+		}
 
-    .pay-box {
-      .discounts-title {
-        font-size: 24rpx;
-        line-height: normal;
-        color: #999999;
-      }
+		.pay-box {
+			.discounts-title {
+				font-size: 24rpx;
+				line-height: normal;
+				color: #999999;
+			}
 
-      .discounts-money {
-        font-size: 24rpx;
-        line-height: normal;
-        color: #999;
-        font-family: OPPOSANS;
-      }
+			.discounts-money {
+				font-size: 24rpx;
+				line-height: normal;
+				color: #999;
+				font-family: OPPOSANS;
+			}
 
-      .pay-color {
-        color: #333;
-      }
-    }
+			.pay-color {
+				color: #333;
+			}
+		}
 
-    .order-card-footer {
-      height: 100rpx;
+		.order-card-footer {
+			height: 100rpx;
 
-      .more-item-box {
-        padding: 20rpx;
+			.more-item-box {
+				padding: 20rpx;
 
-        .more-item {
-          height: 60rpx;
+				.more-item {
+					height: 60rpx;
 
-          .title {
-            font-size: 26rpx;
-          }
-        }
-      }
+					.title {
+						font-size: 26rpx;
+					}
+				}
+			}
 
-      .more-btn {
-        color: $dark-9;
-        font-size: 24rpx;
-      }
+			.more-btn {
+				color: $dark-9;
+				font-size: 24rpx;
+			}
 
-      .content {
-        width: 154rpx;
-        color: #333333;
-        font-size: 26rpx;
-        font-weight: 500;
-      }
-    }
-  }
+			.content {
+				width: 154rpx;
+				color: #333333;
+				font-size: 26rpx;
+				font-weight: 500;
+			}
+		}
+	}
 
-  :deep(.uni-tooltip-popup) {
-    background: var(--ui-BG);
-  }
+	:deep(.uni-tooltip-popup) {
+		background: var(--ui-BG);
+	}
 
-  .warning-color {
-    color: #faad14;
-  }
+	.warning-color {
+		color: #faad14;
+	}
 
-  .danger-color {
-    color: #ff3000;
-  }
+	.danger-color {
+		color: #ff3000;
+	}
 
-  .success-color {
-    color: #52c41a;
-  }
+	.success-color {
+		color: #52c41a;
+	}
 
-  .info-color {
-    color: #999999;
-  }
-</style>
+	.info-color {
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-activity-pop/s-activity-pop.vue b/sheep/components/s-activity-pop/s-activity-pop.vue
index 4baf41d9..e492f560 100644
--- a/sheep/components/s-activity-pop/s-activity-pop.vue
+++ b/sheep/components/s-activity-pop/s-activity-pop.vue
@@ -3,7 +3,7 @@
 	<su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose>
 		<view class="model-box">
 			<view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠</view>
-			<view v-if="state.activityMap.length">
+			<view v-if="state.activityMap[state.activityInfo[0]?.id]?.reduc">
 				<view class="titleLi">促销</view>
 				<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
 					<view class="actBox">
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index 48bd9f65..92782102 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -124,6 +124,7 @@
 
 	// 加入购物车
 	function onAddCart() {
+		console.log('购物车',state.selectedSku)
 		if (state.selectedSku.id <= 0) {
 			sheep.$helper.toast('请选择规格');
 			return;
diff --git a/sheep/util/const.js b/sheep/util/const.js
index 9cf98bf3..d11dd9f1 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -100,6 +100,7 @@ export const WxaSubscribeTemplate = {
 
 export const getTimeStatusEnum = (startTime, endTime) => {
     const now = dayjs();
+	console.log('处理的数据',now,startTime,endTime)
     if (now.isBefore(startTime)) {
         return TimeStatusEnum.WAIT_START;
     } else if (now.isAfter(endTime)) {