diff --git a/pages/activity/point/exchange_detail.vue b/pages/activity/point/exchange_detail.vue
index 651d02b..27d2213 100644
--- a/pages/activity/point/exchange_detail.vue
+++ b/pages/activity/point/exchange_detail.vue
@@ -34,7 +34,7 @@
 							{{item.properties.map((property) => property.valueName).join(' ')}}
 						</view>
 						<view class="b">
-							10积分（待对接接口）
+							{{state.orderInfo.usePoint}}积分
 						</view>
 					</view>
 				</view>
@@ -74,7 +74,7 @@
 						支付积分
 					</view>
 					<view class="r">
-						10（待接口对接）
+						{{state.orderInfo.usePoint}}
 					</view>
 				</view>
 			</view>
diff --git a/pages/activity/point/exchange_list.vue b/pages/activity/point/exchange_list.vue
index 637af1f..e6b4a27 100644
--- a/pages/activity/point/exchange_list.vue
+++ b/pages/activity/point/exchange_list.vue
@@ -24,7 +24,7 @@
 							<!-- <text class="card-c">×</text> -->
 							<view class="card-r">-{{item.usePoint}} 积分</view>
 						</view>
-						<view class="r-cart" @click="sheep.$router.go('/pages/activity/point/exchange_detail', { id: '1' })">查看详情</view>
+						<view class="r-cart" @click="sheep.$router.go('/pages/activity/point/exchange_detail', { id: item.id })">查看详情</view>
 					</view>
 				</view>
 
diff --git a/pages/activity/point/exchange_success.vue b/pages/activity/point/exchange_success.vue
index 48a19c9..80bec6b 100644
--- a/pages/activity/point/exchange_success.vue
+++ b/pages/activity/point/exchange_success.vue
@@ -10,7 +10,7 @@
 					订单编号
 				</view>
 				<view class="r">
-					wx23556151561321321351213
+					{{ state.orderInfo.no }}
 				</view>
 			</view>
 			<view class="ddxx">
@@ -18,7 +18,7 @@
 					兑换时间
 				</view>
 				<view class="r">
-					2024-10-18 15:46:03
+					{{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
 				</view>
 			</view>
 			<view class="ddxx">
@@ -31,71 +31,212 @@
 			</view>
 			<view class="ddxx">
 				<view class="l">
-					支付方式
+					支付积分
 				</view>
 				<view class="r">
-					10
+					{{state.orderInfo.usePoint}}
 				</view>
 			</view>
 			<view class="fgx"></view>
 			
-			<view class="ck-detail">
+			<view class="ck-detail" @click="sheep.$router.redirect('/pages/activity/point/exchange_detail',{id:state.id})">
 				查看详情
 			</view>
-			<view class="bk-home">
+			<view class="bk-home" @click="sheep.$router.redirect('/pages/index/index');">
 				返回首页
 			</view>
 		</view>
   </s-layout>
 </template>
 <script setup>
-  import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import { reactive, ref } from 'vue';
-  import PointApi from '@/sheep/api/promotion/point';
-  import SLayout from '@/sheep/components/s-layout/s-layout.vue';
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		reactive,
+		ref
+	} from 'vue';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import {
+		fen2yuan,
+		formatOrderStatus,
+		formatOrderStatusDescription,
+		handleOrderButtons,
+	} from '@/sheep/hooks/useGoods';
+	import OrderApi from '@/sheep/api/trade/order';
+	import DeliveryApi from '@/sheep/api/trade/delivery';
+	import PickUpVerify from '@/pages/order/pickUpVerify.vue';
 
-  // 计算页面高度
-  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 statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
 
-  const sPointCardRef = ref();
-  // 查询活动列表
-  const activityPageParams = reactive({
-    pageNo: 1, // 页码
-    pageSize: 5, // 每页数量
-  });
+	const state = reactive({
+		orderInfo: {},
+		merchantTradeNo: '', // 商户订单号
+		comeinType: '', // 进入订单详情的来源类型
+		id:0
+	});
 
-  const activityTotal = ref(0); // 活动总数
-  const activityCount = ref(0); // 已加载活动数量
-  const loadStatus = ref(''); // 页面加载状态
-  async function getActivityList() {
-    loadStatus.value = 'loading';
-    const { data } = await PointApi.getPointActivityPage(activityPageParams);
-    await sPointCardRef.value.concatActivity(data.list);
-    activityCount.value = sPointCardRef.value.getActivityCount();
-    activityTotal.value = data.total;
+	// ========== 门店自提（核销） ==========
+	const systemStore = ref({}); // 门店信息
 
-    loadStatus.value = activityCount.value < activityTotal.value ? 'more' : 'noMore';
-  }
+	// 复制
+	const onCopy = () => {
+		sheep.$helper.copyText(state.orderInfo.no);
+	};
 
-  // 加载更多
-  function loadMore() {
-    if (state.loadStatus !== 'noMore') {
-      activityPageParams.pageNo += 1;
-      getActivityList();
-    }
-  }
+	// 去支付
+	function onPay(payOrderId) {
+		sheep.$router.go('/pages/pay/index', {
+			id: payOrderId,
+		});
+	}
 
-  // 上拉加载更多
-  onReachBottom(() => {
-    loadMore();
-  });
-  onLoad(() => {
-    getActivityList();
-  });
+	// 查看商品
+	function onGoodsDetail(id) {
+		sheep.$router.go('/pages/goods/index', {
+			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) {
+					await getOrderDetail(orderId);
+				}
+			},
+		});
+	}
+
+	// 查看物流
+	async function onExpress(id) {
+		sheep.$router.go('/pages/order/express/log', {
+			id,
+		});
+	}
+
+	// 确认收货 TODO 芋艿：待测试
+	async function onConfirm(orderId, ignore = false) {
+		// 需开启确认收货组件
+		// todo: 芋艿：待接入微信
+		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+		let isOpenBusinessView = true;
+		if (
+			sheep.$platform.name === 'WechatMiniProgram' &&
+			!isEmpty(state.orderInfo.wechat_extra_data) &&
+			isOpenBusinessView &&
+			!ignore
+		) {
+			mpConfirm(orderId);
+			return;
+		}
+
+		// 正常的确认收货流程
+		const {
+			code
+		} = await OrderApi.receiveOrder(orderId);
+		if (code === 0) {
+			await getOrderDetail(orderId);
+		}
+	}
+
+	// #ifdef MP-WEIXIN
+	// 小程序确认收货组件
+	function mpConfirm(orderId) {
+		if (!wx.openBusinessView) {
+			sheep.$helper.toast(`请升级微信版本`);
+			return;
+		}
+		wx.openBusinessView({
+			businessType: 'weappOrderConfirm',
+			extraData: {
+				merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+				transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+			},
+			success(response) {
+				console.log('success:', response);
+				if (response.errMsg === 'openBusinessView:ok') {
+					if (response.extraData.status === 'success') {
+						onConfirm(orderId, true);
+					}
+				}
+			},
+			fail(error) {
+				console.log('error:', error);
+			},
+			complete(result) {
+				console.log('result:', result);
+			},
+		});
+	}
+
+	// #endif
+
+	// 评价
+	function onComment(id) {
+		sheep.$router.go('/pages/goods/comment/add', {
+			id,
+		});
+	}
+
+	const pickUpVerifyRef = ref();
+
+	async function getOrderDetail(id) {
+		// 对详情数据进行适配
+		let res;
+		if (state.comeinType === 'wechat') {
+			// TODO 芋艿：微信场景下
+			res = await OrderApi.getOrder(id, {
+				merchant_trade_no: state.merchantTradeNo,
+			});
+		} else {
+			res = await OrderApi.getOrder(id);
+		}
+		if (res.code === 0) {
+			state.orderInfo = res.data;
+			handleOrderButtons(state.orderInfo);
+			// 配送方式：门店自提
+			if (res.data.pickUpStoreId) {
+				const {
+					data
+				} = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+				systemStore.value = data || {};
+			}
+			if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+				pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+			}
+		} else {
+			sheep.$router.back();
+		}
+	}
+
+	onLoad(async (options) => {
+		let id = 0;
+		if (options.id) {
+			id = options.id;
+			state.id = options.id;
+		}
+		// TODO 芋艿：下面两个变量，后续接入
+		state.comeinType = options.comein_type;
+		if (state.comeinType === 'wechat') {
+			state.merchantTradeNo = options.merchant_trade_no;
+		}
+		await getOrderDetail(id);
+	});
 </script>
 
 <style lang="scss" scope>
diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue
index 42d7b02..e7724b9 100644
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@@ -229,8 +229,8 @@
 		} = await SeckillApi.getSeckillActivity(id);
 		activity.value = data;
 		// console.log(activity.value,"activity.value")
-		timeStatusEnum.value = getTimeStatusEnum(activity.startTime, activity.endTime);
-
+		timeStatusEnum.value = getTimeStatusEnum(activity.value.startTime, activity.value.endTime);
+		// console.log("开始时间结束时间：",activity.value.startTime,activity.value.endTime)
 		// 查询商品
 		await getSpu(data.spuId);
 	};
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 0145b2b..1ad2e06 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -277,9 +277,10 @@
 				id: data.id,
 			});
 		}else{
-			sheep.$router.redirect('/pages/activity/point/exchange_detail', {
+			sheep.$router.redirect('/pages/activity/point/exchange_success', {
 				id: data.id,
 			});
+			// sheep.$helper.toast('是这里');
 		}
 	}