From e50f16419fbda8a53a1fc6cf00ba29c94494ab6c Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Fri, 11 Apr 2025 00:05:14 +0800
Subject: [PATCH] =?UTF-8?q?UU=E5=B8=81=E5=92=8C=E4=BC=98=E6=83=A0=E5=8D=B7?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=90=8C=E6=97=B6=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-confirm-popup.vue                   |   26 +-
 pages/shouye/detail.vue                       | 1954 +++++++++--------
 pages/shouye/detail_wuxian.vue                |   25 +-
 3 files changed, 1013 insertions(+), 992 deletions(-)

diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue
index 0464754..d0decc9 100644
--- a/components/order-confirm-popup/order-confirm-popup.vue
+++ b/components/order-confirm-popup/order-confirm-popup.vue
@@ -198,7 +198,15 @@ export default {
 			type: Number,
 			default: 1
 		}
-	},
+	}, 
+	watch: {
+    // // 监听props变化，更新内部数据
+    // couponData(val) {
+	// 	console.log('couponData',val);
+		    
+    // },
+     
+  },
 	data() {
 		//pageData.goods.type
 		return {
@@ -270,6 +278,8 @@ export default {
 		 * @param {String} method 支付方式
 		 */
 		changePayMethod(method) {
+			console.log('aaa');
+			
 			if (this.is_deduction == 0) {
 				// 如果是支付模式，检查可用的支付方式数量
 				let availablePayMethods = 0;
@@ -285,19 +295,7 @@ export default {
 			this.$emit('change-pay', method);
 		},
 
-		/**
-		 * 检查按钮是否显示
-		 */
-		getBtnXianShi() {
-			if (this.pageData == null || this.pageData["xuangou"] == null) {
-				return true;
-			}
-			let xuangou = this.pageData["xuangou"];
-			if (xuangou.quanju_xiangou == 0) {
-				return true;
-			}
-			return false;
-		}
+		
 	}
 }
 </script>
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index b8c6f1d..c7d0b9f 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -133,10 +133,10 @@
 		</view>
 
 		<!-- 确认订单弹窗 -->
-		<order-confirm-popup ref="buyPop" :order-data="orderData" :page-data="pageData"
-			:use-money="useMoney" :use-money2="useMoney2" :use-integral="useIntegral" :coupon-data="couponData"
-			:is-agree="isAgree" :send-rule-data="sendRuleData" :buy-num="buyNum" @close="close('buyPop')"
-			@change-pay="changePay" @toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
+		<order-confirm-popup ref="buyPop" :order-data="orderData" :page-data="pageData" :use-money="useMoney"
+			:use-money2="useMoney2" :use-integral="useIntegral" :coupon-data="couponData" :is-agree="isAgree"
+			:send-rule-data="sendRuleData" :buy-num="buyNum" @close="close('buyPop')" @change-pay="changePay"
+			@toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
 			@confirm="$c.noDouble1(confirmSubmit, [1, buyNum], choujiangloading)"></order-confirm-popup>
 
 		<buy-notice ref="buyNotice"
@@ -187,1035 +187,1047 @@
 </template>
 
 <script>
-	import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
-	import DetailListItem from '@/components/detail-list-item/detail-list-item.vue'
+import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
+import DetailListItem from '@/components/detail-list-item/detail-list-item.vue'
 
-	export default {
-		components: {
-			OrderConfirmPopup,
-			DetailListItem
+export default {
+	components: {
+		OrderConfirmPopup,
+		DetailListItem
+	},
+	data() {
+		return {
+			optData: "",
+			boxNum: "",
+			buyNum: 0,
+
+			// 下拉刷新的配置(可选, 绝大部分情况无需配置)
+			downOption: {
+				auto: false,
+			},
+			// 上拉加载的配置(可选, 绝大部分情况无需配置)
+			upOption: {
+				auto: true,
+				page: {
+					size: 15, // 每页数据的数量,默认10
+				},
+			},
+			tabList: {
+				1: {
+					title: "商品预览",
+				},
+				2: {
+					title: "中赏记录",
+				},
+			},
+			tabCur: 1,
+			subTab: [],
+			subTabCur: 0,
+			payType: {
+				1: {
+					title: "友达币",
+					icon: "/static/img/pay_type1.png",
+				},
+				2: {
+					title: "星钻",
+					icon: "/static/img/pay_type2.png",
+				},
+			},
+			payTypeCur: 1,
+			isAgree: true,
+			pageData: "",
+			couponData: "",
+			orderData: "",
+			prizeData: "",
+			secTimer: null,
+			secNum: 0,
+			aniSrc: "",
+			aniShow: false,
+
+			logList: [],
+			sendRuleData: "",
+			choujiangloading: false,
+			useMoney: true,
+			useIntegral: true,
+			useMoney2: true,
+		};
+	},
+	created() {
+
+	},
+	computed: {},
+	onShareAppMessage() {
+		if (this.$refs["couponPop"] != null) {
+			var co = this.$refs["couponPop"].getfengxiaodata();
+			if (co != null) {
+				console.log(co);
+				return co;
+			}
+		}
+		return {
+			title: this.$config.getAppSetting("app_name") +
+				`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
+			imageUrl: this.pageData.goods.imgurl_detail,
+			path: "/pages/shouye/detail" +
+				this.$c.qs({
+					goods_id: this.pageData.goods.id,
+					goods_num: this.pageData.goods.num,
+					pid: uni.getStorageSync("userinfo").ID,
+				}),
+		};
+	},
+
+	onLoad(options) {
+		console.log(options);
+		this.optData = options;
+
+		this.tabChange(this.tabCur);
+
+		uni.$on("chooseCoupon", (data) => {
+			// console.log('data', data)
+
+			this.couponData = data;
+			this.confirmSubmit([0, this.buyNum]);
+		});
+
+		// uni.getImageInfo({
+		//   src: this.$img('/static/img/animation.png'),
+		//   success: ({ path }) => {
+		//     this.aniSrc = path
+		//   }
+		// })
+
+		this.$c.getRule(10).then((res) => {
+			if (res.status == 1) {
+				this.sendRuleData = res.data;
+			}
+		});
+	},
+
+	onReady() {
+		// this.open('dPop')
+		// this.open('buyPop')
+		// this.open('buyNotice')
+		// this.open('resPop')
+	},
+
+	onUnload() {
+		uni.$off("chooseCoupon");
+	},
+
+	methods: {
+		previewDetail(item) {
+			console.log(item);
+			// 使用全局方法调用预览弹窗
+			this.$preview({
+				productType: this.optData.type_text,
+				dataItem: item,
+				goods: this.pageData.goods
+			}).then(() => {
+				console.log('预览弹窗打开成功');
+			});
 		},
-		data() {
-			return {
-				optData: "",
-				boxNum: "",
-				buyNum: 0,
 
-				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-				downOption: {
-					auto: false,
-				},
-				// 上拉加载的配置(可选, 绝大部分情况无需配置)
-				upOption: {
-					auto: true,
-					page: {
-						size: 15, // 每页数据的数量,默认10
-					},
-				},
-				tabList: {
-					1: {
-						title: "商品预览",
-					},
-					2: {
-						title: "中赏记录",
-					},
-				},
-				tabCur: 1,
-				subTab: [],
-				subTabCur: 0,
-				payType: {
-					1: {
-						title: "友达币",
-						icon: "/static/img/pay_type1.png",
-					},
-					2: {
-						title: "星钻",
-						icon: "/static/img/pay_type2.png",
-					},
-				},
-				payTypeCur: 1,
-				isAgree: true,
-				pageData: "",
-				couponData: "",
-				orderData: "",
-				prizeData: "",
-				secTimer: null,
-				secNum: 0,
-				aniSrc: "",
-				aniShow: false,
-
-				logList: [],
-				sendRuleData: "",
-				choujiangloading: false,
-				useMoney: true,
-				useIntegral: true,
-				useMoney2: true,
-			};
+		resetSec() {
+			clearInterval(this.secTimer);
+			this.secTimer = null;
+			this.secNum = 0;
 		},
-		created() {
 
+		runSec(time) {
+			const nowTime = Math.floor(Date.now() / 1000);
+
+			if (time < nowTime) {
+				this.resetSec();
+				return;
+			}
+
+			this.secTimer && clearInterval(this.secTimer);
+
+			this.secNum = time - nowTime;
+			this.secTimer = setInterval(() => {
+				if (this.secNum <= 0) {
+					this.resetSec();
+
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					});
+					setTimeout(() => {
+						// uni.hideLoading()
+						this.doRefresh();
+					}, 1000);
+					return;
+				}
+
+				this.secNum -= 1;
+			}, 1000);
 		},
-		computed: {},
-		onShareAppMessage() {
-			if (this.$refs["couponPop"] != null) {
-				var co = this.$refs["couponPop"].getfengxiaodata();
-				if (co != null) {
-					console.log(co);
-					return co;
+
+		toCoupon() {
+			this.$c.to({
+				url: "/pages/user/coupon",
+				query: {
+					type: 2,
+					total_price: this.orderData.order_total,
+				},
+			});
+		},
+
+		getPrize(order_num) {
+			if (!order_num) {
+				return;
+			}
+
+			setTimeout(() => {
+				this.req({
+					url: "prizeorderlog",
+					data: {
+						order_num,
+					},
+					success: (res) => {
+						if (res.status == 1) {
+							this.prizeData = res.data;
+
+							if (res.data.data.length <= 0) {
+								this.getPrize(order_num);
+								return;
+							}
+
+							// this.aniShow = true
+							// setTimeout(() => {
+							//   this.aniShow = false
+							this.bgmCtx.openBgm.stop();
+							this.bgmCtx.openBgm.play();
+							this.open("resPop");
+							// }, 1300)
+						}
+					},
+				});
+			}, 500);
+		},
+
+		changePay(e) {
+			if (e === 'useIntegral') {
+				if (this.couponData != null && this.couponData.id != '') {
+					this.couponData = null;
 				}
 			}
-			return {
-				title: this.$config.getAppSetting("app_name") +
-					`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
-				imageUrl: this.pageData.goods.imgurl_detail,
-				path: "/pages/shouye/detail" +
-					this.$c.qs({
-						goods_id: this.pageData.goods.id,
-						goods_num: this.pageData.goods.num,
-						pid: uni.getStorageSync("userinfo").ID,
-					}),
+			this[e] = !this[e];
+
+			this.confirmSubmit([0, this.buyNum]);
+		},
+
+		confirmSubmit([type, num, fromNotice = false]) {
+			let url = "ordermoney";
+
+			if (type == 1) {
+				url = "orderbuy";
+
+				if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
+					this.$refs.buyNotice.getRule(6);
+					return;
+				}
+			}
+			if (!this.getBtnXianShi(0)) {
+				this.useMoney = false;
+				this.useIntegral = false;
+				this.useMoney2 = false;
+			}
+			this.buyNum = num;
+			let coupon_id = (this.couponData && this.couponData.id) || ''
+			if (coupon_id != '' && this.useIntegral) {
+				this.useIntegral = false;
+			} else if (this.useIntegral && coupon_id != '') {
+				this.couponData = null;
+				coupon_id = '';
+			}
+			let data = {
+				goods_id: this.pageData.goods.id,
+				prize_num: this.buyNum,
+				goods_num: this.pageData.goods.num,
+				use_money_is: this.useMoney ? 1 : 2,
+				use_integral_is: this.useIntegral ? 1 : 2,
+				coupon_id: coupon_id,
+				use_money2_is: this.useMoney2 ? 1 : 2
 			};
-		},
 
-		onLoad(options) {
-			console.log(options);
-			this.optData = options;
+			if (this.pageData.goods.type == 5) {
+				data.coupon_id = "";
+			}
 
-			this.tabChange(this.tabCur);
-
-			uni.$on("chooseCoupon", (data) => {
-				// console.log('data', data)
-
-				this.couponData = data;
-				this.confirmSubmit([0, this.buyNum]);
-			});
-
-			// uni.getImageInfo({
-			//   src: this.$img('/static/img/animation.png'),
-			//   success: ({ path }) => {
-			//     this.aniSrc = path
-			//   }
-			// })
-
-			this.$c.getRule(10).then((res) => {
-				if (res.status == 1) {
-					this.sendRuleData = res.data;
-				}
-			});
-		},
-
-		onReady() {
-			// this.open('dPop')
-			// this.open('buyPop')
-			// this.open('buyNotice')
-			// this.open('resPop')
-		},
-
-		onUnload() {
-			uni.$off("chooseCoupon");
-		},
-
-		methods: {
-			previewDetail(item) {
-				console.log(item);
-				// 使用全局方法调用预览弹窗
-				this.$preview({
-					productType: this.optData.type_text,
-					dataItem: item,
-					goods: this.pageData.goods
-				}).then(() => {
-					console.log('预览弹窗打开成功');
-				});
-			},
-
-			resetSec() {
-				clearInterval(this.secTimer);
-				this.secTimer = null;
-				this.secNum = 0;
-			},
-
-			runSec(time) {
-				const nowTime = Math.floor(Date.now() / 1000);
-
-				if (time < nowTime) {
-					this.resetSec();
-					return;
-				}
-
-				this.secTimer && clearInterval(this.secTimer);
-
-				this.secNum = time - nowTime;
-				this.secTimer = setInterval(() => {
-					if (this.secNum <= 0) {
-						this.resetSec();
-
-						uni.showLoading({
-							title: "加载中",
-							mask: true,
-						});
-						setTimeout(() => {
-							// uni.hideLoading()
-							this.doRefresh();
-						}, 1000);
-						return;
-					}
-
-					this.secNum -= 1;
-				}, 1000);
-			},
-
-			toCoupon() {
-				this.$c.to({
-					url: "/pages/user/coupon",
-					query: {
-						type: 2,
-						total_price: this.orderData.order_total,
-					},
-				});
-			},
-
-			getPrize(order_num) {
-				if (!order_num) {
-					return;
-				}
-
-				setTimeout(() => {
-					this.req({
-						url: "prizeorderlog",
-						data: {
-							order_num,
-						},
-						success: (res) => {
-							if (res.status == 1) {
-								this.prizeData = res.data;
-
-								if (res.data.data.length <= 0) {
-									this.getPrize(order_num);
-									return;
-								}
-
-								// this.aniShow = true
-								// setTimeout(() => {
-								//   this.aniShow = false
-								this.bgmCtx.openBgm.stop();
-								this.bgmCtx.openBgm.play();
-								this.open("resPop");
-								// }, 1300)
+			this.req({
+				url,
+				data,
+				success: async (res) => {
+					if (res.status == 1) {
+						if (type == 0) {
+							if (res.data.coupon_id) {
+								this.couponData = {
+									id: res.data.coupon_id,
+									price: res.data.coupon_price,
+								};
 							}
-						},
-					});
-				}, 500);
-			},
 
-			changePay(e) {
-				this[e] = !this[e];
-				this.confirmSubmit([0, this.buyNum]);
-			},
+							this.orderData = res.data;
 
-			confirmSubmit([type, num, fromNotice = false]) {
-				let url = "ordermoney";
-
-				if (type == 1) {
-					url = "orderbuy";
-
-					if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
-						this.$refs.buyNotice.getRule(6);
-						return;
-					}
-				}
-				if (!this.getBtnXianShi(0)) {
-					this.useMoney = false;
-					this.useIntegral = false;
-					this.useMoney2 = false;
-				}
-				this.buyNum = num;
-
-				let data = {
-					goods_id: this.pageData.goods.id,
-					prize_num: this.buyNum,
-					goods_num: this.pageData.goods.num,
-					use_money_is: this.useMoney ? 1 : 2,
-					use_integral_is: this.useIntegral ? 1 : 2,
-					coupon_id: (this.couponData && this.couponData.id) || "",
-					use_money2_is: this.useMoney2 ? 1 : 2
-				};
-
-				if (this.pageData.goods.type == 5) {
-					data.coupon_id = "";
-				}
-
-				this.req({
-					url,
-					data,
-					success: async (res) => {
-						if (res.status == 1) {
-							if (type == 0) {
-								if (res.data.coupon_id) {
-									this.couponData = {
-										id: res.data.coupon_id,
-										price: res.data.coupon_price,
-									};
+							// 使用this.$nextTick确保视图已更新，组件已挂载
+							this.$nextTick(() => {
+								if (this.$refs.buyPop) {
+									this.$refs.buyPop.open();
+								} else {
+									console.error('buyPop组件引用不存在');
 								}
+							});
+						}
 
-								this.orderData = res.data;
+						if (type == 1) {
+							this.close("buyPop");
 
-								// 使用this.$nextTick确保视图已更新，组件已挂载
-								this.$nextTick(() => {
-									if (this.$refs.buyPop) {
-										this.$refs.buyPop.open();
-									} else {
-										console.error('buyPop组件引用不存在');
-									}
+							if (res.data.status == 1) {
+								const status = await this.$c.wxMpPay({
+									data: res.data.res,
 								});
-							}
 
-							if (type == 1) {
-								this.close("buyPop");
-
-								if (res.data.status == 1) {
-									const status = await this.$c.wxMpPay({
-										data: res.data.res,
-									});
-
-									if (status == "success") {
+								if (status == "success") {
+									this.getPrize(res.data.order_num);
+									this.doRefresh();
+								}
+							} else {
+								this.$c.toast({
+									title: res.msg,
+									duration: 500,
+									success: () => {
 										this.getPrize(res.data.order_num);
 										this.doRefresh();
-									}
-								} else {
-									this.$c.toast({
-										title: res.msg,
-										duration: 500,
-										success: () => {
-											this.getPrize(res.data.order_num);
-											this.doRefresh();
-										},
-									});
-								}
+									},
+								});
 							}
 						}
-					},
-				});
-				if (type == 1) {
-					this.close("buyPop");
-				}
-			},
-
-			onCollectionChanged() {
-				this.doRefresh();
-			},
-
-			handleRuleClick(ruleId, title) {
-				this.$refs.rulePop.getRule(ruleId, title);
-			},
-
-			toBag() {
-				this.close("resPop");
-
-				this.$c.to({
-					type: 3,
-					url: "/pages/sangdai/sangdai",
-				});
-			},
-
-			changeBox() {
-				this.$c.to({
-					url: "/pages/shouye/huanxiang",
-					query: {
-						id: this.pageData.goods.id,
-						type_text: this.optData.type_text,
-					},
-				});
-			},
-
-			doRefresh() {
-				this.getData();
-
-				if (this.tabCur == 2) {
-					this.tabChange(this.tabCur);
-				}
-			},
-
-			subTabChange(i) {
-				this.subTabCur = i;
-				this.logList = [];
-
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.mescroll.resetUpScroll();
-						this.mescroll.scrollTo(0, 0);
-					}, 100);
-				});
-			},
-
-			tabChange(i) {
-				this.tabCur = i;
-
-				switch (Number(i)) {
-					case 1:
-						this.getData();
-						break;
-					case 2:
-						this.subTabChange(this.subTabCur);
-						break;
-				}
-			},
-
-			next() {
-				if (this.optData.goods_num >= this.pageData.goods.stock) {
-					this.optData.goods_num = this.pageData.goods.stock;
-
-					this.$c.toast({
-						title: "已经是最后一箱了",
-					});
-					return;
-				}
-
-				this.optData.goods_num += 1;
-				this.getData();
-			},
-
-			prev() {
-				if (this.optData.goods_num <= 1) {
-					this.optData.goods_num = 1;
-
-					this.$c.toast({
-						title: "已经是第一箱了",
-					});
-					return;
-				}
-
-				this.optData.goods_num -= 1;
-				this.getData();
-			},
-
-			getLog({
-				num,
-				size
-			}) {
-				if (num > 1) return this.mescroll.endByPage(this.logList.length, 1);
-				this.req({
-					url: "shang_log",
-					data: {
-						page: num,
-						goods_id: this.optData.goods_id,
-						goods_num: this.optData.goods_num,
-						shang_id: this.subTab.length > 0 ? this.subTab[this.subTabCur].shang_id : "",
-					},
-					Loading: true,
-					success: (res) => {
-						if (res.status == 1) {
-							this.subTab = res.data.category;
-
-							if (num == 1) {
-								this.logList = [];
-							}
-
-							this.logList = this.logList.concat(res.data.data);
-							this.mescroll.endByPage(res.data.data.length, res.data.last_page);
-						}
-					},
-				});
-			},
-
-			getData() {
-				this.req({
-					url: "goodsdetail",
-					data: {
-						goods_id: this.optData.goods_id,
-						goods_num: this.optData.goods_num,
-					},
-					success: (res) => {
-						if (res.status == 1) {
-							this.optData.goods_num = Number(res.data.goods.num);
-
-							if (
-								res.data.goods.lock_is == 1 &&
-								res.data.lock_info.goods_lock_surplus_time > 0
-							) {
-								this.runSec(res.data.lock_info.goods_lock_surplus_time);
-							}
-
-							this.pageData = res.data;
-							let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type);
-							this.useMoney = goodType.pay_balance == 1 ? true : false;
-							this.useIntegral = goodType.pay_currency == 1 ? true : false;
-							this.useMoney2 = goodType.pay_currency2 == 1 ? true : false;
-							console.log(this.pageData);
-						}
-					},
-				});
-			},
-			getBtnXianShi(type) {
-				if (this.pageData == null || this.pageData["xuangou"] == null) {
-					// this.pageData
-					return true;
-				}
-				let xuangou = this.pageData["xuangou"];
-				if (xuangou.quanju_xiangou == 0) {
-					return true;
-				}
-
-				if (type == 0) {
-					return false;
-				}
-				if (type == 1) {
-					return true;
-				}
-
-				let yuxia = xuangou.quanju_xiangou - xuangou.user_xiangou_count;
-				console.log(yuxia);
-				if (yuxia >= type) {
-					return true;
-				}
-				return false;
-			},
-			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"]);
-					}
-				}
-			},
-
-			open(e) {
-				console.log('打开弹窗:', e, this.$refs[e]);
-				if (e === 'buyPop') {
-					if (this.$refs[e]) {
-						this.$refs[e].open();
-					} else {
-						console.error('找不到buyPop组件引用');
-					}
-				} else {
-					if (this.$refs[e]) {
-						this.$refs[e].open();
-					} else {
-						console.error('找不到组件引用:', e);
-					}
-				}
-			},
+				},
+			});
+			if (type == 1) {
+				this.close("buyPop");
+			}
 		},
-	};
+
+		onCollectionChanged() {
+			this.doRefresh();
+		},
+
+		handleRuleClick(ruleId, title) {
+			this.$refs.rulePop.getRule(ruleId, title);
+		},
+
+		toBag() {
+			this.close("resPop");
+
+			this.$c.to({
+				type: 3,
+				url: "/pages/sangdai/sangdai",
+			});
+		},
+
+		changeBox() {
+			this.$c.to({
+				url: "/pages/shouye/huanxiang",
+				query: {
+					id: this.pageData.goods.id,
+					type_text: this.optData.type_text,
+				},
+			});
+		},
+
+		doRefresh() {
+			this.getData();
+
+			if (this.tabCur == 2) {
+				this.tabChange(this.tabCur);
+			}
+		},
+
+		subTabChange(i) {
+			this.subTabCur = i;
+			this.logList = [];
+
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.mescroll.resetUpScroll();
+					this.mescroll.scrollTo(0, 0);
+				}, 100);
+			});
+		},
+
+		tabChange(i) {
+			this.tabCur = i;
+
+			switch (Number(i)) {
+				case 1:
+					this.getData();
+					break;
+				case 2:
+					this.subTabChange(this.subTabCur);
+					break;
+			}
+		},
+
+		next() {
+			if (this.optData.goods_num >= this.pageData.goods.stock) {
+				this.optData.goods_num = this.pageData.goods.stock;
+
+				this.$c.toast({
+					title: "已经是最后一箱了",
+				});
+				return;
+			}
+
+			this.optData.goods_num += 1;
+			this.getData();
+		},
+
+		prev() {
+			if (this.optData.goods_num <= 1) {
+				this.optData.goods_num = 1;
+
+				this.$c.toast({
+					title: "已经是第一箱了",
+				});
+				return;
+			}
+
+			this.optData.goods_num -= 1;
+			this.getData();
+		},
+
+		getLog({
+			num,
+			size
+		}) {
+			if (num > 1) return this.mescroll.endByPage(this.logList.length, 1);
+			this.req({
+				url: "shang_log",
+				data: {
+					page: num,
+					goods_id: this.optData.goods_id,
+					goods_num: this.optData.goods_num,
+					shang_id: this.subTab.length > 0 ? this.subTab[this.subTabCur].shang_id : "",
+				},
+				Loading: true,
+				success: (res) => {
+					if (res.status == 1) {
+						this.subTab = res.data.category;
+
+						if (num == 1) {
+							this.logList = [];
+						}
+
+						this.logList = this.logList.concat(res.data.data);
+						this.mescroll.endByPage(res.data.data.length, res.data.last_page);
+					}
+				},
+			});
+		},
+
+		getData() {
+			this.req({
+				url: "goodsdetail",
+				data: {
+					goods_id: this.optData.goods_id,
+					goods_num: this.optData.goods_num,
+				},
+				success: (res) => {
+					if (res.status == 1) {
+						this.optData.goods_num = Number(res.data.goods.num);
+
+						if (
+							res.data.goods.lock_is == 1 &&
+							res.data.lock_info.goods_lock_surplus_time > 0
+						) {
+							this.runSec(res.data.lock_info.goods_lock_surplus_time);
+						}
+
+						this.pageData = res.data;
+						let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type);
+						this.useMoney = goodType.pay_balance == 1 ? true : false;
+						this.useIntegral = goodType.pay_currency == 1 ? true : false;
+						this.useMoney2 = goodType.pay_currency2 == 1 ? true : false;
+						console.log(this.pageData);
+					}
+				},
+			});
+		},
+		getBtnXianShi(type) {
+			if (this.pageData == null || this.pageData["xuangou"] == null) {
+				// this.pageData
+				return true;
+			}
+			let xuangou = this.pageData["xuangou"];
+			if (xuangou.quanju_xiangou == 0) {
+				return true;
+			}
+
+			if (type == 0) {
+				return false;
+			}
+			if (type == 1) {
+				return true;
+			}
+
+			let yuxia = xuangou.quanju_xiangou - xuangou.user_xiangou_count;
+			console.log(yuxia);
+			if (yuxia >= type) {
+				return true;
+			}
+			return false;
+		},
+		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"]);
+				}
+			}
+		},
+
+		open(e) {
+			console.log('打开弹窗:', e, this.$refs[e]);
+			if (e === 'buyPop') {
+				if (this.$refs[e]) {
+					this.$refs[e].open();
+				} else {
+					console.error('找不到buyPop组件引用');
+				}
+			} else {
+				if (this.$refs[e]) {
+					this.$refs[e].open();
+				} else {
+					console.error('找不到组件引用:', e);
+				}
+			}
+		},
+	},
+};
 </script>
 
 <style lang="scss">
-	.navLeft {
-		width: 100%;
-		position: fixed;
-		left: 30rpx;
-		z-index: 100;
-		height: 44px;
+.navLeft {
+	width: 100%;
+	position: fixed;
+	left: 30rpx;
+	z-index: 100;
+	height: 44px;
 
-		>view {
-			font-weight: 600;
-			font-size: 50rpx;
-			color: #ffffff;
-		}
+	>view {
+		font-weight: 600;
+		font-size: 50rpx;
+		color: #ffffff;
 	}
+}
 
-	.content {
-		padding: 0 0 300rpx;
-		background-color: #ffffff;
+.content {
+	padding: 0 0 300rpx;
+	background-color: #ffffff;
 
-		.header {
-			width: 750rpx;
-			height: 722rpx;
-			margin-top: 130rpx;
-			background-color: #d8d8d8;
+	.header {
+		width: 750rpx;
+		height: 722rpx;
+		margin-top: 130rpx;
+		background-color: #d8d8d8;
 
-			&-wuzhe {
-				width: 160rpx;
-				height: 60rpx;
-				position: absolute;
-				top: 300rpx;
-				left: 0;
+		&-wuzhe {
+			width: 160rpx;
+			height: 60rpx;
+			position: absolute;
+			top: 300rpx;
+			left: 0;
+		}
+
+		&-goodsTitel {
+			position: absolute;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #ffffff;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 24rpx;
+			z-index: 2;
+			// text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+		}
+
+		&-suoxiang {
+			position: absolute;
+			width: 584rpx;
+			height: 120rpx;
+			background: rgba(0, 0, 0, 0.73);
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 390rpx;
+			z-index: 2;
+
+			>image:nth-of-type(1) {
+				width: 46rpx;
+				height: 46rpx;
+				border: 2rpx solid #ffffff;
+				border-radius: 50rpx;
 			}
 
-			&-goodsTitel {
-				position: absolute;
+			>image:nth-of-type(2) {
+				width: 144rpx;
+				height: 68rpx;
+			}
+
+			>view:nth-of-type(1) {
+				width: 140rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #ffffff;
+			}
+
+			>view:nth-of-type(2) {
 				font-weight: 400;
 				font-size: 24rpx;
 				color: #ffffff;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 24rpx;
-				z-index: 2;
-				// text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+			}
+		}
+
+		&-title {
+			position: absolute;
+			padding: 0 20rpx;
+			width: 280rpx;
+			height: 44rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 78rpx;
+			z-index: 10;
+
+			>text:nth-child(2n + 1) {
+				font-weight: 400;
+				font-size: 18rpx;
+				color: #333333;
 			}
 
-			&-suoxiang {
-				position: absolute;
-				width: 584rpx;
-				height: 120rpx;
-				background: rgba(0, 0, 0, 0.73);
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 390rpx;
-				z-index: 2;
-
-				>image:nth-of-type(1) {
-					width: 46rpx;
-					height: 46rpx;
-					border: 2rpx solid #ffffff;
-					border-radius: 50rpx;
-				}
-
-				>image:nth-of-type(2) {
-					width: 144rpx;
-					height: 68rpx;
-				}
-
-				>view:nth-of-type(1) {
-					width: 140rpx;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #ffffff;
-				}
-
-				>view:nth-of-type(2) {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #ffffff;
-				}
+			>text:nth-child(2) {
+				font-weight: 700;
+				font-size: 24rpx;
+				color: #333333;
 			}
+		}
 
-			&-title {
-				position: absolute;
-				padding: 0 20rpx;
-				width: 280rpx;
-				height: 44rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 78rpx;
-				z-index: 10;
+		&-footer {
+			width: 750rpx;
+			position: absolute;
+			left: 0;
+			bottom: 0;
 
-				>text:nth-child(2n + 1) {
-					font-weight: 400;
-					font-size: 18rpx;
-					color: #333333;
-				}
-
-				>text:nth-child(2) {
-					font-weight: 700;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&-footer {
-				width: 750rpx;
+			&-one {
+				width: 186rpx;
+				height: 106rpx;
+				display: flex;
 				position: absolute;
 				left: 0;
 				bottom: 0;
+				z-index: 1;
 
-				&-one {
-					width: 186rpx;
-					height: 106rpx;
-					display: flex;
-					position: absolute;
-					left: 0;
-					bottom: 0;
-					z-index: 1;
-
-					>image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				&-two {
-					width: 224rpx;
-					height: 119rpx;
-					display: flex;
-					position: absolute;
-					left: 160rpx;
-					bottom: 0;
-					z-index: 1;
-
-					>image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				&-three {
-					width: 224rpx;
-					height: 119rpx;
-					display: flex;
-					position: absolute;
-					right: 160rpx;
-					bottom: 0;
-
-					>image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-				&-four {
-					width: 186rpx;
-					height: 106rpx;
-					display: flex;
-					position: absolute;
-					right: 0;
-					bottom: 0;
-
-					>image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-			}
-		}
-
-		.spylView {
-			background: #ffffff;
-
-			&-head {
-				box-sizing: border-box;
-				padding: 24rpx 30rpx;
-				width: 750rpx;
-
-				>view:nth-child(2n + 1) {
-					>view:nth-child(1) {
-						width: 74rpx;
-						height: 56rpx;
-						background: #f5f5f5;
-						border-radius: 12rpx;
-						// border: 2rpx solid #000000;
-					}
-
-					>view:nth-child(2) {
-						margin-top: 8rpx;
-						font-weight: 400;
-						font-size: 20rpx;
-						color: #ffffff;
-						text-align: center;
-					}
-				}
-
-				>view:nth-child(2) {
-					width: 420rpx;
-
-					>view:nth-child(1) {
-						width: 420rpx;
-						height: 14rpx;
-						border-radius: 40rpx;
-
-						>text {
-							height: 14rpx;
-							border-radius: 40rpx;
-							background: #cdf022;
-						}
-					}
-
-					>view:nth-child(2) {
-						padding: 14rpx 30rpx 0;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #999999;
-
-						>view {
-							>text {
-								font-weight: 400;
-								color: #333333;
-							}
-						}
-					}
+				>image {
+					width: 100%;
+					height: 100%;
 				}
 			}
 
-			.list {
-				padding: 30rpx;
-				display: grid;
-				grid-template-columns: repeat(3, 31.5%);
-				gap: 30rpx 20rpx;
-			}
-		}
-
-		.fixed-btns {
-			position: fixed;
-			z-index: 10;
-			right: 20rpx;
-			bottom: 300rpx;
-
-			.btn {
-				width: 94rpx;
-				height: 110rpx;
-				margin-top: 40rpx;
-			}
-		}
-
-		.ft-fixed {
-			position: fixed;
-			z-index: 10;
-			left: 0;
-			bottom: 0;
-			width: 100%;
-			display: flex;
-			flex-flow: row wrap;
-			justify-content: center;
-			padding-bottom: 40rpx;
-			background: #ffffff;
-			padding-top: 20rpx;
-
-			.lt-btn {
-				width: 690rpx;
-				height: 60rpx;
-				background: linear-gradient(90deg, #2dcbff 0%, #ff873a 100%);
-				border-radius: 40rpx;
+			&-two {
+				width: 224rpx;
+				height: 119rpx;
 				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin-bottom: 20rpx;
-				font-size: 32rpx;
-				font-weight: 400;
-				color: #ffffff;
-			}
+				position: absolute;
+				left: 160rpx;
+				bottom: 0;
+				z-index: 1;
 
-			.btn {
-				width: 120rpx;
-				height: 68rpx;
-				position: relative;
-
-				>view {
-					white-space: nowrap;
-					font-weight: 400;
-					font-size: 52rpx;
-					color: #ffffff;
-					position: relative;
-					text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
-
-					// &::before {
-					// 	content: '';
-					// 	position: absolute;
-					// 	bottom: 10rpx;
-					// 	left: -8rpx;
-					// 	width: 22rpx;
-					// 	height: 22rpx;
-					// 	background: url($imgurl+'common/jiantou1.png') no-repeat 0 0 / 100% 100%;
-					// }
-
-					// &::after {
-					// 	content: '';
-					// 	position: absolute;
-					// 	top: 0rpx;
-					// 	right: -10rpx;
-					// 	width: 22rpx;
-					// 	height: 22rpx;
-					// 	background: url($imgurl+'common/jiantou2.png') no-repeat 0 0 / 100% 100%;
-					// }
-				}
-			}
-		}
-
-
-		.res-pop {
-			width: 100%;
-			height: 100vh;
-			position: relative;
-			background: url($imgurl + "common/yb.png") no-repeat 0 0 / 100% 100%;
-
-			.res-pop-hd {
-				width: 400rpx;
-				height: 108rpx;
-				background: url($imgurl + "common/gxhd.png") no-repeat 0 0 / 100% 100%;
-			}
-
-			.res-pop-bd {
-				width: 636rpx;
-				height: 760rpx;
-				background-color: #ffffff;
-				border-radius: 16rpx;
-				margin: 36rpx auto;
-
-				.res-list {
-					padding: 20rpx 10rpx;
-					display: grid;
-					grid-template-columns: repeat(3, 210rpx);
-					gap: 24rpx 10rpx;
-
-					.res-item {
-						width: 180rpx;
-						height: 240rpx;
-						background-color: #f8f8f8;
-						border-radius: 16rpx;
-
-						.pic {
-							width: 180rpx;
-							height: 180rpx;
-							position: relative;
-							background: #d8d8d8;
-							border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-							>image {
-								width: 180rpx;
-								height: 180rpx;
-								border-radius: 16rpx 16rpx 0rpx 0rpx;
-							}
-
-							.type-tag {
-								position: absolute;
-								left: 12rpx;
-								top: 12rpx;
-								z-index: 2;
-								width: 68rpx;
-								height: 32rpx;
-								background: url($imgurl + "common/chouLabel.png") no-repeat 0 0 / 100% 100%;
-								font-weight: 400;
-								font-size: 14rpx;
-								color: #ffffff;
-							}
-
-							.num {
-								position: absolute;
-								z-index: 2;
-								left: 50%;
-								transform: translateX(-50%);
-								bottom: 10rpx;
-								min-width: 42rpx;
-								height: 28rpx;
-								font-weight: 400;
-								font-size: 14rpx;
-								color: #ffffff;
-								background: rgba(0, 0, 0, 0.5);
-								border-radius: 18rpx;
-							}
-						}
-
-						.title {
-							padding: 22rpx 10rpx 0;
-							font-weight: 400;
-							font-size: 16rpx;
-							color: #333333;
-						}
-
-						.exchange {
-							padding: 10rpx 10rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #ffffff;
-						}
-					}
+				>image {
+					width: 100%;
+					height: 100%;
 				}
 			}
 
-			.res-pop-ft {
-				width: 750rpx;
+			&-three {
+				width: 224rpx;
+				height: 119rpx;
 				display: flex;
-				justify-content: space-evenly;
+				position: absolute;
+				right: 160rpx;
+				bottom: 0;
 
-				.ft-btn {
-					width: 200rpx;
-					height: 68rpx;
-					font-weight: 400;
-					font-size: 24rpx;
-				}
-
-				>view:nth-child(1) {
-					color: #333333;
-				}
-
-				>view:nth-child(2) {
-					color: #333333;
+				>image {
+					width: 100%;
+					height: 100%;
 				}
 			}
-		}
 
-		.ani-pop {
-			width: 100vw;
-			height: 100vh;
-			position: fixed;
-			left: 0;
-			top: 0;
-			z-index: 88;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background: #000;
+			&-four {
+				width: 186rpx;
+				height: 106rpx;
+				display: flex;
+				position: absolute;
+				right: 0;
+				bottom: 0;
 
-			image {
-				width: 100%;
-				height: 1624rpx;
-			}
-		}
-
-
-		.item-info {
-			padding: 5rpx 0;
-		}
-
-		.item-title {
-			padding: 0 2%;
-			margin: 1rpx 0;
-			width: 100%;
-			font-size: 21rpx;
-			text-align: left;
-			height: 35rpx;
-			line-height: 35rpx;
-			font-weight: 500;
-			color: #333333;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-
-		.item-probability {
-			padding: 0 2%;
-			margin: 1rpx 0;
-			width: 100%;
-			font-size: 21rpx;
-			text-align: left;
-			height: 35rpx;
-			line-height: 35rpx;
-			color: #f39205;
-		}
-
-		.item-price {
-			padding: 0 2%;
-			margin: 1rpx 0;
-			width: 100%;
-			font-size: 21rpx;
-			text-align: left;
-			height: 35rpx;
-			line-height: 35rpx;
-			color: #333333;
-		}
-
-		// 售罄遮罩
-		.sold-out-mask {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0, 0, 0, 0.6);
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			border-radius: 16rpx 16rpx 0 0;
-			z-index: 10;
-
-			text {
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+				>image {
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 	}
+
+	.spylView {
+		background: #ffffff;
+
+		&-head {
+			box-sizing: border-box;
+			padding: 24rpx 30rpx;
+			width: 750rpx;
+
+			>view:nth-child(2n + 1) {
+				>view:nth-child(1) {
+					width: 74rpx;
+					height: 56rpx;
+					background: #f5f5f5;
+					border-radius: 12rpx;
+					// border: 2rpx solid #000000;
+				}
+
+				>view:nth-child(2) {
+					margin-top: 8rpx;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #ffffff;
+					text-align: center;
+				}
+			}
+
+			>view:nth-child(2) {
+				width: 420rpx;
+
+				>view:nth-child(1) {
+					width: 420rpx;
+					height: 14rpx;
+					border-radius: 40rpx;
+
+					>text {
+						height: 14rpx;
+						border-radius: 40rpx;
+						background: #cdf022;
+					}
+				}
+
+				>view:nth-child(2) {
+					padding: 14rpx 30rpx 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+
+					>view {
+						>text {
+							font-weight: 400;
+							color: #333333;
+						}
+					}
+				}
+			}
+		}
+
+		.list {
+			padding: 30rpx;
+			display: grid;
+			grid-template-columns: repeat(3, 31.5%);
+			gap: 30rpx 20rpx;
+		}
+	}
+
+	.fixed-btns {
+		position: fixed;
+		z-index: 10;
+		right: 20rpx;
+		bottom: 300rpx;
+
+		.btn {
+			width: 94rpx;
+			height: 110rpx;
+			margin-top: 40rpx;
+		}
+	}
+
+	.ft-fixed {
+		position: fixed;
+		z-index: 10;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		display: flex;
+		flex-flow: row wrap;
+		justify-content: center;
+		padding-bottom: 40rpx;
+		background: #ffffff;
+		padding-top: 20rpx;
+
+		.lt-btn {
+			width: 690rpx;
+			height: 60rpx;
+			background: linear-gradient(90deg, #2dcbff 0%, #ff873a 100%);
+			border-radius: 40rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 20rpx;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #ffffff;
+		}
+
+		.btn {
+			width: 120rpx;
+			height: 68rpx;
+			position: relative;
+
+			>view {
+				white-space: nowrap;
+				font-weight: 400;
+				font-size: 52rpx;
+				color: #ffffff;
+				position: relative;
+				text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+
+				// &::before {
+				// 	content: '';
+				// 	position: absolute;
+				// 	bottom: 10rpx;
+				// 	left: -8rpx;
+				// 	width: 22rpx;
+				// 	height: 22rpx;
+				// 	background: url($imgurl+'common/jiantou1.png') no-repeat 0 0 / 100% 100%;
+				// }
+
+				// &::after {
+				// 	content: '';
+				// 	position: absolute;
+				// 	top: 0rpx;
+				// 	right: -10rpx;
+				// 	width: 22rpx;
+				// 	height: 22rpx;
+				// 	background: url($imgurl+'common/jiantou2.png') no-repeat 0 0 / 100% 100%;
+				// }
+			}
+		}
+	}
+
+
+	.res-pop {
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		background: url($imgurl + "common/yb.png") no-repeat 0 0 / 100% 100%;
+
+		.res-pop-hd {
+			width: 400rpx;
+			height: 108rpx;
+			background: url($imgurl + "common/gxhd.png") no-repeat 0 0 / 100% 100%;
+		}
+
+		.res-pop-bd {
+			width: 636rpx;
+			height: 760rpx;
+			background-color: #ffffff;
+			border-radius: 16rpx;
+			margin: 36rpx auto;
+
+			.res-list {
+				padding: 20rpx 10rpx;
+				display: grid;
+				grid-template-columns: repeat(3, 210rpx);
+				gap: 24rpx 10rpx;
+
+				.res-item {
+					width: 180rpx;
+					height: 240rpx;
+					background-color: #f8f8f8;
+					border-radius: 16rpx;
+
+					.pic {
+						width: 180rpx;
+						height: 180rpx;
+						position: relative;
+						background: #d8d8d8;
+						border-radius: 16rpx 16rpx 0rpx 0rpx;
+
+						>image {
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 16rpx 16rpx 0rpx 0rpx;
+						}
+
+						.type-tag {
+							position: absolute;
+							left: 12rpx;
+							top: 12rpx;
+							z-index: 2;
+							width: 68rpx;
+							height: 32rpx;
+							background: url($imgurl + "common/chouLabel.png") no-repeat 0 0 / 100% 100%;
+							font-weight: 400;
+							font-size: 14rpx;
+							color: #ffffff;
+						}
+
+						.num {
+							position: absolute;
+							z-index: 2;
+							left: 50%;
+							transform: translateX(-50%);
+							bottom: 10rpx;
+							min-width: 42rpx;
+							height: 28rpx;
+							font-weight: 400;
+							font-size: 14rpx;
+							color: #ffffff;
+							background: rgba(0, 0, 0, 0.5);
+							border-radius: 18rpx;
+						}
+					}
+
+					.title {
+						padding: 22rpx 10rpx 0;
+						font-weight: 400;
+						font-size: 16rpx;
+						color: #333333;
+					}
+
+					.exchange {
+						padding: 10rpx 10rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #ffffff;
+					}
+				}
+			}
+		}
+
+		.res-pop-ft {
+			width: 750rpx;
+			display: flex;
+			justify-content: space-evenly;
+
+			.ft-btn {
+				width: 200rpx;
+				height: 68rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+			}
+
+			>view:nth-child(1) {
+				color: #333333;
+			}
+
+			>view:nth-child(2) {
+				color: #333333;
+			}
+		}
+	}
+
+	.ani-pop {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 88;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #000;
+
+		image {
+			width: 100%;
+			height: 1624rpx;
+		}
+	}
+
+
+	.item-info {
+		padding: 5rpx 0;
+	}
+
+	.item-title {
+		padding: 0 2%;
+		margin: 1rpx 0;
+		width: 100%;
+		font-size: 21rpx;
+		text-align: left;
+		height: 35rpx;
+		line-height: 35rpx;
+		font-weight: 500;
+		color: #333333;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.item-probability {
+		padding: 0 2%;
+		margin: 1rpx 0;
+		width: 100%;
+		font-size: 21rpx;
+		text-align: left;
+		height: 35rpx;
+		line-height: 35rpx;
+		color: #f39205;
+	}
+
+	.item-price {
+		padding: 0 2%;
+		margin: 1rpx 0;
+		width: 100%;
+		font-size: 21rpx;
+		text-align: left;
+		height: 35rpx;
+		line-height: 35rpx;
+		color: #333333;
+	}
+
+	// 售罄遮罩
+	.sold-out-mask {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.6);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 16rpx 16rpx 0 0;
+		z-index: 10;
+
+		text {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+			text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index d869036..b7419d5 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -169,7 +169,8 @@
 				<view class="log-list">
 					<view class="log-item br10" v-for="(a, b) in logList" :key="b">
 						<view class="avatar">
-							<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;"></image>
+							<image :src="a.user_info && a.user_info.headimg" style="width:80rpx; height: 80rpx;">
+							</image>
 						</view>
 
 						<view class="info">
@@ -601,7 +602,7 @@ export default {
 		},
 
 		previewDetail(item, a) {
-			 
+
 			const obj = {
 				imgurl: a.imgurl,
 				title: a.title,
@@ -620,7 +621,7 @@ export default {
 				num: 0,
 			};
 			// console.log(a);
- 
+
 			// 使用全局方法调用预览弹窗
 			this.$preview({
 				productType: this.optData.type_text,
@@ -747,6 +748,9 @@ export default {
 			if (type === 'useMoney') {
 				this.useMoney = !this.useMoney;
 			} else if (type === 'useIntegral') {
+				if (this.couponData!=null&&this.couponData.id!='') {
+					this.couponData = null;
+				}
 				this.useIntegral = !this.useIntegral;
 			} else if (type === 'useMoney2') {
 				this.useMoney2 = !this.useMoney2;
@@ -781,8 +785,15 @@ export default {
 				}
 			}
 
-			this.buyNum = num
-
+			this.buyNum = num;
+			 
+			let coupon_id = (this.couponData && this.couponData.id) || ''
+			if (coupon_id != '' && this.useIntegral) {
+				this.useIntegral = false;
+			} else if (this.useIntegral && coupon_id != '') {
+				this.couponData = null;
+				coupon_id = '';
+			}
 			this.req({
 				url,
 				data: {
@@ -791,7 +802,7 @@ export default {
 					use_money_is: this.useMoney ? 1 : 2,
 					use_integral_is: this.useIntegral ? 1 : 2,
 					use_money2_is: this.useMoney2 ? 1 : 2,
-					coupon_id: (this.couponData && this.couponData.id) || '',
+					coupon_id: coupon_id,
 
 					// ad_id: uni.getStorageSync('_ad_id')
 				},
@@ -1548,7 +1559,7 @@ export default {
 	}
 
 	.list {
-		
+
 
 		.list-item {
 			box-sizing: border-box;