From ad7cdede4ef83d9274de9040fa207d5caed212ba Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Mon, 7 Apr 2025 15:20:32 +0800
Subject: [PATCH] UI

---
 components/collect-btn/collect-btn.vue        |    3 +-
 .../order-confirm-popup-flw.vue               |    4 +-
 .../order-confirm-popup.vue                   |    4 +-
 manifest.json                                 |    2 +-
 package/index/leitai.vue                      |    2 +-
 package/index/lian-ji.vue                     |    2 +-
 pages/fuli/fuli-detail.vue                    |    2 +-
 pages/guize/guize.vue                         |    2 +-
 pages/infinite/bonus_house.vue                |    7 +-
 pages/sangdai/sangdai.vue                     |    7 +-
 pages/shouye/detail.vue                       | 2123 ++++++++---------
 pages/shouye/detail_wuxian.vue                |  260 +-
 pages/shouye/index.vue                        |    8 +-
 pages/user/login.vue                          |    9 +-
 14 files changed, 971 insertions(+), 1464 deletions(-)

diff --git a/components/collect-btn/collect-btn.vue b/components/collect-btn/collect-btn.vue
index 69ac02c..246972a 100644
--- a/components/collect-btn/collect-btn.vue
+++ b/components/collect-btn/collect-btn.vue
@@ -23,7 +23,7 @@ export default {
     },
     customStyle: {
       type: String,
-      default: 'position: absolute; right: 0; top: 232rpx; margin-right: 48rpx;'
+      default: 'position: absolute; right: 0; top: 56rpx; margin-right: 48rpx;'
     }
   },
   data() {
@@ -61,6 +61,7 @@ export default {
   height: 95rpx;
   box-sizing: border-box;
   flex-direction: column;
+
   
   > image {
     width: 64rpx;
diff --git a/components/order-confirm-popup/order-confirm-popup-flw.vue b/components/order-confirm-popup/order-confirm-popup-flw.vue
index bcbff98..54cc791 100644
--- a/components/order-confirm-popup/order-confirm-popup-flw.vue
+++ b/components/order-confirm-popup/order-confirm-popup-flw.vue
@@ -3,7 +3,7 @@
 		<view class="buy-pop relative">
 			<view class="buy-pop-hd">
 				<view class="" style="width: 60rpx"></view>
-				<text class="" style="font-size: 28rpx">确认订单</text>
+				<text class="" style="font-size: 28rpx;">确认订单</text>
 				<view class="close icon" @click="$emit('close')">
 					<image :src="$img('/static/img/close2.png')" style="width: 24rpx; height: 24rpx" lazy-load></image>
 				</view>
@@ -253,7 +253,7 @@ export default {
 		justify-content: space-between;
 		align-items: center;
 		font-size: 40rpx;
-		font-weight: 500;
+		font-weight: 600;
 		color: #333333;
 
 		.close {
diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue
index d169775..f6cfe4a 100644
--- a/components/order-confirm-popup/order-confirm-popup.vue
+++ b/components/order-confirm-popup/order-confirm-popup.vue
@@ -318,7 +318,7 @@ export default {
 		justify-content: space-between;
 		align-items: center;
 		font-size: 40rpx;
-		font-weight: 500;
+		font-weight: 600;
 		color: #333333;
 
 		.close {
@@ -339,7 +339,6 @@ export default {
 
 		.title {
 			font-size: 20rpx;
-			font-family: Source Han Sans CN;
 			font-weight: 400;
 			margin-left: 24rpx;
 			color: #333333;
@@ -349,7 +348,6 @@ export default {
 			display: flex;
 			align-items: center;
 			font-size: 24rpx;
-			font-family: Source Han Sans CN;
 			font-weight: 400;
 			color: #999999;
 
diff --git a/manifest.json b/manifest.json
index 2aebbfa..afb3253 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "一番赏",
-    "appid" : "__UNI__0BC0425",
+    "appid" : "__UNI__2E6CB39",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
index 1316acb..cc5a7c4 100644
--- a/package/index/leitai.vue
+++ b/package/index/leitai.vue
@@ -403,7 +403,7 @@
 					<view class="ft-btn common_bg justify-center" :style="{
               backgroundImage: `url(${$img1('common/quhegui.png')})`,
             }" @click="toBag">
-						<text>去盒柜</text>
+						<text>去发货</text>
 					</view>
 
 					<view class="ft-btn common_bg justify-center" :style="{
diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue
index 54478e9..5301bee 100644
--- a/package/index/lian-ji.vue
+++ b/package/index/lian-ji.vue
@@ -282,7 +282,7 @@
 					<view class="ft-btn common_bg justify-center" :style="{
 					   backgroundImage: `url(${$img1('common/quhegui.png')})`
 					}" @click="toBag">
-						<text>去盒柜</text>
+						<text>去发货</text>
 					</view>
 
 					<view class="ft-btn common_bg justify-center" :style="{
diff --git a/pages/fuli/fuli-detail.vue b/pages/fuli/fuli-detail.vue
index 3bbcd79..f721023 100644
--- a/pages/fuli/fuli-detail.vue
+++ b/pages/fuli/fuli-detail.vue
@@ -368,7 +368,7 @@
 					<view class="ft-btn confirm common_bg" :style="{
               backgroundImage: `url(${$img('/static/img/btn_bg.png')})`
             }" @click="toBag">
-						<text>去盒柜</text>
+						<text>去发货</text>
 					</view>
 
 					<view class="ft-btn common_bg" :style="{
diff --git a/pages/guize/guize.vue b/pages/guize/guize.vue
index 3092133..e33dc57 100644
--- a/pages/guize/guize.vue
+++ b/pages/guize/guize.vue
@@ -117,7 +117,7 @@
 
 	.guize {
 		width: 100vw;
-		height: 100vh;
+		min-height: 100vh;
 		position: relative;
 		padding: 24rpx;
 		background-color: #FFFFFF;
diff --git a/pages/infinite/bonus_house.vue b/pages/infinite/bonus_house.vue
index 2122a74..528832f 100644
--- a/pages/infinite/bonus_house.vue
+++ b/pages/infinite/bonus_house.vue
@@ -85,10 +85,10 @@
 		</view>
 
 		<view class="btn-group row center">
-			<view class="my-coupon center" @click="$c.to({ url: '/pages/infinite/my_coupons' })">
+			<!-- <view class="my-coupon center" @click="$c.to({ url: '/pages/infinite/my_coupons' })">
 				<text>我的卡券</text>
 
-			</view>
+			</view> -->
 			<view class="reward-record center" @click="$c.to({ url: '/pages/infinite/reward_records' })">
 				<text>赏品记录</text>
 			</view>
@@ -424,7 +424,7 @@ export default {
 }
 
 .btn-group {
-	margin-top: 20rpx;
+	margin-top: 40rpx;
 }
 
 .my-coupon {
@@ -444,7 +444,6 @@ export default {
 	height: 72rpx;
 	background-color: #D8FD24;
 	border-radius: 16rpx;
-	margin-left: 38rpx;
 
 	text {
 		font-weight: 600;
diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index b5c917f..18d5e13 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -1201,14 +1201,14 @@
 				.num-box {
 					margin: 24rpx 20rpx 10rpx;
 					display: flex;
-					justify-content: center;
+					justify-content: space-between;
 					align-items: center;
 					background-color: #DFDFDF;
 					border-radius: 20rpx;
 
 					.icon {
-						width: 32rpx;
-						height: 28rpx;
+						width: 40rpx;
+						height: 37rpx;
 					}
 
 					>input {
@@ -1216,7 +1216,6 @@
 						width: 70rpx;
 						text-align: center;
 						font-size: 24rpx;
-						font-family: Source Han Sans CN;
 						font-weight: 400;
 						color: #8A8A8A;
 					}
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 43f5642..7f2ceaa 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -132,6 +132,7 @@
 			</view>
 		</view>
 
+		<!-- 确认订单弹窗 -->
 		<order-confirm-popup ref="buyPop" v-if="orderData" :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')"
@@ -186,1279 +187,1035 @@
 </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
-	},
-	data() {
-		return {
-			optData: "",
-			boxNum: "",
-			buyNum: 0,
+	export default {
+		components: {
+			OrderConfirmPopup,
+			DetailListItem
+		},
+		data() {
+			return {
+				optData: "",
+				boxNum: "",
+				buyNum: 0,
 
-			// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-			downOption: {
-				auto: false,
-			},
-			// 上拉加载的配置(可选, 绝大部分情况无需配置)
-			upOption: {
-				auto: true,
-				page: {
-					size: 15, // 每页数据的数量,默认10
+				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
+				downOption: {
+					auto: false,
 				},
-			},
-			tabList: {
-				1: {
-					title: "商品预览",
+				// 上拉加载的配置(可选, 绝大部分情况无需配置)
+				upOption: {
+					auto: true,
+					page: {
+						size: 15, // 每页数据的数量,默认10
+					},
 				},
-				2: {
-					title: "中赏记录",
+				tabList: {
+					1: {
+						title: "商品预览",
+					},
+					2: {
+						title: "中赏记录",
+					},
 				},
-			},
-			tabCur: 1,
-			subTab: [],
-			subTabCur: 0,
-			payType: {
-				1: {
-					title: "吧唧币",
-					icon: "/static/img/pay_type1.png",
+				tabCur: 1,
+				subTab: [],
+				subTabCur: 0,
+				payType: {
+					1: {
+						title: "吧唧币",
+						icon: "/static/img/pay_type1.png",
+					},
+					2: {
+						title: "星钻",
+						icon: "/static/img/pay_type2.png",
+					},
 				},
-				2: {
-					title: "星钻",
-					icon: "/static/img/pay_type2.png",
-				},
-			},
-			payTypeCur: 1,
-			isAgree: true,
-			pageData: "",
-			couponData: "",
-			orderData: "",
-			prizeData: "",
-			secTimer: null,
-			secNum: 0,
-			aniSrc: "",
-			aniShow: false,
+				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() {
+				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;
+		},
+		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,
-				}),
-		};
-	},
+			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;
+		onLoad(options) {
+			console.log(options);
+			this.optData = options;
 
-		this.tabChange(this.tabCur);
+			this.tabChange(this.tabCur);
 
-		uni.$on("chooseCoupon", (data) => {
-			// console.log('data', data)
+			uni.$on("chooseCoupon", (data) => {
+				// console.log('data', data)
 
-			this.couponData = data;
-			this.confirmSubmit([0, this.buyNum]);
-		});
+				this.couponData = data;
+				this.confirmSubmit([0, this.buyNum]);
+			});
 
-		// uni.getImageInfo({
-		//   src: this.$img('/static/img/animation.png'),
-		//   success: ({ path }) => {
-		//     this.aniSrc = path
-		//   }
-		// })
+			// 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('预览弹窗打开成功');
+			this.$c.getRule(10).then((res) => {
+				if (res.status == 1) {
+					this.sendRuleData = res.data;
+				}
 			});
 		},
 
-		resetSec() {
-			clearInterval(this.secTimer);
-			this.secTimer = null;
-			this.secNum = 0;
+		onReady() {
+			// this.open('dPop')
+			// this.open('buyPop')
+			// this.open('buyNotice')
+			// this.open('resPop')
 		},
 
-		runSec(time) {
-			const nowTime = Math.floor(Date.now() / 1000);
+		onUnload() {
+			uni.$off("chooseCoupon");
+		},
 
-			if (time < nowTime) {
-				this.resetSec();
-				return;
-			}
+		methods: {
+			previewDetail(item) {
+				console.log(item);
+				// 使用全局方法调用预览弹窗
+				this.$preview({
+					productType: this.optData.type_text,
+					dataItem: item,
+					goods: this.pageData.goods
+				}).then(() => {
+					console.log('预览弹窗打开成功');
+				});
+			},
 
-			this.secTimer && clearInterval(this.secTimer);
+			resetSec() {
+				clearInterval(this.secTimer);
+				this.secTimer = null;
+				this.secNum = 0;
+			},
 
-			this.secNum = time - nowTime;
-			this.secTimer = setInterval(() => {
-				if (this.secNum <= 0) {
+			runSec(time) {
+				const nowTime = Math.floor(Date.now() / 1000);
+
+				if (time < nowTime) {
 					this.resetSec();
-
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					});
-					setTimeout(() => {
-						// uni.hideLoading()
-						this.doRefresh();
-					}, 1000);
 					return;
 				}
 
-				this.secNum -= 1;
-			}, 1000);
-		},
+				this.secTimer && clearInterval(this.secTimer);
 
-		toCoupon() {
-			this.$c.to({
-				url: "/pages/user/coupon",
-				query: {
-					type: 2,
-					total_price: this.orderData.order_total,
-				},
-			});
-		},
+				this.secNum = time - nowTime;
+				this.secTimer = setInterval(() => {
+					if (this.secNum <= 0) {
+						this.resetSec();
 
-		getPrize(order_num) {
-			if (!order_num) {
-				return;
-			}
+						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)
+							}
+						},
+					});
+				}, 500);
+			},
+
+			changePay(e) {
+				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 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 = "";
+				}
 
-			setTimeout(() => {
 				this.req({
-					url: "prizeorderlog",
+					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.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.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: {
-						order_num,
+						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.prizeData = res.data;
+							this.optData.goods_num = Number(res.data.goods.num);
 
-							if (res.data.data.length <= 0) {
-								this.getPrize(order_num);
-								return;
+							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.aniShow = true
-							// setTimeout(() => {
-							//   this.aniShow = false
-							this.bgmCtx.openBgm.stop();
-							this.bgmCtx.openBgm.play();
-							this.open("resPop");
-							// }, 1300)
+							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);
 						}
 					},
 				});
-			}, 500);
-		},
-
-		changePay(e) {
-			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;
+			},
+			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 (!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 (type == 0) {
+					return false;
+				}
+				if (type == 1) {
+					return true;
+				}
 
-			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.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.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) {
+				let yuxia = xuangou.quanju_xiangou - xuangou.user_xiangou_count;
+				console.log(yuxia);
+				if (yuxia >= type) {
+					return true;
+				}
 				return false;
-			}
-			if (type == 1) {
-				return true;
-			}
+			},
+			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);
+					}
+				}
 
-			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组件引用');
+				if (e == "resPop") {
+					if (this.prizeData && this.prizeData["user_coupon"] != null) {
+						this.$refs["couponPop"].open(this.prizeData["user_coupon"]);
+					}
 				}
-			} 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();
+			open(e) {
+				console.log('打开弹窗:', e, this.$refs[e]);
+				if (e === 'buyPop') {
+					if (this.$refs[e]) {
+						this.$refs[e].open();
+					} else {
+						console.error('找不到buyPop组件引用');
+					}
 				} else {
-					console.error('找不到buyPop组件引用');
+					if (this.$refs[e]) {
+						this.$refs[e].open();
+					} else {
+						console.error('找不到组件引用:', e);
+					}
 				}
-			} 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;
-	}
-}
-
-.content {
-	padding: 0 0 300rpx;
-	background-color: #ffffff;
-
-	.header {
-		width: 750rpx;
-		height: 722rpx;
-		margin-top: 130rpx;
-		background-color: #d8d8d8;
-
-		&-wuzhe {
-			width: 160rpx;
-			height: 60rpx;
-			position: absolute;
-			top: 300rpx;
-			left: 0;
-		}
-
-		&-goodsTitel {
-			position: absolute;
-			font-weight: 400;
-			font-size: 24rpx;
+		>view {
+			font-weight: 600;
+			font-size: 50rpx;
 			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;
+	.content {
+		padding: 0 0 300rpx;
+		background-color: #ffffff;
 
-			>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;
-			}
-		}
-
-		&-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;
-			}
-
-			>text:nth-child(2) {
-				font-weight: 700;
-				font-size: 24rpx;
-				color: #333333;
-			}
-		}
-
-		&-footer {
+		.header {
 			width: 750rpx;
-			position: absolute;
-			left: 0;
-			bottom: 0;
+			height: 722rpx;
+			margin-top: 130rpx;
+			background-color: #d8d8d8;
 
-			&-one {
-				width: 186rpx;
-				height: 106rpx;
-				display: flex;
+			&-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;
+				}
+
+				>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;
+				}
+			}
+
+			&-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;
+				}
+
+				>text:nth-child(2) {
+					font-weight: 700;
+					font-size: 24rpx;
+					color: #333333;
+				}
+			}
+
+			&-footer {
+				width: 750rpx;
 				position: absolute;
 				left: 0;
 				bottom: 0;
-				z-index: 1;
 
-				>image {
-					width: 100%;
-					height: 100%;
-				}
-			}
+				&-one {
+					width: 186rpx;
+					height: 106rpx;
+					display: flex;
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					z-index: 1;
 
-			&-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;
+					>image {
+						width: 100%;
+						height: 100%;
 					}
 				}
 
-				>view:nth-child(2) {
-					padding: 14rpx 30rpx 0;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #999999;
+				&-two {
+					width: 224rpx;
+					height: 119rpx;
+					display: flex;
+					position: absolute;
+					left: 160rpx;
+					bottom: 0;
+					z-index: 1;
 
-					>view {
-						>text {
-							font-weight: 400;
-							color: #333333;
-						}
+					>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%;
 					}
 				}
 			}
 		}
 
-		.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%;
-				// }
-			}
-		}
-	}
-
-	.buy-pop {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		background: #f7f7f7;
-		padding-bottom: 30rpx;
-		border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-		&::after {
-			content: "";
-			position: absolute;
-			top: -62rpx;
-			left: 0;
-			width: 750rpx;
-			height: 62rpx;
-			// background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
-		}
-
-		.buy-pop-hd {
-			padding: 20rpx 0;
-			padding-left: 10rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			font-size: 40rpx;
-			font-weight: 500;
-			color: #333333;
-
-			.close {
-				width: 60rpx;
-				height: 60rpx;
-			}
-		}
-
-		.card-row {
-			padding: 16rpx 0;
-			display: flex;
-			height: 82rpx;
-			justify-content: space-between;
-			align-items: center;
-			margin-top: 24rpx;
-			border-radius: 16rpx;
-			background-color: #fff;
-
-			.title {
-				font-size: 20rpx;
-				font-weight: 400;
-				margin-left: 24rpx;
-				color: #333333;
-			}
-
-			.row-r {
-				display: flex;
-				align-items: center;
-
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #999999;
-
-				.icon {
-					width: 10rpx;
-					height: 17rpx;
-					color: #999999;
-					margin-left: 10rpx;
-					margin-right: 24rpx;
-				}
-			}
-		}
-
-		.buy-card {
-			border-radius: 20rpx;
-			padding: 30rpx 30rpx 10rpx;
+		.spylView {
 			background: #ffffff;
 
-			.buy-info {
-				display: flex;
+			&-head {
+				box-sizing: border-box;
+				padding: 24rpx 30rpx;
+				width: 750rpx;
 
-				.pic {
-					width: 190rpx;
-					height: 190rpx;
-					border-radius: 10rpx;
-				}
-
-				.info-r {
-					width: calc(100% - 190rpx);
-					box-sizing: border-box;
-					display: flex;
-					flex-flow: column nowrap;
-					justify-content: space-between;
-					padding: 10rpx 0 10rpx 30rpx;
-
-					.title {
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #333333;
+				>view:nth-child(2n + 1) {
+					>view:nth-child(1) {
+						width: 74rpx;
+						height: 56rpx;
+						background: #f5f5f5;
+						border-radius: 12rpx;
+						// border: 2rpx solid #000000;
 					}
 
-					.hang1 {}
-
-					.type {
-						font-size: 20rpx;
-						font-weight: 400;
-						color: #999999;
-					}
-
-					.price-num {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.price {
-							font-weight: 500;
-							font-size: 16rpx;
-							color: #333333;
-
-							text {
-								font-size: 28rpx;
-							}
-						}
-
-						.num {
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #999999;
-						}
-					}
-				}
-			}
-
-			.line {
-				height: 1px;
-				background: #222222;
-				margin: 30rpx 0 10rpx;
-			}
-
-			.card-row {
-				padding: 16rpx 0;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				.title {
-					font-size: 28rpx;
-					font-weight: 400;
-					color: #ffffff;
-				}
-
-				.row-r {
-					display: flex;
-					align-items: center;
-
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #ffffff;
-
-					.icon {
-						width: 32rpx;
-						height: 32rpx;
-					}
-				}
-			}
-		}
-
-		.pay-title {
-			margin-top: 30rpx;
-			font-size: 32rpx;
-			font-weight: 400;
-			color: #ffffff;
-		}
-
-		.pay-type {
-			padding: 30rpx 24rpx;
-			border-radius: 20rpx;
-			margin-top: 20rpx;
-			display: flex;
-			align-items: center;
-			background: #ffffff;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-			}
-
-			.title {
-				flex: 1;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-
-		.agree {
-			display: flex;
-			margin-top: 30rpx;
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #999999;
-			line-height: 32rpx;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.rule {
-			padding: 20rpx;
-			border-radius: 20rpx;
-			box-sizing: border-box;
-			margin: 20rpx 0 0;
-			height: 160rpx;
-			background: #f9f8e1;
-			border-radius: 20rpx;
-
-			.rule-inner {
-				max-height: 120rpx;
-				font-size: 20rpx;
-				font-weight: 400;
-				color: #333333;
-			}
-		}
-
-		.pay-btn {
-			margin: 30rpx auto 0;
-			width: 686rpx;
-			height: 84rpx;
-			background: url($imgurl + "common/payBtn.png") no-repeat 0 0 / 100% 100%;
-			display: flex;
-			margin-bottom: 90rpx;
-			align-items: center;
-			justify-content: center;
-			font-weight: 500;
-			color: #cdef27;
-
-			>text:nth-child(1) {
-				font-size: 28rpx;
-			}
-
-			>text:nth-child(2) {
-				font-size: 36rpx;
-			}
-		}
-	}
-
-	.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: #333333;
-							background-color: rgba(255, 255, 255, 0.5);
-							border-radius: 18rpx;
-						}
-					}
-
-					.title {
-						padding: 22rpx 10rpx 0;
-						font-weight: 400;
-						font-size: 16rpx;
-						color: #333333;
-					}
-
-					.exchange {
-						padding: 10rpx 10rpx;
+					>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-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 {
+		.res-pop {
 			width: 100%;
-			height: 1624rpx;
+			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);
+			}
 		}
 	}
-
-
-	.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 c041728..43b5e10 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -269,7 +269,7 @@
 						<view class="ft-btn common_bg justify-center center" :style="{
 							backgroundImage: `url(${$img1('common/quhegui.png')})`
 						}" @click="toBag">
-							<text>去盒柜</text>
+							<text>去发货</text>
 						</view>
 
 						<view class="ft-btn common_bg justify-center center" :style="{
@@ -1095,9 +1095,9 @@ export default {
 
 		>image:nth-child(2) {
 			width: 122rpx;
-			height: 106rpx;
+			height: 120rpx;
 			position: absolute;
-			top: 0;
+			top: 5rpx;
 			left: 0;
 			z-index: 3;
 		}
@@ -1253,7 +1253,7 @@ export default {
 			height: 95rpx;
 			position: absolute;
 			right: 0;
-			top: 232rpx;
+			top: 56rpx;
 			box-sizing: border-box;
 			// background: url($imgurl+'/common/shoucang.png') no-repeat 0 0 / 100% 100%;
 
@@ -2034,8 +2034,8 @@ export default {
 				left: 50%;
 				transform: translateX(-50%);
 				width: 181rpx;
-				height: 153rpx;
-				bottom: 100rpx;
+				height: 173rpx;
+				bottom: 80rpx;
 				z-index: 2;
 			}
 		}
@@ -2463,254 +2463,6 @@ export default {
 		}
 	}
 
-	.buy-pop {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		background: #F7F7F7;
-		padding-bottom: 30rpx;
-		border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-		&::after {
-			content: '';
-			position: absolute;
-			top: -62rpx;
-			left: 0;
-			width: 750rpx;
-			height: 62rpx;
-			// background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
-		}
-
-		.buy-pop-hd {
-			padding: 40rpx 0;
-			padding-left: 10rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 40rpx;
-			font-weight: 500;
-			color: #ffffff;
-
-			.close {
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-
-		.buy-card {
-			border-radius: 20rpx;
-			padding: 30rpx;
-			background: #FFFFFF;
-
-			.buy-info {
-				display: flex;
-
-				.pic {
-					width: 190rpx;
-					height: 190rpx;
-					border-radius: 10rpx;
-				}
-
-				.info-r {
-					width: calc(100% - 190rpx);
-					box-sizing: border-box;
-					display: flex;
-					flex-flow: column nowrap;
-					justify-content: space-between;
-					padding: 10rpx 0 10rpx 30rpx;
-
-					.title {
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #333333;
-					}
-
-					.hang1 {}
-
-					.type {
-						font-size: 20rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #999999;
-					}
-
-					.price-num {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.price {
-							font-size: 16rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #333333;
-
-							text {
-								font-size: 28rpx;
-							}
-						}
-
-						.num {
-							font-size: 20rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-						}
-					}
-				}
-			}
-
-			.line {
-				height: 1px;
-				background: #222222;
-				margin: 30rpx 0 10rpx;
-			}
-
-			.yhfs {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-
-
-			.card-row {
-				.title {}
-
-				.row-r {
-					.icon {}
-				}
-			}
-		}
-
-		.card-row {
-			padding: 16rpx 0;
-			display: flex;
-			height: 82rpx;
-			justify-content: space-between;
-			align-items: center;
-			border-radius: 16rpx;
-			margin-top: 24rpx;
-			background-color: #FFFFFF;
-
-			.title {
-				>image {
-					width: 32rpx;
-					height: 32rpx;
-				}
-
-				>text {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			.row-r {
-				display: flex;
-				align-items: center;
-
-				font-size: 20rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #999999;
-
-				.icon {
-					width: 10rpx;
-					margin-right: 24rpx;
-					margin-left: 10rpx;
-					height: 17rpx;
-				}
-			}
-		}
-
-		.pay-title {
-			margin-top: 30rpx;
-			font-size: 28rpx;
-			font-weight: 400;
-			color: #ffffff;
-		}
-
-		.pay-type {
-			padding: 30rpx 24rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			margin-top: 20rpx;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-			}
-
-			.title {
-				flex: 1;
-
-				font-size: 24rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #333333;
-			}
-		}
-
-		.agree {
-			display: flex;
-			margin-top: 30rpx;
-
-			font-size: 24rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #999999;
-			line-height: 32rpx;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-
-			text {
-				color: #999999;
-			}
-		}
-
-		.rule {
-			padding: 20rpx;
-			background: #F9F8E1;
-			border-radius: 20rpx;
-			box-sizing: border-box;
-			margin: 20rpx 0 0;
-
-			.rule-inner {
-				max-height: 160rpx;
-
-				font-size: 20rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #333333;
-			}
-		}
-
-		.pay-btn {
-			margin: 30rpx auto 0;
-			width: 686rpx;
-			height: 84rpx;
-			background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-weight: 500;
-			color: #CDEF27;
-
-			>text:nth-child(1) {
-				font-size: 24rpx;
-			}
-
-			>text:nth-child(2) {
-				font-size: 24rpx;
-			}
-		}
-	}
 
 	.ani-pop {
 		width: 100vw;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 4bc5523..ac599a5 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -913,8 +913,8 @@
 			z-index: 1;
 			top: 10rpx;
 			left: 10rpx;
-			width: 68rpx;
-			// padding: 0 21rpx 0 32rpx;
+			min-width: 68rpx;
+			padding: 0 6rpx;
 			height: 32rpx;
 			justify-content: center;
 			display: flex;
@@ -1063,7 +1063,7 @@
 
 	.coupon-pop {
 		width: 604rpx;
-		height: 558rpx;
+		height: 598rpx;
 		position: relative;
 		background: url($imgurl + "index/couponBg.png") no-repeat 0 0 / 100% 100%;
 		// background: #281C50;
@@ -1084,7 +1084,7 @@
 
 		.coupon-list {
 			padding-top: 128rpx;
-			height: 360rpx;
+			height: 400rpx;
 
 			.coupon-item {
 				width: 530rpx;
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 98d2ca3..c77fc4d 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -34,14 +34,14 @@
 						拒绝
 					</view>
 
-					<button v-if="isAgree" class="bottom" type="primary" withCredentials="true" lang="zh_CN"
+					<button v-if="isAgree" class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
 						@click="getUserProfile">
-						授权登录
+						<text>授权登录</text>
 					</button>
 
-					<button v-else class="bottom" type="primary" withCredentials="true" lang="zh_CN"
+					<button v-else class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
 						@click="getUserProfile">
-						授权登录
+						<text>授权登录</text>
 					</button>
 				</view>
 
@@ -324,6 +324,7 @@
 			margin: 0;
 			width: 416rpx;
 			height: 80rpx;
+			text-align: center;
 			box-sizing: border-box;
 			border-radius: 16rpx;
 			font-size: 28rpx;