diff --git a/common/common.js b/common/common.js
index 0dadeae..96b5789 100644
--- a/common/common.js
+++ b/common/common.js
@@ -4,6 +4,7 @@
  * @Description: content
  */
 import Vue from 'vue'
+import config from '@/common/config.js'
 
 // 防止处理多次点击
 function noMultipleClicks(methods, info) {
@@ -49,6 +50,10 @@ export default {
 		if (!obj) {
 			return ''
 		}
+		let goods_info = config.getGoodTypeFind(obj.type);
+		if(goods_info!=null){
+			return goods_info.name;
+		}
 
 		const types = {
 			1: '一番赏',
diff --git a/components/detail-list-item/detail-list-item.vue b/components/detail-list-item/detail-list-item.vue
index 50a9484..451a775 100644
--- a/components/detail-list-item/detail-list-item.vue
+++ b/components/detail-list-item/detail-list-item.vue
@@ -10,10 +10,10 @@
         </view>
         <view class="num center" v-if="item.stock != null">{{ item.surplus_stock }}/{{ item.stock }}</view>
         <!-- 预售标签 -->
-        <view v-if="item.goods_type == 2" class="yu-tag ziti">预售</view>
-        <view v-if="item.doubling != null && item.doubling > 1" class="yu-tag ziti"
-          style="top:75%;right: 15rpx; font-size:40rpx;color: #FF5722;font-style: italic;transform: skewX(-10deg);">x{{
+        <view v-if="item.goods_type == 2" class="presale-tag"></view>
+        <view v-if="item.doubling != null && item.doubling > 1" class="multiple-tag" >x{{
             item.doubling }}</view>
+        <view v-if="item.goods_type == 4" class="baoxiang-tag"></view>
         <!-- 售罄遮罩 -->
         <view class="sold-out-mask center" v-if="item.surplus_stock != null && item.surplus_stock <= 0">
           <text>售罄</text>
@@ -203,6 +203,57 @@ export default {
     border-radius: 25rpx;
   }
 
+  .presale-tag {
+    position: absolute;
+    right: 15rpx;
+    top: 15rpx;
+    z-index: 5;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #333;
+    border-radius: 30rpx;
+    background-image: url($iconurl + "yushou.png");
+    background-size: 100% 100%;
+    height: 32rpx;
+    width: 68rpx;
+  }
+
+  .baoxiang-tag {
+    position: absolute;
+    left: 15rpx;
+    top: 15rpx;
+    z-index: 5;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #333;
+    border-radius: 30rpx;
+    background-image: url($iconurl + "baoxiang.png");
+    background-size: 100% 100%;
+    height: 32rpx;
+    width: 68rpx;
+  }
+
+  .multiple-tag {
+    position: absolute;
+    z-index: 5;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 400;
+    // background-color: ;
+    //背景渐变
+    background: linear-gradient(to right, #8D5104, #3C0300);
+    color: #ffffff;
+    width: 48rpx;
+    height: 32rpx;
+    border-radius: 25rpx;
+    bottom:15rpx;
+    left: 15rpx;
+    font-size:24rpx;
+    line-height: 32rpx;
+  }
+
+  // 保留兼容旧版本
   .yu-tag {
     position: absolute;
     right: 10rpx;
diff --git a/pages/infinite/bonus_house_details.vue b/pages/infinite/bonus_house_details.vue
index ec2cdc4..2ee39cc 100644
--- a/pages/infinite/bonus_house_details.vue
+++ b/pages/infinite/bonus_house_details.vue
@@ -1,5 +1,5 @@
 <template>
-	<page-container title="福利屋详情" :showBack="true" >
+	<page-container title="福利屋详情" :showBack="true">
 		<view class="relative"
 			style="width: 686rpx; height: 152rpx; background-color: #FFFFFF; border-radius: 16rpx; margin: 0 auto;">
 
@@ -142,12 +142,14 @@
 		<!-- 条件不足弹窗 -->
 		<uni-popup ref="condition" type="center">
 
-			<view class="justify-center"
-				style="width: 636rpx; height: 422rpx; background-color: #FFFFFF; border-radius: 16rpx;">
-
-				<text style="font-size: 28rpx; color: #333333; font-weight: 600;padding-top: 26rpx;">规则说明</text>
-
-
+			<view style="width: 636rpx; height: 422rpx; background-color: #FFFFFF; border-radius: 16rpx;">
+				<view
+					style="width: 100%;height: 80rpx;border-radius:24rpx;display: flex;justify-content: center;align-items: center;font-size: 35rpx;">
+					参与提示
+				</view>
+				<view style="padding: 0rpx 24rpx;">
+					提示：需在指定时间{{bonusData.start_time}}-{{bonusData.end_time}}消耗达到{{bonusData.choujiang_xianzhi}}钻石，即可加入房间，还需{{remainingDiamond}}钻石.
+				</view>
 			</view>
 
 			<view class="flex row" style="width: 636rpx; justify-content: space-around; margin-top: 32rpx;">
@@ -166,513 +168,517 @@
 </template>
 
 <script>
-	import OrderConfirmPopupFlw from '@/components/order-confirm-popup/order-confirm-popup-flw.vue';
-	import PageContainer from '@/components/page-container/page-container.vue';
-	
-	export default {
-		components: {
-			OrderConfirmPopupFlw,
-			PageContainer
-		},
-		data() {
-			return {
-				currentItemId: 0,
-				currentTab: 0,
-				bonusData: {
-					title: "新人消费满5元福利屋",
-					tips: "消费返利（所有参与者有机会获得奖励",
-					time: "2025-03-10  14:00",
-					popularity: 0, // 热度
-					open_time: '2025-03-10  14:00', //开奖时间
-					start_time: '2025-03-10  14:00', //开始时间
-					end_time: '2025-03-10  10:00', //结束时间
-					choujiang_xianzhi: 0 // 抽奖限制金额
-				},
-				goodsList: [],
-				participantList: [],
-				awardRecordList: [],
-				tabList: [
-					"赏品预览", "参与人数", "赏品记录"
-				],
-				goods_id: 0,
-				remainingTime: "0天00:00:00",
-				countdownTimer: null,
-				endTime: null,
-				currentServerTime: null,
-				buttonText: "马上参与",
-				user_total_consumption: 0, // 用户抽奖范围内消耗的金额
-				orderData: {
-					goods: null,
-					"use_integral": 0,
-					"use_integral_money": 0,
-					"money": 0,
-					"use_money": 0,
-					"score": "0.00",
-					"use_score": 0,
-				},
-				pageData: "",
-				logList: [],
-				sendRuleData: "",
-				useMoney: true,
-				useIntegral: false,
-				useMoney2: false,
-				isAgree: true,
-				loading: false,
-				user_count: 0 //用户已经购买的次数
-			}
-		},
-		computed: {
-			getGoodsListName() {
-				if (this.goodsList.length > 0) {
-					return this.goodsList[this.currentItemId].title
-				}
-				return 'aaa';
-			}
-		},
-		async onLoad(options) {
-			console.log(options)
-			this.goods_id = options.goods_id
-			await this.load(options.goods_id)
-		},
-		methods: {
-			handleSwiperChange(e) {
-				this.currentItemId = e.detail.current
+import OrderConfirmPopupFlw from '@/components/order-confirm-popup/order-confirm-popup-flw.vue';
+import PageContainer from '@/components/page-container/page-container.vue';
+
+export default {
+	components: {
+		OrderConfirmPopupFlw,
+		PageContainer
+	},
+	data() {
+		return {
+			currentItemId: 0,
+			currentTab: 0,
+			bonusData: {
+				title: "新人消费满5元福利屋",
+				tips: "消费返利（所有参与者有机会获得奖励",
+				time: "2025-03-10  14:00",
+				popularity: 0, // 热度
+				open_time: '2025-03-10  14:00', //开奖时间
+				start_time: '2025-03-10  14:00', //开始时间
+				end_time: '2025-03-10  10:00', //结束时间
+				choujiang_xianzhi: 0 // 抽奖限制金额
 			},
-			async load(goods_id) {
-				const res = await this.req({
-					url: "fuliwu_detail",
-					data: {
-						goods_id: goods_id
+			goodsList: [],
+			participantList: [],
+			awardRecordList: [],
+			tabList: [
+				"赏品预览", "参与人数", "赏品记录"
+			],
+			goods_id: 0,
+			remainingTime: "0天00:00:00",
+			countdownTimer: null,
+			endTime: null,
+			currentServerTime: null,
+			buttonText: "马上参与",
+			user_total_consumption: 0, // 用户抽奖范围内消耗的金额
+			orderData: {
+				goods: null,
+				"use_integral": 0,
+				"use_integral_money": 0,
+				"money": 0,
+				"use_money": 0,
+				"score": "0.00",
+				"use_score": 0,
+			},
+			pageData: "",
+			logList: [],
+			sendRuleData: "",
+			useMoney: true,
+			useIntegral: false,
+			useMoney2: false,
+			isAgree: true,
+			loading: false,
+			user_count: 0 //用户已经购买的次数
+		}
+	},
+	computed: {
+		getGoodsListName() {
+			if (this.goodsList.length > 0) {
+				return this.goodsList[this.currentItemId].title
+			}
+			return '';
+		},
+		remainingDiamond() {
+			let t = this.bonusData.choujiang_xianzhi - this.user_total_consumption;
+			return t > 0 ? t : 0;
+		}
+	},
+	async onLoad(options) {
+		console.log(options)
+		this.goods_id = options.goods_id
+		await this.load(options.goods_id)
+	},
+	methods: {
+		handleSwiperChange(e) {
+			this.currentItemId = e.detail.current
+		},
+		async load(goods_id) {
+			const res = await this.req({
+				url: "fuliwu_detail",
+				data: {
+					goods_id: goods_id
+				}
+			})
+			console.log(res)
+
+			if (res.status === 1 && res.data) {
+				const {
+					goods,
+					goodslist,
+					join_count,
+					current_time,
+					status,
+					status_text,
+					user_consumption,
+					user_count
+				} = res.data;
+				this.orderData.goods = goods;
+				// 更新福利屋基本信息
+				this.bonusData = {
+					title: goods.title,
+					tips: goods.goods_describe,
+					time: goods.flw_start_time + '-' + goods.flw_end_time,
+					open_time: goods.open_time,
+					start_time: goods.flw_start_time,
+					end_time: goods.flw_end_time,
+					choujiang_xianzhi: goods.choujiang_xianzhi,
+					popularity: join_count || 0,
+					quanju_xiangou: goods.quanju_xiangou,
+					price: goods.price
+				};
+				if (user_consumption != null) {
+					this.user_total_consumption = user_consumption.total_consumed;
+				}
+				if (user_count != null) {
+					this.user_count = user_count;
+				}
+				let index = 0;
+				this.goodsList.splice(0, this.goodsList.length)
+				// 更新赏品列表
+				goodslist.forEach(item => {
+					for (let i = 0; i < item.stock; i++) {
+						this.goodsList.push({
+							index,
+							imgUrl: item.imgurl,
+							title: item.title,
+							id: item.id,
+							stock: item.stock,
+							realPrice: item.price,
+							sortIndex: item.sort,
+							type: item.shang_title,
+							typeColor: item.shang_color,
+							imgurl_detail: item.imgurl_detail
+						});
+						index++;
 					}
 				})
-				console.log(res)
 
-				if (res.status === 1 && res.data) {
-					const {
-						goods,
-						goodslist,
-						join_count,
-						current_time,
-						status,
-						status_text,
-						user_consumption,
-						user_count
-					} = res.data;
-					this.orderData.goods = goods;
-					// 更新福利屋基本信息
-					this.bonusData = {
-						title: goods.title,
-						tips: goods.goods_describe,
-						time: goods.flw_start_time + '-' + goods.flw_end_time,
-						open_time: goods.open_time,
-						start_time: goods.flw_start_time,
-						end_time: goods.flw_end_time,
-						choujiang_xianzhi: goods.choujiang_xianzhi,
-						popularity: join_count || 0,
-						quanju_xiangou: goods.quanju_xiangou,
-						price: goods.price
-					};
-					if (user_consumption != null) {
-						this.user_total_consumption = user_consumption.total_consumed;
-					}
-					if (user_count != null) {
-						this.user_count = user_count;
-					}
-					let index = 0;
-					this.goodsList.splice(0, this.goodsList.length)
-					// 更新赏品列表
-					goodslist.forEach(item => {
-						for (let i = 0; i < item.stock; i++) {
-							this.goodsList.push({
-								index,
-								imgUrl: item.imgurl,
-								title: item.title,
-								id: item.id,
-								stock: item.stock,
-								realPrice: item.price,
-								sortIndex: item.sort,
-								type: item.shang_title,
-								typeColor: item.shang_color,
-								imgurl_detail: item.imgurl_detail
-							});
-							index++;
-						}
-					})
+				// 计算倒计时
+				this.calculateRemainingTime(goods.open_time, goods.flw_start_time, current_time);
+				this.startCountdownTimer(goods.open_time, goods.flw_start_time, current_time);
 
-					// 计算倒计时
-					this.calculateRemainingTime(goods.open_time, goods.flw_start_time, current_time);
-					this.startCountdownTimer(goods.open_time, goods.flw_start_time, current_time);
+				// 其他状态信息
+				this.activityStatus = status;
+				this.activityStatusText = status_text;
 
-					// 其他状态信息
-					this.activityStatus = status;
-					this.activityStatusText = status_text;
-
-					// 获取参与人数和赏品记录列表
-					if (join_count > 0) {
-						await this.loadParticipants(goods_id);
-						await this.loadAwardRecords(goods_id);
-					}
+				// 获取参与人数和赏品记录列表
+				if (join_count > 0) {
+					await this.loadParticipants(goods_id);
+					await this.loadAwardRecords(goods_id);
 				}
-			},
-			changePay(e) {
-				this[e] = !this[e];
-				console.log('aaasdas');
+			}
+		},
+		changePay(e) {
+			this[e] = !this[e];
+			console.log('aaasdas');
 
-				this.confirmSubmit([0, 1]);
-			},
-			confirmSubmit([type, num, fromNotice = false]) {
-				let url = "ordermoney";
+			this.confirmSubmit([0, 1]);
+		},
+		confirmSubmit([type, num, fromNotice = false]) {
+			let url = "ordermoney";
 
-				if (type == 1) {
-					url = "orderbuy";
-				}
-
-				this.buyNum = num;
-
-				let data = {
-					goods_id: this.goods_id,
-					prize_num: 1,
-					goods_num: 1,
-					use_money_is: this.useMoney ? 1 : 2,
-					use_integral_is: this.useIntegral ? 1 : 2,
-					coupon_id: "",
-					use_money2_is: this.useMoney2 ? 1 : 2
-				};
-				this.req({
-					url,
-					data,
-					success: async (res) => {
-						if (res.status == 1) {
-							if (type == 0) {
-								this.orderData = res.data;
-
-								// 使用this.$nextTick确保视图已更新，组件已挂载
-								this.$nextTick(() => {
-									if (this.$refs.buyPop) {
-										this.$refs.buyPop.open();
-									} else {
-										console.error('buyPop组件引用不存在');
-									}
-								});
-							}
-							if (type == 1) {
-								this.close("buyPop");
-
-								if (res.data.status == 1) {
-									const status = await this.$c.wxMpPay({
-										data: res.data.res,
-									});
-
-									if (status == "success") {
-										this.load(this.goods_id);
-									}
-								} else {
-									this.$c.toast({
-										title: res.msg,
-										duration: 500,
-										success: () => {
-											this.load(this.goods_id);
-										},
-									});
-								}
-							}
-						}
-					},
-				});
-				if (type == 1) {
-					this.close("buyPop");
-				}
-			},
-			calculateRemainingTime(openTime, startTime, currentTime) {
-				// 将时间字符串转为时间对象
-				const endDate = new Date(openTime.replace(/-/g, '/'));
-				const startDate = new Date(startTime.replace(/-/g, '/'));
-				const currentDate = new Date(currentTime.replace(/-/g, '/'));
-
-				// 保存结束时间和当前服务器时间，用于实时倒计时
-				this.endTime = endDate;
-				this.currentServerTime = currentDate;
-
-				// 判断当前时间与开始时间和结束时间的关系
-				if (currentDate > endDate) {
-					this.remainingTime = "活动已结束";
-					return;
-				} else if (currentDate < startDate) {
-					this.remainingTime = this.formatRemainingTime(startDate - currentDate, "距离开始时间：");
-					return;
-				} else if (currentDate >= startDate && currentDate <= endDate) {
-					this.remainingTime = this.formatRemainingTime(endDate - currentDate, "距离开奖时间：");
-					return;
-				}
-			},
-
-			formatRemainingTime(diffTime, prefix) {
-				// 转换为天、时、分、秒
-				const days = Math.floor(diffTime / (24 * 60 * 60 * 1000));
-				diffTime = diffTime % (24 * 60 * 60 * 1000);
-				const hours = Math.floor(diffTime / (60 * 60 * 1000));
-				diffTime = diffTime % (60 * 60 * 1000);
-				const minutes = Math.floor(diffTime / (60 * 1000));
-				diffTime = diffTime % (60 * 1000);
-				const seconds = Math.floor(diffTime / 1000);
-
-				// 格式化时间
-				return `${prefix}${days}天${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
-			},
-
-			startCountdownTimer(openTime, startTime, currentTime) {
-				// 清除之前可能存在的计时器
-				if (this.countdownTimer) {
-					clearInterval(this.countdownTimer);
-				}
-
-				// 保存结束时间和当前时间的时间差（毫秒）
-				const endDate = new Date(openTime.replace(/-/g, '/'));
-				const startDate = new Date(startTime.replace(/-/g, '/'));
-				const currentDate = new Date(currentTime.replace(/-/g, '/'));
-				const serverClientTimeDiff = currentDate.getTime() - new Date().getTime();
-
-				// 设置每秒更新一次倒计时
-				this.countdownTimer = setInterval(() => {
-					// 获取当前客户端时间并加上与服务器的时间差，以获得准确的服务器当前时间
-					const now = new Date();
-					const serverNow = new Date(now.getTime() + serverClientTimeDiff);
-
-					// 判断当前时间与开始时间和结束时间的关系
-					if (serverNow > endDate) {
-						clearInterval(this.countdownTimer);
-						this.remainingTime = "活动已结束";
-						return;
-					} else if (serverNow < startDate) {
-						this.remainingTime = this.formatRemainingTime(startDate - serverNow, "距离开始时间：");
-						return;
-					} else if (serverNow >= startDate && serverNow <= endDate) {
-						this.remainingTime = this.formatRemainingTime(endDate - serverNow, "距离开奖时间：");
-						return;
-					}
-				}, 1000);
-
-				this.updateButtonState();
-			},
-
-			onUnload() {
-				// 组件卸载时清除计时器
-				if (this.countdownTimer) {
-					clearInterval(this.countdownTimer);
-					this.countdownTimer = null;
-				}
-			},
-
-			async loadParticipants(goods_id) {
-				// 这里应该调用获取参与人数列表的接口
-				// 示例代码，实际应替换为真实接口
-				try {
-					const res = await this.req({
-						url: "fuliwu_participants",
-						data: {
-							goods_id
-						}
-					});
-
-					if (res.status === 1 && res.data && res.data.list) {
-						this.participantList.splice(0, this.participantList.length)
-						this.participantList = res.data.list.map(item => ({
-							avatar: item.avatar || "",
-							name: item.nickname || "用户",
-							time: item.create_time || ""
-						}));
-					}
-				} catch (error) {
-					console.error("加载参与人数列表失败", error);
-				}
-			},
-
-			async loadAwardRecords(goods_id) {
-				// 这里应该调用获取赏品记录的接口
-				// 示例代码，实际应替换为真实接口
-				try {
-					const res = await this.req({
-						url: "fuliwu_records",
-						data: {
-							goods_id
-						}
-					});
-
-					if (res.status === 1 && res.data && res.data.list) {
-						this.awardRecordList = res.data.list.map(item => ({
-							avatar: item.avatar || "",
-							name: item.nickname || "用户",
-							time: item.create_time || "",
-							award: item.goodslist_title || "钻石*0",
-							shang_id: item.shang_id
-						}));
-					}
-				} catch (error) {
-					console.error("加载赏品记录失败", error);
-				}
-			},
-
-			handleTabChange(index) {
-				this.currentTab = index
-			},
-
-
-			updateButtonState() {
-				const currentDate = new Date(this.currentServerTime);
-				const startDate = new Date(this.bonusData.start_time.replace(/-/g, '/'));
-				const endDate = new Date(this.bonusData.end_time.replace(/-/g, '/'));
-				const openDate = new Date(this.bonusData.open_time.replace(/-/g, '/'));
-
-				if (currentDate < startDate) {
-					this.buttonText = "未开始";
-				} else if (currentDate >= startDate && currentDate <= endDate) {
-					if (this.user_count > 0 && this.user_count >= this.bonusData.quanju_xiangou) {
-						this.buttonText = "等待开奖中";
-						return;
-					}
-					this.buttonText = "马上参与";
-				} else if (currentDate > endDate && currentDate < openDate) {
-					this.buttonText = "等待开奖中";
-				} else if (currentDate >= openDate) {
-					this.buttonText = "活动已结束";
-				}
-			},
-
-			handleButtonClick() {
-				if (this.buttonText === "未开始") {
-					uni.showToast({
-						title: "活动未开始",
-						icon: "none"
-					});
-					return;
-				} else if (this.buttonText === "等待开奖中") {
-					uni.showToast({
-						title: "等待开奖中",
-						icon: "none"
-					});
-					return;
-				} else if (this.buttonText === "活动已结束") {
-					uni.showToast({
-						title: "活动已结束",
-						icon: "none"
-					});
-					return;
-				}
-				if (this.user_count > 0 && this.user_count >= this.bonusData.quanju_xiangou) {
-					uni.showToast({
-						title: "当前活动限购" + this.bonusData.quanju_xiangou + "次",
-						icon: "none"
-					});
-					return;
-				}
-				//判断用户今天消费的金额是否满足参与条件
-				if (this.user_total_consumption < this.bonusData.choujiang_xianzhi) {
-					this.$refs.condition.open();
-					// uni.showToast({
-					// 	title: "消费金额不足",
-					// 	icon: "none"
-					// });
-					return;
-				}
-				console.log(this.user_total_consumption, this.bonusData.choujiang_xianzhi);
-				if (this.bonusData.price == 0) {
-					this.useMoney = true;
-					this.confirmSubmit([1, 1]);
-					return;
-				}
-				this.confirmSubmit([0, 1])
-				// if (this.$refs['buyPop']) {
-				// 	this.$refs['buyPop'].open();
-				// } else {
-				// 	console.error("buyPop is undefined");
-				// }
-
-			},
-			close(e) {
-				console.log('关闭弹窗:', e, this.$refs[e]);
-				if (e === 'buyPop') {
-					if (this.$refs[e]) {
-						this.$refs[e].close();
-					} else {
-						console.error('找不到buyPop组件引用');
-					}
-				} else {
-					if (this.$refs[e]) {
-						this.$refs[e].close();
-					} else {
-						console.error('找不到组件引用:', e);
-					}
-				}
-
-				if (e == "resPop") {
-					if (this.prizeData && this.prizeData["user_coupon"] != null) {
-						this.$refs["couponPop"].open(this.prizeData["user_coupon"]);
-					}
-				}
-			},
-
-			toHome() {
-				uni.reLaunch({
-					url: '/pages/shouye/index'
-				});
+			if (type == 1) {
+				url = "orderbuy";
 			}
 
+			this.buyNum = num;
+
+			let data = {
+				goods_id: this.goods_id,
+				prize_num: 1,
+				goods_num: 1,
+				use_money_is: this.useMoney ? 1 : 2,
+				use_integral_is: this.useIntegral ? 1 : 2,
+				coupon_id: "",
+				use_money2_is: this.useMoney2 ? 1 : 2
+			};
+			this.req({
+				url,
+				data,
+				success: async (res) => {
+					if (res.status == 1) {
+						if (type == 0) {
+							this.orderData = res.data;
+
+							// 使用this.$nextTick确保视图已更新，组件已挂载
+							this.$nextTick(() => {
+								if (this.$refs.buyPop) {
+									this.$refs.buyPop.open();
+								} else {
+									console.error('buyPop组件引用不存在');
+								}
+							});
+						}
+						if (type == 1) {
+							this.close("buyPop");
+
+							if (res.data.status == 1) {
+								const status = await this.$c.wxMpPay({
+									data: res.data.res,
+								});
+
+								if (status == "success") {
+									this.load(this.goods_id);
+								}
+							} else {
+								this.$c.toast({
+									title: res.msg,
+									duration: 500,
+									success: () => {
+										this.load(this.goods_id);
+									},
+								});
+							}
+						}
+					}
+				},
+			});
+			if (type == 1) {
+				this.close("buyPop");
+			}
+		},
+		calculateRemainingTime(openTime, startTime, currentTime) {
+			// 将时间字符串转为时间对象
+			const endDate = new Date(openTime.replace(/-/g, '/'));
+			const startDate = new Date(startTime.replace(/-/g, '/'));
+			const currentDate = new Date(currentTime.replace(/-/g, '/'));
+
+			// 保存结束时间和当前服务器时间，用于实时倒计时
+			this.endTime = endDate;
+			this.currentServerTime = currentDate;
+
+			// 判断当前时间与开始时间和结束时间的关系
+			if (currentDate > endDate) {
+				this.remainingTime = "活动已结束";
+				return;
+			} else if (currentDate < startDate) {
+				this.remainingTime = this.formatRemainingTime(startDate - currentDate, "距离开始时间：");
+				return;
+			} else if (currentDate >= startDate && currentDate <= endDate) {
+				this.remainingTime = this.formatRemainingTime(endDate - currentDate, "距离开奖时间：");
+				return;
+			}
+		},
+
+		formatRemainingTime(diffTime, prefix) {
+			// 转换为天、时、分、秒
+			const days = Math.floor(diffTime / (24 * 60 * 60 * 1000));
+			diffTime = diffTime % (24 * 60 * 60 * 1000);
+			const hours = Math.floor(diffTime / (60 * 60 * 1000));
+			diffTime = diffTime % (60 * 60 * 1000);
+			const minutes = Math.floor(diffTime / (60 * 1000));
+			diffTime = diffTime % (60 * 1000);
+			const seconds = Math.floor(diffTime / 1000);
+
+			// 格式化时间
+			return `${prefix}${days}天${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+		},
+
+		startCountdownTimer(openTime, startTime, currentTime) {
+			// 清除之前可能存在的计时器
+			if (this.countdownTimer) {
+				clearInterval(this.countdownTimer);
+			}
+
+			// 保存结束时间和当前时间的时间差（毫秒）
+			const endDate = new Date(openTime.replace(/-/g, '/'));
+			const startDate = new Date(startTime.replace(/-/g, '/'));
+			const currentDate = new Date(currentTime.replace(/-/g, '/'));
+			const serverClientTimeDiff = currentDate.getTime() - new Date().getTime();
+
+			// 设置每秒更新一次倒计时
+			this.countdownTimer = setInterval(() => {
+				// 获取当前客户端时间并加上与服务器的时间差，以获得准确的服务器当前时间
+				const now = new Date();
+				const serverNow = new Date(now.getTime() + serverClientTimeDiff);
+
+				// 判断当前时间与开始时间和结束时间的关系
+				if (serverNow > endDate) {
+					clearInterval(this.countdownTimer);
+					this.remainingTime = "活动已结束";
+					return;
+				} else if (serverNow < startDate) {
+					this.remainingTime = this.formatRemainingTime(startDate - serverNow, "距离开始时间：");
+					return;
+				} else if (serverNow >= startDate && serverNow <= endDate) {
+					this.remainingTime = this.formatRemainingTime(endDate - serverNow, "距离开奖时间：");
+					return;
+				}
+			}, 1000);
+
+			this.updateButtonState();
+		},
+
+		onUnload() {
+			// 组件卸载时清除计时器
+			if (this.countdownTimer) {
+				clearInterval(this.countdownTimer);
+				this.countdownTimer = null;
+			}
+		},
+
+		async loadParticipants(goods_id) {
+			// 这里应该调用获取参与人数列表的接口
+			// 示例代码，实际应替换为真实接口
+			try {
+				const res = await this.req({
+					url: "fuliwu_participants",
+					data: {
+						goods_id
+					}
+				});
+
+				if (res.status === 1 && res.data && res.data.list) {
+					this.participantList.splice(0, this.participantList.length)
+					this.participantList = res.data.list.map(item => ({
+						avatar: item.avatar || "",
+						name: item.nickname || "用户",
+						time: item.create_time || ""
+					}));
+				}
+			} catch (error) {
+				console.error("加载参与人数列表失败", error);
+			}
+		},
+
+		async loadAwardRecords(goods_id) {
+			// 这里应该调用获取赏品记录的接口
+			// 示例代码，实际应替换为真实接口
+			try {
+				const res = await this.req({
+					url: "fuliwu_records",
+					data: {
+						goods_id
+					}
+				});
+
+				if (res.status === 1 && res.data && res.data.list) {
+					this.awardRecordList = res.data.list.map(item => ({
+						avatar: item.avatar || "",
+						name: item.nickname || "用户",
+						time: item.create_time || "",
+						award: item.goodslist_title || "钻石*0",
+						shang_id: item.shang_id
+					}));
+				}
+			} catch (error) {
+				console.error("加载赏品记录失败", error);
+			}
+		},
+
+		handleTabChange(index) {
+			this.currentTab = index
+		},
+
+
+		updateButtonState() {
+			const currentDate = new Date(this.currentServerTime);
+			const startDate = new Date(this.bonusData.start_time.replace(/-/g, '/'));
+			const endDate = new Date(this.bonusData.end_time.replace(/-/g, '/'));
+			const openDate = new Date(this.bonusData.open_time.replace(/-/g, '/'));
+
+			if (currentDate < startDate) {
+				this.buttonText = "未开始";
+			} else if (currentDate >= startDate && currentDate <= endDate) {
+				if (this.user_count > 0 && this.user_count >= this.bonusData.quanju_xiangou) {
+					this.buttonText = "等待开奖中";
+					return;
+				}
+				this.buttonText = "马上参与";
+			} else if (currentDate > endDate && currentDate < openDate) {
+				this.buttonText = "等待开奖中";
+			} else if (currentDate >= openDate) {
+				this.buttonText = "活动已结束";
+			}
+		},
+
+		handleButtonClick() {
+			if (this.buttonText === "未开始") {
+				uni.showToast({
+					title: "活动未开始",
+					icon: "none"
+				});
+				return;
+			} else if (this.buttonText === "等待开奖中") {
+				uni.showToast({
+					title: "等待开奖中",
+					icon: "none"
+				});
+				return;
+			} else if (this.buttonText === "活动已结束") {
+				uni.showToast({
+					title: "活动已结束",
+					icon: "none"
+				});
+				return;
+			}
+			if (this.user_count > 0 && this.user_count >= this.bonusData.quanju_xiangou) {
+				uni.showToast({
+					title: "当前活动限购" + this.bonusData.quanju_xiangou + "次",
+					icon: "none"
+				});
+				return;
+			}
+			//判断用户今天消费的金额是否满足参与条件
+			if (this.user_total_consumption < this.bonusData.choujiang_xianzhi) {
+				this.$refs.condition.open();
+				// uni.showToast({
+				// 	title: "消费金额不足",
+				// 	icon: "none"
+				// });
+				return;
+			}
+			console.log(this.user_total_consumption, this.bonusData.choujiang_xianzhi);
+			if (this.bonusData.price == 0) {
+				this.useMoney = true;
+				this.confirmSubmit([1, 1]);
+				return;
+			}
+			this.confirmSubmit([0, 1])
+			// if (this.$refs['buyPop']) {
+			// 	this.$refs['buyPop'].open();
+			// } else {
+			// 	console.error("buyPop is undefined");
+			// }
+
+		},
+		close(e) {
+			console.log('关闭弹窗:', e, this.$refs[e]);
+			if (e === 'buyPop') {
+				if (this.$refs[e]) {
+					this.$refs[e].close();
+				} else {
+					console.error('找不到buyPop组件引用');
+				}
+			} else {
+				if (this.$refs[e]) {
+					this.$refs[e].close();
+				} else {
+					console.error('找不到组件引用:', e);
+				}
+			}
+
+			if (e == "resPop") {
+				if (this.prizeData && this.prizeData["user_coupon"] != null) {
+					this.$refs["couponPop"].open(this.prizeData["user_coupon"]);
+				}
+			}
+		},
+
+		toHome() {
+			uni.reLaunch({
+				url: '/pages/shouye/index'
+			});
 		}
+
 	}
+}
 </script>
 
 <style lang="scss">
-	.tab {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10rpx 60rpx;
+.tab {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 10rpx 60rpx;
 
 
-		.tab-item {
-			width: 155rpx;
-			height: 68rpx;
-			position: relative;
-			margin-right: 25rpx;
+	.tab-item {
+		width: 155rpx;
+		height: 68rpx;
+		position: relative;
+		margin-right: 25rpx;
 
-			&.act {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #333333;
+		&.act {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #333333;
 
-				&::after {
-					content: '';
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					transform: translateX(-50%);
-					width: 48rpx;
-					height: 4rpx;
-					background: #333333;
-				}
-			}
-
-			&.unact {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #CCCCCC;
+			&::after {
+				content: '';
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 48rpx;
+				height: 4rpx;
+				background: #333333;
 			}
 		}
+
+		&.unact {
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #CCCCCC;
+		}
 	}
+}
 
-	.grid-container {
-		display: grid;
-		grid-template-columns: repeat(4, 124rpx);
-		gap: 24rpx;
-		width: 580rpx;
-		margin: 10rpx auto 0;
-		padding-bottom: 20rpx;
+.grid-container {
+	display: grid;
+	grid-template-columns: repeat(4, 124rpx);
+	gap: 24rpx;
+	width: 580rpx;
+	margin: 10rpx auto 0;
+	padding-bottom: 20rpx;
 
 
-	}
+}
 
-	.grid-item {
-		width: 142rpx;
-		height: 150rpx;
-	}
+.grid-item {
+	width: 142rpx;
+	height: 150rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 58f9561..83e6267 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -99,7 +99,7 @@
 					<image :src="$img1('common/new1.png')" class="image1"
 						style="animation: zoom 1.2s ease-in-out infinite" mode="widthFix"
 						v-if="item.new_is == 1 && tabList[tabCur].id != 2"></image>
-					<view class="image3 common_bg"
+					<view class="image3 common_bg" style="padding: 0 10rpx;line-height: 32rpx;"
 						:style="{backgroundImage:tabList[tabCur].id != 2? `url(${$img1('common/label1.png')})`: `url(${$img1('common/label2.png')})`,}">
 						<text>
 							{{ item.type_text }}
diff --git a/uni.scss b/uni.scss
index ff56a18..1f2bb90 100644
--- a/uni.scss
+++ b/uni.scss
@@ -14,7 +14,8 @@
  // @import 'uview-ui/theme.scss';
 /* 颜色变量 */
 
-$imgurl:'https://mh.shhuanmeng.com/static/web/static/';
+$imgurl:'https://image.zfunbox.cn/static/web/static/';
+$iconurl:'https://image.zfunbox.cn/icon/';
 //https://mh.shhuanmeng.com/static/web/static/common/box.png
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;