From d83f42d1e5c86fc0db6a367d42477b91d7053cab Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 23 Mar 2025 17:41:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shouye/detail.vue | 4 ----
 pages/user/index.vue    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 9e624c5..0bfe526 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -236,10 +236,6 @@
 
 				<template v-else>
 					<view class="pay-type" @click="changePay('useIntegral')">
-						<!-- <view class="icon">
-							<image :src="$img('/static/img/pay_type1.png')" lazy-load></image>
-						</view> -->
-
 						<view class="title flex align-center">
 							使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }}
 							<text
diff --git a/pages/user/index.vue b/pages/user/index.vue
index d29a106..77105c6 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -52,7 +52,7 @@
 				</view>
 
 				<view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
-					<view class="num" style="color: #333333;">{{ userinfo.score || 0 }}</view>
+					<view class="num" style="color: #333333;">{{ userinfo.money2 || 0 }}</view>
 					<view class="title">{{$config.getAppSetting('currency2_name')}}</view>
 				</view>
 

From eed6c2d980a66382f036829e37a858ad052e5db7 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 23 Mar 2025 18:17:55 +0800
Subject: [PATCH 2/6] 1

---
 .../order-confirm-popup.vue                   | 451 ++++++++++++++++++
 pages/shouye/detail.vue                       | 233 +++------
 2 files changed, 510 insertions(+), 174 deletions(-)
 create mode 100644 components/order-confirm-popup/order-confirm-popup.vue

diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue
new file mode 100644
index 0000000..f70a5b9
--- /dev/null
+++ b/components/order-confirm-popup/order-confirm-popup.vue
@@ -0,0 +1,451 @@
+<template>
+	<uni-popup ref="popup" type="bottom">
+		<view class="buy-pop relative">
+			<view class="buy-pop-hd">
+				<view class="" style="width: 60rpx"></view>
+				<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>
+			</view>
+
+			<view class="buy-card">
+				<view class="buy-info">
+					<view class="pic flex">
+						<image class="img100" :src="orderData.goods.imgurl_detail"></image>
+					</view>
+
+					<view class="info-r">
+						<view class="title hang1">
+							{{ orderData.goods.title }}
+						</view>
+
+						<view class="type">类型:明信片</view>
+
+						<template v-if="orderData.goods.is_shou_zhe == 1 && orderData.goods.shou_zhe_price * 1 > 0">
+							<view class="price-num">
+								<view class="price">
+									<template v-if="pageData.goods.type != 5">¥</template>
+									<text>{{ orderData.goods.shou_zhe_price }}</text>
+									<template v-if="pageData.goods.type == 5">积分</template>
+									(首抽5折)
+								</view>
+
+								<view class="num">×{{ 1 }}</view>
+							</view>
+
+							<view v-if="orderData.goods.prize_num > 1" class="price-num">
+								<view class="price">
+									<template v-if="pageData.goods.type != 5">¥</template>
+									<text>{{ orderData.goods.price }}</text>
+									<template v-if="pageData.goods.type == 5">积分</template>
+								</view>
+
+								<view class="num">
+									×{{ orderData.goods.prize_num * 1 - 1 }}
+								</view>
+							</view>
+						</template>
+
+						<view v-else class="price-num">
+							<view class="price">
+								<template v-if="pageData.goods.type != 5">¥</template>
+								<text>{{ orderData.goods.price }}</text>
+								<template v-if="pageData.goods.type == 5">积分</template>
+							</view>
+
+							<view class="num">×{{ orderData.goods.prize_num }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<template v-if="pageData.goods.type != 5">
+				<view class="card-row" @click="$emit('to-coupon')">
+					<view class="title">优惠券</view>
+
+					<view class="row-r">
+						{{ couponData && orderData.coupon_price > 0 ? `-${couponData.price}` : "未选择" }}
+
+						<view class="icon">
+							<image :src="$img1('common/right1.png')" lazy-load></image>
+						</view>
+					</view>
+				</view>
+			</template>
+
+			<view v-if="pageData.goods.type == 5" class="pay-type">
+				<view class="title">
+					使用积分抵扣
+					{{ orderData.use_score }} <text style="color: #676767; font-size: 16rpx;">
+						(剩余:{{ orderData.score }})</text>
+				</view>
+
+				<view class="icon">
+					<image v-if="true" :src="$img1('common/check_act.png')" lazy-load></image>
+					<image v-else :src="$img1('common/check.png')" lazy-load></image>
+				</view>
+			</view>
+			
+			<view v-if="pageData.goods.type == 6 && !getBtnXianShi()"> </view>
+
+			<template v-else>
+				<view class="pay-type" @click="changePayMethod('useIntegral')">
+					<view class="title flex align-center">
+						使用{{currencyName}}抵扣¥{{ orderData.use_integral_money }}
+						<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{orderData.integral}}个)</text>
+					</view>
+
+					<view class="icon">
+						<image v-if="useIntegral" :src="$img1('common/check_act.png')" lazy-load></image>
+						<image v-else :src="$img1('common/check.png')" lazy-load></image>
+					</view>
+				</view>
+
+				<view class="pay-type" @click="changePayMethod('useMoney')">
+					<view class="title flex align-center">
+						使用{{balanceName}}抵扣¥{{ orderData.use_money }}
+						<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
+							(剩余:{{ orderData.money }})</text>
+					</view>
+
+					<view class="icon">
+						<image v-if="useMoney" :src="$img1('common/check_act.png')" lazy-load></image>
+						<image v-else :src="$img1('common/check.png')" lazy-load></image>
+					</view>
+				</view>
+			</template>
+			
+			<view class="rule">
+				<scroll-view class="rule-inner" scroll-y>
+					<rich-text :nodes="sendRuleData"></rich-text>
+				</scroll-view>
+			</view>
+			
+			<view class="agree" @click="$emit('toggle-agree')">
+				<view class="icon">
+					<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
+					<image v-else :src="$img1('common/check.png')" lazy-load></image>
+				</view>
+
+				我已满18岁,阅读并同意
+
+				<text @click.stop="$c.to({ url: '/pages/guize/guize?type=4' })">
+					《用户协议》
+				</text>
+
+				<text @click.stop="$c.to({ url: '/pages/guize/guize?type=5' })">
+					《隐私政策》
+				</text>
+			</view>
+
+			<view class="pay-btn" @click="$emit('confirm')">
+				<text>确认支付</text>
+				<text>{{
+					pageData.goods.type == 5 ? ` ${orderData.use_score}积分` : ` ¥${orderData.price}`
+				}}</text>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+export default {
+	name: "OrderConfirmPopup",
+	props: {
+		// 订单数据
+		orderData: {
+			type: Object,
+			required: true
+		},
+		// 页面数据
+		pageData: {
+			type: Object,
+			required: true
+		},
+		// 是否使用余额
+		useMoney: {
+			type: Boolean,
+			default: true
+		},
+		// 是否使用积分
+		useIntegral: {
+			type: Boolean,
+			default: true
+		},
+		// 优惠券数据
+		couponData: {
+			type: [Object, String],
+			default: () => null
+		},
+		// 是否同意协议
+		isAgree: {
+			type: Boolean,
+			default: true
+		},
+		// 规则数据
+		sendRuleData: {
+			type: String,
+			default: ''
+		},
+		// 购买数量
+		buyNum: {
+			type: Number,
+			default: 1
+		}
+	},
+	data() {
+		return {
+			currencyName: '',
+			balanceName: ''
+		}
+	},
+	created() {
+		// 获取货币名称和余额名称
+		this.currencyName = this.$config.getAppSetting('currency1_name') || '积分';
+		this.balanceName = this.$config.getAppSetting('balance_name') || '余额';
+	},
+	methods: {
+		/**
+		 * 打开弹窗
+		 */
+		open() {
+			this.$refs.popup.open();
+		},
+		
+		/**
+		 * 关闭弹窗
+		 */
+		close() {
+			this.$refs.popup.close();
+		},
+		
+		/**
+		 * 切换支付方式
+		 * @param {String} method 支付方式
+		 */
+		changePayMethod(method) {
+			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>
+
+<style lang="scss">
+.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;
+	}
+
+	.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-family: Source Han Sans CN;
+			font-weight: 400;
+			margin-left: 24rpx;
+			color: #333333;
+		}
+
+		.row-r {
+			display: flex;
+			align-items: center;
+			font-size: 24rpx;
+			font-family: Source Han Sans CN;
+			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;
+		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-weight: 400;
+					color: #333333;
+				}
+
+				.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-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #999999;
+					}
+				}
+			}
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.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;
+		}
+	}
+
+	.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;
+		}
+	}
+}
+</style> 
\ No newline at end of file
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 0bfe526..e5a96e4 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -130,176 +130,23 @@
 			</view>
 		</view>
 
-		<uni-popup ref="buyPop" type="bottom">
-			<view v-if="orderData" class="buy-pop relative">
-				<view class="buy-pop-hd">
-					<view class="" style="width: 60rpx"></view>
-					<text class="" style="font-size: 28rpx">确认订单</text>
-					<view class="close icon" @click="close('buyPop')">
-						<image :src="$img('/static/img/close2.png')" style="width: 24rpx; height: 24rpx" lazy-load>
-						</image>
-					</view>
-				</view>
-
-				<view class="buy-card">
-					<view class="buy-info">
-						<view class="pic flex">
-							<image class="img100" :src="orderData.goods.imgurl_detail"></image>
-						</view>
-
-						<view class="info-r">
-							<view class="title hang1">
-								{{ orderData.goods.title }}
-							</view>
-
-							<view class="type">类型:明信片</view>
-
-							<template v-if="
-                orderData.goods.is_shou_zhe == 1 &&
-                orderData.goods.shou_zhe_price * 1 > 0
-              ">
-								<view class="price-num">
-									<view class="price">
-										<template v-if="pageData.goods.type != 5">¥</template>
-										<text>{{ orderData.goods.shou_zhe_price }}</text>
-										<template v-if="pageData.goods.type == 5">积分</template>
-										(首抽5折)
-									</view>
-
-									<view class="num">×{{ 1 }}</view>
-								</view>
-
-								<view v-if="orderData.goods.prize_num > 1" class="price-num">
-									<view class="price">
-										<template v-if="pageData.goods.type != 5">¥</template>
-										<text>{{ orderData.goods.price }}</text>
-										<template v-if="pageData.goods.type == 5">积分</template>
-									</view>
-
-									<view class="num">
-										×{{ orderData.goods.prize_num * 1 - 1 }}
-									</view>
-								</view>
-							</template>
-
-							<view v-else class="price-num">
-								<view class="price">
-									<template v-if="pageData.goods.type != 5">¥</template>
-									<text>{{ orderData.goods.price }}</text>
-									<template v-if="pageData.goods.type == 5">积分</template>
-								</view>
-
-								<view class="num">×{{ orderData.goods.prize_num }}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-
-				<template v-if="pageData.goods.type != 5">
-					<view class="card-row" @click="toCoupon">
-						<view class="title">优惠券</view>
-
-						<view class="row-r">
-							{{
-                couponData && orderData.coupon_price > 0
-                  ? `-${couponData.price}`
-                  : "未选择"
-              }}
-
-							<view class="icon">
-								<image :src="$img1('common/right1.png')" lazy-load></image>
-							</view>
-						</view>
-					</view>
-
-				</template>
-
-				<!-- <view v-if="!(pageData.goods.type == 6 && !getBtnXianShi(0))" class="pay-title ziti">请选择抵扣方式</view> -->
-
-				<view v-if="pageData.goods.type == 5" class="pay-type">
-					<!-- <view class="icon">
-						<image :src="$img('/static/img/pay_type3.png')" lazy-load></image>
-					</view> -->
-					<view class="title">
-						使用积分抵扣
-						{{ orderData.use_score }} <text style="color: #676767; font-size: 16rpx;">
-							(剩余:{{ orderData.score }})</text>
-					</view>
-
-					<view class="icon">
-						<image v-if="true" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-				</view>
-				<view v-if="pageData.goods.type == 6 && !getBtnXianShi(0)"> </view>
-
-				<template v-else>
-					<view class="pay-type" @click="changePay('useIntegral')">
-						<view class="title flex align-center">
-							使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }}
-							<text
-								style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{orderData.integral}}个)</text>
-						</view>
-
-						<view class="icon">
-							<image v-if="useIntegral" :src="$img1('common/check_act.png')" lazy-load></image>
-
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view>
-
-					<view class="pay-type" @click="changePay('useMoney')">
-						<!-- <view class="icon">
-							<image :src="$img('/static/img/pay_type2.png')" lazy-load></image>
-						</view> -->
-
-						<view class="title flex align-center">
-							使用{{$config.getAppSetting('balance_name')}}抵扣¥{{ orderData.use_money }}
-							<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
-								(剩余:{{ orderData.money }})</text>
-						</view>
-
-						<view class="icon">
-							<image v-if="useMoney" :src="$img1('common/check_act.png')" lazy-load></image>
-
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view>
-				</template>
-				<view class="rule">
-					<scroll-view class="rule-inner" scroll-y>
-						<div v-html="sendRuleData"></div>
-					</scroll-view>
-				</view>
-				<view class="agree" @click="isAgree = !isAgree">
-					<view class="icon">
-						<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-
-					我已满18岁,阅读并同意
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=4' })">
-						《用户协议》
-					</text>
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=5' })">
-						《隐私政策》
-					</text>
-				</view>
-
-				<view class="pay-btn" @click="$c.noDouble1(confirmSubmit, [1, buyNum], choujiangloading)">
-					<text>确认支付</text>
-					<text>{{
-            pageData.goods.type == 5
-              ? ` ${orderData.use_score}积分`
-              : ` ¥${orderData.price}`
-          }}</text>
-				</view>
-			</view>
-		</uni-popup>
+		<order-confirm-popup
+			ref="buyPop"
+			v-if="orderData" 
+			:order-data="orderData"
+			:page-data="pageData"
+			:use-money="useMoney"
+			: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"
 			@confirm="$c.noDouble(confirmSubmit, [1, buyNum, true], choujiangloading)"></buy-notice>
@@ -350,7 +197,12 @@
 </template>
 
 <script>
+	import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
+	
 	export default {
+		components: {
+			OrderConfirmPopup
+		},
 		data() {
 			return {
 				optData: "",
@@ -612,7 +464,14 @@
 
 								this.orderData = res.data;
 
-								this.open("buyPop");
+								// 使用this.$nextTick确保视图已更新，组件已挂载
+								this.$nextTick(() => {
+									if (this.$refs.buyPop) {
+										this.$refs.buyPop.open();
+									} else {
+										console.error('buyPop组件引用不存在');
+									}
+								});
 							}
 
 							if (type == 1) {
@@ -811,17 +670,43 @@
 				return false;
 			},
 			close(e) {
-				this.$refs[e].close();
+				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["user_coupon"] != null) {
+					if (this.prizeData && this.prizeData["user_coupon"] != null) {
 						this.$refs["couponPop"].open(this.prizeData["user_coupon"]);
 					}
 				}
 			},
 
 			open(e) {
-				this.$refs[e].open();
+				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);
+					}
+				}
 			},
 		},
 	};

From c3fba3bfd2b8c5818bbde0e3b04fcdfe0e832dd3 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 24 Mar 2025 03:32:00 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js                              |   15 +-
 .../order-confirm-popup.vue                   |  106 +-
 .../order-confirm-popup.vue.bak               |  Bin 0 -> 19630 bytes
 pages/mall/index.vue                          |   12 -
 pages/shouye/detail.vue                       | 2494 ++++++++---------
 5 files changed, 1337 insertions(+), 1290 deletions(-)
 create mode 100644 components/order-confirm-popup/order-confirm-popup.vue.bak

diff --git a/common/config.js b/common/config.js
index 92f77cf..6f3b749 100644
--- a/common/config.js
+++ b/common/config.js
@@ -96,7 +96,8 @@ class ConfigManager {
   static getGoodType() {
     let goodType = this.get('good_type');
     if (goodType != null) {
-      return goodType.map(item => {
+      // goodType数组过滤，只保留is_show=1的项目
+      return goodType.filter(item => item.is_show === 1).map(item => {
         return {
           id: item.value,
           title: item.name
@@ -106,6 +107,18 @@ class ConfigManager {
     return [];
   }
 
+  /**
+   * 获取指定盒子类型
+   * @param {Number} type 盒子类型
+   * @returns {Object} 盒子类型对象
+   */
+  static getGoodTypeFind(type) {
+    let goodType = this.get('good_type');
+    if (goodType != null) {
+      return goodType.find(item => item.value == type);
+    }
+  }
+
   /**
    * 刷新配置数据
    * @returns {Promise} 返回刷新完成的Promise
diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue
index f70a5b9..93a83fa 100644
--- a/components/order-confirm-popup/order-confirm-popup.vue
+++ b/components/order-confirm-popup/order-confirm-popup.vue
@@ -51,7 +51,7 @@
 							<view class="price">
 								<template v-if="pageData.goods.type != 5">¥</template>
 								<text>{{ orderData.goods.price }}</text>
-								<template v-if="pageData.goods.type == 5">积分</template>
+								<template v-if="pageData.goods.type == 5">{{currencyName2}}</template>
 							</view>
 
 							<view class="num">×{{ orderData.goods.prize_num }}</view>
@@ -73,27 +73,13 @@
 					</view>
 				</view>
 			</template>
-
-			<view v-if="pageData.goods.type == 5" class="pay-type">
-				<view class="title">
-					使用积分抵扣
-					{{ orderData.use_score }} <text style="color: #676767; font-size: 16rpx;">
-						(剩余:{{ orderData.score }})</text>
-				</view>
-
-				<view class="icon">
-					<image v-if="true" :src="$img1('common/check_act.png')" lazy-load></image>
-					<image v-else :src="$img1('common/check.png')" lazy-load></image>
-				</view>
-			</view>
-			
 			<view v-if="pageData.goods.type == 6 && !getBtnXianShi()"> </view>
-
 			<template v-else>
-				<view class="pay-type" @click="changePayMethod('useIntegral')">
+				<view class="pay-type" v-if="pay_currency" @click="changePayMethod('useIntegral')">
 					<view class="title flex align-center">
-						使用{{currencyName}}抵扣¥{{ orderData.use_integral_money }}
-						<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{orderData.integral}}个)</text>
+						使用{{ currencyName }}{{deduction_name}}¥{{ orderData.use_integral_money }}
+						<text
+							style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.integral }})</text>
 					</view>
 
 					<view class="icon">
@@ -102,9 +88,9 @@
 					</view>
 				</view>
 
-				<view class="pay-type" @click="changePayMethod('useMoney')">
+				<view class="pay-type" v-if="pay_balance" @click="changePayMethod('useMoney')">
 					<view class="title flex align-center">
-						使用{{balanceName}}抵扣¥{{ orderData.use_money }}
+						使用{{ balanceName }}{{deduction_name}}¥{{ orderData.use_money }}
 						<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
 							(剩余:{{ orderData.money }})</text>
 					</view>
@@ -114,14 +100,27 @@
 						<image v-else :src="$img1('common/check.png')" lazy-load></image>
 					</view>
 				</view>
+
+				<view class="pay-type" v-if="pay_currency2" @click="changePayMethod('useMoney2')">
+					<view class="title flex align-center">
+						使用{{ currencyName2 }}{{deduction_name}}¥{{ (orderData.use_score/100).toFixed(2) }}	<text style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">
+							(剩余:{{ orderData.score }})</text>
+					</view>
+					<view class="icon">
+						<image v-if="useMoney2" :src="$img1('common/check_act.png')" lazy-load></image>
+						<image v-else :src="$img1('common/check.png')" lazy-load></image>
+					</view>
+
+				</view>
+
 			</template>
-			
+
 			<view class="rule">
 				<scroll-view class="rule-inner" scroll-y>
 					<rich-text :nodes="sendRuleData"></rich-text>
 				</scroll-view>
 			</view>
-			
+
 			<view class="agree" @click="$emit('toggle-agree')">
 				<view class="icon">
 					<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
@@ -142,7 +141,7 @@
 			<view class="pay-btn" @click="$emit('confirm')">
 				<text>确认支付</text>
 				<text>{{
-					pageData.goods.type == 5 ? ` ${orderData.use_score}积分` : ` ¥${orderData.price}`
+					pageData.goods.type == 5 ? ` ${(orderData.use_score/100).toFixed(2)}积分` : ` ¥${orderData.price}`
 				}}</text>
 			</view>
 		</view>
@@ -168,6 +167,11 @@ export default {
 			type: Boolean,
 			default: true
 		},
+		//是否使用余额2
+		useMoney2: {
+			type: Boolean,
+			default: true
+		},
 		// 是否使用积分
 		useIntegral: {
 			type: Boolean,
@@ -195,39 +199,81 @@ export default {
 		}
 	},
 	data() {
+		//pageData.goods.type
 		return {
 			currencyName: '',
-			balanceName: ''
+			currencyName2:'',
+			balanceName: '',
+			pay_balance: 1,
+			pay_coupon: 1,
+			pay_currency: 1,
+			pay_currency2: 1,
+			pay_wechat: 1,
+			is_deduction: 1,
+			deduction_name:''
 		}
 	},
 	created() {
 		// 获取货币名称和余额名称
-		this.currencyName = this.$config.getAppSetting('currency1_name') || '积分';
+		this.currencyName = this.$config.getAppSetting('currency1_name') || '货币';
+		this.currencyName2 = this.$config.getAppSetting('currency2_name') || '积分';
 		this.balanceName = this.$config.getAppSetting('balance_name') || '余额';
+		let goodType = this.$config.getGoodTypeFind(this.pageData.goods.type);
+		//是否显示余额支付
+		this.pay_balance = goodType.pay_balance;
+		//是否显示优惠卷
+		this.pay_coupon = goodType.pay_coupon;
+		//是否显示货币支付
+		this.pay_currency = goodType.pay_currency;
+		//是否显示货币2支付
+		this.pay_currency2 = goodType.pay_currency2;
+		//是否显示微信支付
+		this.pay_wechat = goodType.pay_wechat;
+		//抵扣还是支付
+		this.is_deduction=goodType.is_deduction;
+		if(this.is_deduction==1){
+			this.deduction_name='抵扣';
+		}else{
+			this.deduction_name='支付';
+		}
+		
 	},
 	methods: {
+
 		/**
 		 * 打开弹窗
 		 */
 		open() {
 			this.$refs.popup.open();
 		},
-		
+
 		/**
 		 * 关闭弹窗
 		 */
 		close() {
 			this.$refs.popup.close();
 		},
-		
+
 		/**
 		 * 切换支付方式
 		 * @param {String} method 支付方式
 		 */
 		changePayMethod(method) {
+			if(this.is_deduction==0){
+				// 如果是支付模式，检查可用的支付方式数量
+				let availablePayMethods = 0;
+				if(this.pay_balance) availablePayMethods++;
+				if(this.pay_currency) availablePayMethods++;
+				if(this.pay_currency2) availablePayMethods++;
+				
+				// 如果只有一种支付方式可用，则不允许切换
+				if(availablePayMethods <= 1) {
+					return;
+				}
+			}
 			this.$emit('change-pay', method);
 		},
-		
+
 		/**
 		 * 检查按钮是否显示
 		 */
@@ -448,4 +494,4 @@ export default {
 		}
 	}
 }
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/components/order-confirm-popup/order-confirm-popup.vue.bak b/components/order-confirm-popup/order-confirm-popup.vue.bak
new file mode 100644
index 0000000000000000000000000000000000000000..1f7e35a78e29162d7ea725083ba4850c77f11f06
GIT binary patch
literal 19630
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
Vwr8|5v<?2ndtS1)h4Wyb`F}SNKI8xZ

literal 0
HcmV?d00001

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 3f87ac8..d07963b 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -108,19 +108,7 @@
 							<image v-else :src="$img1('common/check.png')" lazy-load></image>
 						</view>
 					</view>
-					<!-- <view class="pay-type" @click="changePay('useMoney')">
 
-						<view class="" style="width: 100%;	color: white;">
-							星钻支付¥
-							{{ orderData.goods.price }} (剩余:{{ orderData.money }})
-						</view>
-
-						<view class="icon">
-							<image v-if="useMoney" :src="$img1('common/check_act.png')" lazy-load></image>
-
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view> -->
 				</view>
 
 				<view class="rule">
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index e5a96e4..4f8f8ac 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -10,30 +10,30 @@
 			</view>
 		</view>
 		<view class="header relative" v-if="pageData && pageData.goods" :style="{
-      background:
-        'url(' + pageData.goods.imgurl_detail + ') no-repeat 0 0 / 100% 100%',
-    }">
+			background:
+				'url(' + pageData.goods.imgurl_detail + ') no-repeat 0 0 / 100% 100%',
+		}">
 			<view class="header-wuzhe flex" v-if="pageData.goods.is_shou_zhe == 1">
 				<image class="img100" :src="$img1('common/chouBanjia.png')" mode="aspectFit"></image>
 			</view>
 			<view class="header-goodsTitel">{{ pageData.goods.title }}</view>
 			<view class="header-suoxiang center" v-if="
-        pageData.goods.lock_is == 1 &&
-        pageData.lock_info.goods_lock_surplus_time > 0
-      ">
+				pageData.goods.lock_is == 1 &&
+				pageData.lock_info.goods_lock_surplus_time > 0
+			">
 				<image :src="pageData.lock_info.goods_lock_user_headimg" mode="aspectFill"></image>
 				<view class="hidden ml10">{{
-          pageData.lock_info.goods_lock_user_nickname
-        }}</view>
+					pageData.lock_info.goods_lock_user_nickname
+				}}</view>
 				<image class="ml20" :src="$img1('index/suoxiang.png')" mode="aspectFit"></image>
 				<view class="ml30">倒计时：{{ secNum }}S</view>
 			</view>
 			<view class="header-title center" :style="{
-        background:
-          'url(' +
-          $img1('common/chouTitle.png') +
-          ') no-repeat 0 0 / 100% 100%',
-      }">
+				background:
+					'url(' +
+					$img1('common/chouTitle.png') +
+					') no-repeat 0 0 / 100% 100%',
+			}">
 				<text>
 					<template></template>
 				</text>
@@ -65,12 +65,13 @@
 					</view>
 					<view class="align-center justify-between" v-if="pageData.goods">
 						<view class="align-center">第 <text>{{ pageData.goods.num }}</text> /{{
-              pageData.goods.stock
-              }}箱
+							pageData.goods.stock
+						}}箱
 						</view>
 						<view>赏品余量</view>
 						<view class="align-center">
-							<text>{{ pageData.goods.goodslist_surplus_stock }}</text>/{{ pageData.goods.goodslist_stock }}
+							<text>{{ pageData.goods.goodslist_surplus_stock }}</text>/{{ pageData.goods.goodslist_stock
+							}}
 						</view>
 					</view>
 				</view>
@@ -86,8 +87,8 @@
 					<view class="pic center relative">
 						<image class="pic-img" :src="item.imgurl" mode="aspectFit"></image>
 						<view class="type-tag center" :style="{
-              background: item.shang_info ? item.shang_info.color : '#FFFFFF',
-            }">
+							background: item.shang_info ? item.shang_info.color : '#FFFFFF',
+						}">
 							{{ item.shang_info ? item.shang_info.title : "" }}
 						</view>
 						<view class="num center bgfff">{{ item.surplus_stock }}/{{ item.stock }}</view>
@@ -130,23 +131,11 @@
 			</view>
 		</view>
 
-		<order-confirm-popup
-			ref="buyPop"
-			v-if="orderData" 
-			:order-data="orderData"
-			:page-data="pageData"
-			:use-money="useMoney"
-			: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>
+		<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')"
+			@change-pay="changePay" @toggle-agree="isAgree = !isAgree" @to-coupon="toCoupon"
+			@confirm="$c.noDouble1(confirmSubmit, [1, buyNum], choujiangloading)"></order-confirm-popup>
 
 		<buy-notice ref="buyNotice"
 			@confirm="$c.noDouble(confirmSubmit, [1, buyNum, true], choujiangloading)"></buy-notice>
@@ -172,14 +161,14 @@
 
 				<view class="res-pop-ft mt20">
 					<view class="ft-btn common_bg justify-center center" :style="{
-            backgroundImage: `url(${$img1('common/quhegui.png')})`,
-          }" @click="toBag">
+						backgroundImage: `url(${$img1('common/quhegui.png')})`,
+					}" @click="toBag">
 						<text>去发货</text>
 					</view>
 
 					<view class="ft-btn common_bg justify-center center" :style="{
-            backgroundImage: `url(${$img1('common/jixuchou.png')})`,
-          }" @click="close('resPop')">
+						backgroundImage: `url(${$img1('common/jixuchou.png')})`,
+					}" @click="close('resPop')">
 						<text>继续抽</text>
 					</view>
 				</view>
@@ -197,987 +186,1099 @@
 </template>
 
 <script>
-	import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
-	
-	export default {
-		components: {
-			OrderConfirmPopup
-		},
-		data() {
-			return {
-				optData: "",
-				boxNum: "",
-				buyNum: 0,
-				useMoney: true,
-				useIntegral: true,
-				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-				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,
+import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
 
-				logList: [],
-				sendRuleData: "",
-				choujiangloading: false,
-			};
+export default {
+	components: {
+		OrderConfirmPopup
+	},
+	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({
+				title: item.title,
+				imgUrl: item.imgurl,
+				tipTitle: item.shang_info ? item.shang_info.title : '',
+				productType: this.optData.type_text,
+				probability: item.pro
+			}).then(() => {
+				console.log('预览弹窗打开成功');
+			});
 		},
-		computed: {},
-		onShareAppMessage() {
-			if (this.$refs["couponPop"] != null) {
-				var co = this.$refs["couponPop"].getfengxiaodata();
-				if (co != null) {
-					console.log(co);
-					return co;
+
+		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)
+						}
+					},
+				});
+			}, 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;
 				}
 			}
-			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,
-					}),
+			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
 			};
-		},
 
-		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({
-					title: item.title,
-					imgUrl: item.imgurl,
-					tipTitle: item.shang_info ? item.shang_info.title : '',
-					productType: this.optData.type_text,
-					probability: item.pro
-				}).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.orderData = res.data;
 
-				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.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) || "",
-				};
-
-				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;
-							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-family: YouSheBiaoTiHei;
-			font-weight: 600;
-			font-size: 50rpx;
-			color: #ffffff;
-		}
+	>view {
+		// font-family: YouSheBiaoTiHei;
+		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;
-			background-color: #d8d8d8;
+	.header {
+		width: 750rpx;
+		height: 722rpx;
+		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;
-			}
-
-			&-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;
-
-				>text:nth-child(2n + 1) {
-					font-weight: 400;
-					font-size: 16rpx;
-					color: #333333;
-				}
-
-				>text:nth-child(2) {
-					font-weight: 700;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&-footer {
-				width: 750rpx;
-				position: absolute;
-				left: 0;
-				bottom: 0;
-
-				&-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;
+		&-title {
+			position: absolute;
+			padding: 0 20rpx;
+			width: 280rpx;
+			height: 44rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 78rpx;
 
-			&-head {
-				box-sizing: border-box;
-				padding: 24rpx 30rpx;
-				width: 750rpx;
+			>text:nth-child(2n + 1) {
+				font-weight: 400;
+				font-size: 16rpx;
+				color: #333333;
+			}
 
-				>view:nth-child(2n + 1) {
-					>view:nth-child(1) {
-						width: 74rpx;
-						height: 56rpx;
-						background: #f5f5f5;
-						border-radius: 12rpx;
-						// border: 2rpx solid #000000;
-					}
+			>text:nth-child(2) {
+				font-weight: 700;
+				font-size: 24rpx;
+				color: #333333;
+			}
+		}
 
-					>view:nth-child(2) {
-						margin-top: 8rpx;
-						font-weight: 400;
-						font-size: 20rpx;
-						color: #ffffff;
-						text-align: center;
+		&-footer {
+			width: 750rpx;
+			position: absolute;
+			left: 0;
+			bottom: 0;
+
+			&-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) {
-					width: 420rpx;
-
-					>view:nth-child(1) {
-						width: 420rpx;
-						height: 14rpx;
-						border-radius: 40rpx;
+					padding: 14rpx 30rpx 0;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
 
+					>view {
 						>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-family: YouSheBiaoTiHei;
-								font-weight: 400;
-								font-size: 36rpx;
-								color: #333333;
-							}
+							font-family: YouSheBiaoTiHei;
+							font-weight: 400;
+							font-size: 36rpx;
+							color: #333333;
 						}
 					}
 				}
 			}
+		}
 
-			.list {
-				padding: 30rpx;
-				display: grid;
-				grid-template-columns: repeat(3, 210rpx);
-				gap: 30rpx 30rpx;
+		.list {
+			padding: 30rpx;
+			display: grid;
+			grid-template-columns: repeat(3, 210rpx);
+			gap: 30rpx 30rpx;
 
-				.list-item {
+			.list-item {
+				width: 210rpx;
+				box-sizing: border-box;
+				background-color: #f8f8f8;
+				border-radius: 16rpx;
+
+				.pic {
 					width: 210rpx;
+					height: 210rpx;
 					box-sizing: border-box;
-					background-color: #f8f8f8;
-					border-radius: 16rpx;
+					position: relative;
+					background: #3b3941;
+					border-radius: 16rpx 16rpx 0rpx 0rpx;
 
-					.pic {
+					.pic-img {
 						width: 210rpx;
 						height: 210rpx;
+						// border-radius: 24rpx;
+					}
+
+					.type-tag {
+						position: absolute;
+						top: 12rpx;
+						left: 12rpx;
+						border-radius: 18rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #ffffff;
+						min-width: 78rpx;
+						height: 38rpx;
 						box-sizing: border-box;
-						position: relative;
-						background: #3b3941;
-						border-radius: 16rpx 16rpx 0rpx 0rpx;
+					}
 
-						.pic-img {
-							width: 210rpx;
-							height: 210rpx;
-							// border-radius: 24rpx;
+					.num {
+						position: absolute;
+						left: 50%;
+						padding: 0 10rpx;
+						transform: translateX(-50%);
+						bottom: 8rpx;
+						border-radius: 18rpx;
+						min-width: 66rpx;
+						height: 38rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						background-color: rgba(255, 255, 255, 0.5);
+						color: #000000;
+					}
+
+					.yu-tag {
+						position: absolute;
+						right: 10rpx;
+						top: 10rpx;
+						z-index: 1;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						font-weight: 400;
+						font-size: 32rpx;
+						color: #ff873a;
+						text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0,
+							#fff 0 -1px 0;
+					}
+
+					.shadow {
+						position: absolute;
+						z-index: 1;
+						left: 0;
+						top: 0;
+						width: 100%;
+						height: 100%;
+						background: rgba(0, 0, 0, 0.6);
+						border-radius: 24rpx;
+
+						>image {
+							width: 86rpx;
+							height: 156rpx;
 						}
+					}
+				}
 
-						.type-tag {
-							position: absolute;
-							top: 12rpx;
-							left: 12rpx;
-							border-radius: 18rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #ffffff;
-							min-width: 78rpx;
-							height: 38rpx;
-							box-sizing: border-box;
+				.title {
+					padding: 28rpx 10rpx 0;
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #333333;
+				}
+
+				.desc {
+					padding: 24rpx 10rpx 0;
+					font-size: 16rpx;
+					font-weight: 300;
+					color: #f39205;
+				}
+
+				.price {
+					padding: 24rpx 10rpx 28rpx;
+					font-weight: 400;
+					font-size: 16rpx;
+					color: #333333;
+				}
+			}
+		}
+	}
+
+	.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-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #ffffff;
+		}
+
+		.btn {
+			width: 120rpx;
+			height: 68rpx;
+			position: relative;
+
+			>view {
+				white-space: nowrap;
+				font-family: YouSheBiaoTiHei;
+				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-family: Source Han Sans CN;
+				font-weight: 400;
+				margin-left: 24rpx;
+				color: #333333;
+			}
+
+			.row-r {
+				display: flex;
+				align-items: center;
+
+				font-size: 24rpx;
+				font-family: Source Han Sans CN;
+				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;
+			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-weight: 500;
+							font-size: 16rpx;
+							color: #333333;
+
+							text {
+								font-size: 28rpx;
+							}
 						}
 
 						.num {
-							position: absolute;
-							left: 50%;
-							padding: 0 10rpx;
-							transform: translateX(-50%);
-							bottom: 8rpx;
-							border-radius: 18rpx;
-							min-width: 66rpx;
-							height: 38rpx;
+							font-size: 28rpx;
+							font-family: Source Han Sans CN;
 							font-weight: 400;
-							font-size: 20rpx;
-							background-color: rgba(255, 255, 255, 0.5);
-							color: #000000;
+							color: #999999;
 						}
-
-						.yu-tag {
-							position: absolute;
-							right: 10rpx;
-							top: 10rpx;
-							z-index: 1;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							font-weight: 400;
-							font-size: 32rpx;
-							color: #ff873a;
-							text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0,
-								#fff 0 -1px 0;
-						}
-
-						.shadow {
-							position: absolute;
-							z-index: 1;
-							left: 0;
-							top: 0;
-							width: 100%;
-							height: 100%;
-							background: rgba(0, 0, 0, 0.6);
-							border-radius: 24rpx;
-
-							>image {
-								width: 86rpx;
-								height: 156rpx;
-							}
-						}
-					}
-
-					.title {
-						padding: 28rpx 10rpx 0;
-						font-size: 20rpx;
-						font-weight: 400;
-						color: #333333;
-					}
-
-					.desc {
-						padding: 24rpx 10rpx 0;
-						font-size: 16rpx;
-						font-weight: 300;
-						color: #f39205;
-					}
-
-					.price {
-						padding: 24rpx 10rpx 28rpx;
-						font-weight: 400;
-						font-size: 16rpx;
-						color: #333333;
 					}
 				}
 			}
-		}
 
-		.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-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #ffffff;
-			}
-
-			.btn {
-				width: 120rpx;
-				height: 68rpx;
-				position: relative;
-
-				>view {
-					white-space: nowrap;
-					font-family: YouSheBiaoTiHei;
-					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;
-				}
+			.line {
+				height: 1px;
+				background: #222222;
+				margin: 30rpx 0 10rpx;
 			}
 
 			.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-size: 28rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					margin-left: 24rpx;
-					color: #333333;
+					color: #ffffff;
 				}
 
 				.row-r {
@@ -1187,327 +1288,226 @@
 					font-size: 24rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #999999;
+					color: #ffffff;
 
 					.icon {
-						width: 10rpx;
-						height: 17rpx;
-						color: #999999;
-						margin-left: 10rpx;
-						margin-right: 24rpx;
+						width: 32rpx;
+						height: 32rpx;
 					}
 				}
 			}
-
-			.buy-card {
-				border-radius: 20rpx;
-				padding: 30rpx 30rpx 10rpx;
-				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-weight: 500;
-								font-size: 16rpx;
-								color: #333333;
-
-								text {
-									font-size: 28rpx;
-								}
-							}
-
-							.num {
-								font-size: 28rpx;
-								font-family: Source Han Sans CN;
-								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-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #ffffff;
-					}
-
-					.row-r {
-						display: flex;
-						align-items: center;
-
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						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;
-							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;
-				}
-			}
+		.pay-title {
+			margin-top: 30rpx;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #ffffff;
 		}
 
-		.ani-pop {
-			width: 100vw;
-			height: 100vh;
-			position: fixed;
-			left: 0;
-			top: 0;
-			z-index: 88;
+		.pay-type {
+			padding: 30rpx 24rpx;
+			border-radius: 20rpx;
+			margin-top: 20rpx;
 			display: flex;
-			justify-content: center;
 			align-items: center;
-			background: #000;
+			background: #ffffff;
 
-			image {
-				width: 100%;
-				height: 1624rpx;
+			.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;
+						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;
+		}
+	}
+}
 </style>
\ No newline at end of file

From 08bca7b34a1632860db3cb08c8cbf98741fed29c Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 24 Mar 2025 04:07:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mall/index.vue | 1040 +++++++++++++++++++++---------------------
 1 file changed, 509 insertions(+), 531 deletions(-)

diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index d07963b..c2d05d9 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -5,24 +5,11 @@
 				<view class="title">
 					商城好物
 				</view>
-				<image v-if="advert!=null&&advert.length>0" :src="advert[0].imgurl" style="width: 100%; margin-top: ;"
+				<image v-if="advert != null && advert.length > 0" :src="advert[0].imgurl" style="width: 100%; margin-top: ;"
 					mode=""></image>
-				<!-- <view style="background-image: url('https://xinglanmh.shequtuangou.vip/static/image/20240711134727.png');background-size: 100% 100%;height:600rpx;">
-					<view style="height:200rpx;"></view>
-					<view style="width:90%;height:286rpx;margin-left: 5%;">
-						<swiper class="swiper-box" :autoplay="true" :indicator-dots="false" :circular="true" :interval="3000">
-							<swiper-item v-for="(v, i) in advert" :key="i" @click="$c.navTo(v)">
-								<image class="yh_bg" :src="v.imgurl" style="width: 100%;height: 100%;"></image>
-							</swiper-item>
-						</swiper>
-					</view>
-				</view> -->
-
-
 			</view>
-
 			<view class="grid-container">
-				<view v-for="(item,index) in datas" :key="index" class="grid-item" @click="order_money(item)">
+				<view v-for="(item, index) in datas" :key="index" class="grid-item" @click="order_money(item)">
 
 					<view class=""
 						style="background-color: #D8D8D8;  height: 324rpx; border-radius: 16rpx  16rpx  0rpx  0rpx;">
@@ -33,12 +20,12 @@
 
 
 					<view class="goods-name hang1" style=" width: 290rpx;">
-						<text style="color: #333333; font-size: 27rpx;">{{item.title}}</text>
+						<text style="color: #333333; font-size: 27rpx;">{{ item.title }}</text>
 					</view>
 
 					<view class="price-box">
 						<view class="price">
-							<text>￥{{item.price}}</text>
+							<text>￥{{ item.price }}</text>
 						</view>
 					</view>
 					<view class="num-box">
@@ -91,7 +78,7 @@
 							微信支付
 						</view>
 						<view class="icon">
-							<image v-if="zhifu==0" :src="$img1('common/check_act.png')" lazy-load></image>
+							<image v-if="zhifu == 0" :src="$img1('common/check_act.png')" lazy-load></image>
 
 							<image v-else :src="$img1('common/check.png')" lazy-load></image>
 						</view>
@@ -99,12 +86,12 @@
 					<view class="pay-type" @click="changePay(1)">
 
 						<view class="" style="width: 100%;	color: #333333;">
-							吧唧币
-							{{ orderData.goods.price*100 }} (剩余:{{ orderData.use_integral }})
+							{{ $config.getAppSetting('currency2_name') }}
+							{{ orderData.goods.price * 100 }} (剩余:{{ orderData.use_integral }})
 						</view>
 
 						<view class="icon">
-							<image v-if="zhifu==1" :src="$img1('common/check_act.png')" lazy-load></image>
+							<image v-if="zhifu == 1" :src="$img1('common/check_act.png')" lazy-load></image>
 							<image v-else :src="$img1('common/check.png')" lazy-load></image>
 						</view>
 					</view>
@@ -136,15 +123,15 @@
 
 
 
-				<view class="pay-btn" v-if="zhifu==0" @click="$c.noDouble(confirmSubmit(1))">
+				<view class="pay-btn" v-if="zhifu == 0" @click="$c.noDouble(confirmSubmit(1))">
 					<text>
 						{{
-						 ` ¥${orderData.price}`
+							` ¥${orderData.price}`
 						}}
 					</text>
 				</view>
-				<view class="pay-btn" v-if="zhifu==1" @click="$c.noDouble(pay(1))">
-					<text>{{orderData.price*100}}吧唧币</text>
+				<view class="pay-btn" v-if="zhifu == 1" @click="$c.noDouble(pay(1))">
+					<text>{{ orderData.price * 100 }}{{ $config.getAppSetting('currency2_name') }}</text>
 				</view>
 			</view>
 		</uni-popup>
@@ -155,578 +142,569 @@
 </template>
 
 <script>
-	export default {
+export default {
 
-		data() {
-			return {
-				statusBarHeight: 0,
-				datas: [],
-				advert: [],
-				sendRuleData: '',
-				goodsId: "",
-				orderData: null,
-				isAgree: true,
-				isWXPay: true,
-				useMoney: false,
-				integral: true,
-				zhifu: 0,
+	data() {
+		return {
+			statusBarHeight: 0,
+			datas: [],
+			advert: [],
+			sendRuleData: '',
+			goodsId: "",
+			orderData: null,
+			isAgree: true,
+			isWXPay: true,
+			useMoney: false,
+			integral: true,
+			zhifu: 0,
+		}
+	},
+	onLoad() {
+		// 获取系统信息
+		uni.getSystemInfo({
+			success: (res) => {
+				// 状态栏的高度
+				this.statusBarHeight = res.statusBarHeight + 20;
 			}
-		},
-		onLoad() {
-			// 获取系统信息
-			uni.getSystemInfo({
-				success: (res) => {
-					// 状态栏的高度
-					this.statusBarHeight = res.statusBarHeight + 20;
-				}
-			});
+		});
 
-			this.getData();
-			this.load();
-			this.$c.getRule(10).then(res => {
-				if (res.status == 1) {
-					this.sendRuleData = res.data
+		this.getData();
+		this.load();
+		this.$c.getRule(10).then(res => {
+			if (res.status == 1) {
+				this.sendRuleData = res.data
+			}
+		});
+	},
+	onShow() {
+
+		const curPages = getCurrentPages()[0]; // 获取当前页面实例
+		if (typeof curPages.getTabBar === 'function' && curPages.getTabBar()) {
+			this.$mp.page.getTabBar().setData({
+				selected: 2
+			});
+		}
+	},
+	methods: {
+		load() {
+			let that = this
+			that.req({
+				url: 'getAdvert?type_id=3',
+				success(res) {
+					if (res.status == 1) {
+						that.advert = res.data
+					}
+				}
+			})
+
+		},
+		getStatusBarHeight() {
+			const systemInfo = uni.getSystemInfoSync();
+			this.statusBarHeight = systemInfo.statusBarHeight;
+			console.log('statusBarHeight', this.statusBarHeight);
+		},
+
+		getData() {
+			let that = this
+			that.req({
+				url: 'goods',
+				data: {
+					type: '10',
+					page: 1,
+					use_money_is: this.useMoney ? 1 : 2,
+					use_integral_is: this.isWXPay ? 1 : 2,
+				},
+				success(res) {
+					that.datas = res.data.data
 				}
 			});
 		},
-		onShow() {
 
-			const curPages = getCurrentPages()[0]; // 获取当前页面实例
-			if (typeof curPages.getTabBar === 'function' && curPages.getTabBar()) {
-				this.$mp.page.getTabBar().setData({
-					selected: 2
-				});
+
+		order_money(data) {
+			console.log(234);
+			this.goodsId = data.id;
+			var that = this;
+			this.req({
+				url: 'mall_ordermoney',
+				data: {
+					prize_num: 1,
+					goods_id: data.id,
+					goods_num: 1,
+				},
+				success(res) {
+					if (res.status == 1) {
+
+						that.orderData = res.data
+						that.zhifu = 0;
+						that.$refs.pop.open()
+					}
+				}
+			})
+		},
+
+		close(e) {
+			this.$refs[e].close()
+		},
+
+		changePay(e) {
+			if (this.zhifu != e) {
+				this.zhifu = e;
 			}
+			if (this.zhifu == 1) {
+
+			}
+			// this[e] = !this[e]
+
+			// this.confirmSubmit(0)
 		},
-		methods: {
-			load() {
-				let that = this
-				that.req({
-					url: 'getAdvert?type_id=3',
-					success(res) {
-						if (res.status == 1) {
-							that.advert = res.data
-						}
-					}
-				})
 
-			},
-			getStatusBarHeight() {
-				const systemInfo = uni.getSystemInfoSync();
-				this.statusBarHeight = systemInfo.statusBarHeight;
-				console.log('statusBarHeight', this.statusBarHeight);
-			},
+		confirmSubmit(type) {
 
-			getData() {
-				let that = this
-				that.req({
-					url: 'goods',
-					data: {
-						type: '10',
-						page: 1,
-						use_money_is: this.useMoney ? 1 : 2,
-						use_integral_is: this.isWXPay ? 1 : 2,
-					},
-					success(res) {
-						that.datas = res.data.data
-					}
+			if (!this.useMoney && !this.isWXPay) {
+				uni.showToast({
+					title: '请选择支付方式',
+					icon: 'none',
 				});
-			},
+				return;
+			}
+
+			console.log("type", type);
+
+			var that = this;
+
+			let url = 'mall_ordermoney'
+
+			let data = {
+				goods_id: this.goodsId,
+				prize_num: 1,
+				goods_num:1,
+				use_money_is: 2,
+				use_integral_is: 2,
+				coupon_id:  "",
+				use_money2_is: this.useMoney ? 1 : 2
+			}
+
+			if (type == 1) {
+				url = 'orderbuy'
+			}
 
 
-			order_money(data) {
-				console.log(234);
-				this.goodsId = data.id;
-				var that = this;
-				this.req({
-					url: 'mall_ordermoney',
-					data: {
-						prize_num: 1,
-						goods_id: data.id,
-						goods_num: 1,
-					},
-					success(res) {
-						if (res.status == 1) {
-
-							that.orderData = res.data
-							that.zhifu = 0;
-							that.$refs.pop.open()
+			this.req({
+				url,
+				data,
+				success: async res => {
+					if (res.status == 1) {
+						if (type == 0) {
+							console.log("res.data", res.data);
+							this.orderData = res.data;
 						}
-					}
-				})
-			},
 
-			close(e) {
-				this.$refs[e].close()
-			},
+						if (type == 1) {
+							that.close('pop')
+							if (res.data.status == 1) {
 
-			changePay(e) {
-				if (this.zhifu != e) {
-					this.zhifu = e;
-				}
-				if (this.zhifu == 1) {
-
-				}
-				// this[e] = !this[e]
-
-				// this.confirmSubmit(0)
-			},
-
-			confirmSubmit(type) {
-
-				if (!this.useMoney && !this.isWXPay) {
-					uni.showToast({
-						title: '请选择支付方式',
-						icon: 'none',
-					});
-					return;
-				}
-
-				console.log("type", type);
-
-				var that = this;
-
-				let url = 'mall_ordermoney'
-
-				let data = {
-					goods_id: this.goodsId,
-					prize_num: 1,
-				}
-
-				if (type == 1) {
-					url = 'infinite_orderbuy'
-
-					// if (this.pageTabCur == 1) {
-					// 	url = 'infinite_mibao_orderbuy'
-					// 	data = {
-					// 		goods_id: this.pageData.goods.id,
-					// 		prize_num: this.buyNum,
-					// 		// is_mibao: this.pageTabCur
-					// 	}
-					// }
-
-					// if (!uni.getStorageSync('_agree_buy_notice') && !fromNotice) {
-					// 	this.$refs.buyNotice.getRule(6)
-					// 	return
-					// }
-				}
+								const status = await that.$c.wxMpPay({
+									data: res.data.res
+								})
+								if (status == 'success') {
+									// that.getPrize(res.data.order_num)
+									that.getData();
+								}
 
 
-				this.req({
-					url,
-					data,
-					success: async res => {
-						if (res.status == 1) {
-							if (type == 0) {
-								console.log("res.data", res.data);
-								this.orderData = res.data;
-							}
 
-							if (type == 1) {
-								that.close('pop')
-								if (res.data.status == 1) {
 
-									const status = await that.$c.wxMpPay({
-										data: res.data.res
-									})
-									if (status == 'success') {
+							} else {
+								that.$c.toast({
+									title: res.msg,
+									duration: 500,
+									success: () => {
 										// that.getPrize(res.data.order_num)
 										that.getData();
 									}
-
-
-
-
-								} else {
-									that.$c.toast({
-										title: res.msg,
-										duration: 500,
-										success: () => {
-											// that.getPrize(res.data.order_num)
-											that.getData();
-										}
-									})
-								}
+								})
 							}
 						}
 					}
-				})
-
-			},
-
-
-			pay(type) {
-				//orderData.price
-				//{{ orderData.goods.price*100 }} (剩余:{{ orderData.use_integral }})
-				var pri = this.orderData.goods.price * 100;
-				if (this.orderData.use_integral < pri) {
-					uni.showToast({
-						title: '吧唧币不足',
-						icon: 'none',
-					});
-					return;
 				}
-
-				console.log("type", type);
-
-				var that = this;
-
-				let url = 'mall_orderbuy'
-
-				let data = {
-					goods_id: this.goodsId,
-					prize_num: 1,
-				}
-
-				this.req({
-					url,
-					data,
-					success: async res => {
-						if (res.status == 1) {
-							if (type == 0) {
-								console.log("res.data", res.data);
-								this.orderData = res.data;
-							}
-
-							if (type == 1) {
-								that.close('pop')
-								if (res.data.status == 1) {
-
-									const status = await that.$c.wxMpPay({
-										data: res.data.res
-									})
-									if (status == 'success') {
-										// that.getPrize(res.data.order_num)
-										that.getData();
-									}
-
-
-
-
-								} else {
-									that.$c.toast({
-										title: res.msg,
-										duration: 500,
-										success: () => {
-											// that.getPrize(res.data.order_num)
-											that.getData();
-										}
-									})
-								}
-							}
-						}
-					}
-				})
-
-			},
-
+			})
 
 		},
-	}
+
+
+		pay(type) {
+			//orderData.price
+			//{{ orderData.goods.price*100 }} (剩余:{{ orderData.use_integral }})
+			var pri = this.orderData.goods.price * 100;
+			if (this.orderData.use_integral < pri) {
+				uni.showToast({
+					title: '吧唧币不足',
+					icon: 'none',
+				});
+				return;
+			}
+
+			console.log("type", type);
+
+			var that = this;
+
+			let url = 'mall_orderbuy'
+
+			let data = {
+				goods_id: this.goodsId,
+				prize_num: 1,
+			}
+
+			this.req({
+				url,
+				data,
+				success: async res => {
+					if (res.status == 1) {
+						if (type == 0) {
+							console.log("res.data", res.data);
+							this.orderData = res.data;
+						}
+
+						if (type == 1) {
+							that.close('pop')
+							if (res.data.status == 1) {
+
+								const status = await that.$c.wxMpPay({
+									data: res.data.res
+								})
+								if (status == 'success') {
+									// that.getPrize(res.data.order_num)
+									that.getData();
+								}
+
+
+
+
+							} else {
+								that.$c.toast({
+									title: res.msg,
+									duration: 500,
+									success: () => {
+										// that.getPrize(res.data.order_num)
+										that.getData();
+									}
+								})
+							}
+						}
+					}
+				}
+			})
+
+		},
+
+
+	},
+}
 </script>
 
 <style lang="scss">
-	.title {
-		width: 100%;
-		top: 108rpx;
+.title {
+	width: 100%;
+	top: 108rpx;
+	position: absolute;
+	display: flex;
+	align-items: center;
+	font-size: 34rpx;
+	justify-content: center;
+	color: black;
+	z-index: 100;
+}
+
+.grid-container {
+	display: grid;
+	margin: 33rpx;
+	padding-bottom: 200rpx;
+	grid-template-columns: repeat(2, 1fr);
+	gap: 16px;
+}
+
+.grid-item {
+	height: 487rpx;
+	position: relative;
+	background-color: #F8F8F8;
+	border-radius: 0rpx 0rpx 16rpx 16rpx;
+}
+
+.goods-name {
+	position: absolute;
+	left: 25rpx;
+	font-size: 20rpx;
+	bottom: 90rpx;
+}
+
+.price-box {
+	display: flex;
+	position: absolute;
+	left: 18rpx;
+	bottom: 24rpx;
+	justify-content: space-between;
+	align-items: center;
+
+	.price {
+		font-weight: 500;
+		font-size: 16rpx;
+		color: #333333;
+	}
+}
+
+.num-box {
+	display: flex;
+	align-items: center;
+	position: absolute;
+	bottom: 24rpx;
+	right: 20rpx;
+
+	.num {
+		font-size: 16rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #6C6C6C;
+	}
+
+	.box {
+		width: 18rpx;
+		height: 16rpx;
+		margin-left: 6rpx;
+	}
+
+	.icon {}
+}
+
+.buy-pop {
+	padding: 0 30rpx;
+	box-sizing: border-box;
+	background: #F7F7F7;
+	padding-bottom: 200rpx;
+	z-index: 999;
+	border-radius: 16rpx 16rpx 0rpx 0rpx;
+
+	&::after {
+		content: '';
 		position: absolute;
+		top: -62rpx;
+		left: 0;
+		width: 750rpx;
+		height: 62rpx;
+	}
+
+	.buy-pop-hd {
+		padding: 40rpx 0;
+		padding-left: 10rpx;
 		display: flex;
-		align-items: center;
-		font-size: 34rpx;
-		justify-content: center;
-		color: black;
-		z-index: 100;
-	}
-
-	.grid-container {
-		display: grid;
-		margin: 33rpx;
-		padding-bottom: 200rpx;
-		grid-template-columns: repeat(2, 1fr);
-		gap: 16px;
-	}
-
-	.grid-item {
-		height: 487rpx;
-		position: relative;
-		background-color: #F8F8F8;
-		border-radius: 0rpx 0rpx 16rpx 16rpx;
-	}
-
-	.goods-name {
-		position: absolute;
-		left: 25rpx;
-		font-size: 20rpx;
-		bottom: 90rpx;
-	}
-
-	.price-box {
-		display: flex;
-		position: absolute;
-		left: 18rpx;
-		bottom: 24rpx;
 		justify-content: space-between;
 		align-items: center;
 
-		.price {
+		>text {
+			font-size: 32rpx;
 			font-weight: 500;
-			font-size: 16rpx;
 			color: #333333;
 		}
+
+		.close {
+			width: 24rpx;
+			height: 24rpx;
+		}
 	}
 
-	.num-box {
-		display: flex;
-		align-items: center;
-		position: absolute;
-		bottom: 24rpx;
-		right: 20rpx;
+	.buy-card {
+		border-radius: 20rpx;
+		padding: 30rpx 30rpx 30rpx 30rpx;
+		background: #FFFFFF;
 
-		.num {
-			font-size: 16rpx;
-			font-family: Source Han Sans CN;
+		.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 10rpx 10rpx 30rpx;
+
+				.title {
+					font-size: 32rpx;
+					font-weight: 400;
+					color: #333333;
+				}
+
+
+				.type {
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #999999;
+				}
+
+				.price-num {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 16rpx;
+
+					.price {
+						ffont-weight: 500;
+						font-size: 35rpx;
+						color: #333333;
+						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;
-			color: #6C6C6C;
+			font-size: 28rpx;
+			color: #FFFFFF;
 		}
 
-		.box {
-			width: 18rpx;
-			height: 16rpx;
-			margin-left: 6rpx;
-		}
-
-		.icon {}
-	}
-
-	.buy-pop {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		background: #F7F7F7;
-		padding-bottom: 200rpx;
-		z-index: 999;
-		border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-		&::after {
-			content: '';
-			position: absolute;
-			top: -62rpx;
-			left: 0;
-			width: 750rpx;
-			height: 62rpx;
-		}
-
-		.buy-pop-hd {
-			padding: 40rpx 0;
-			padding-left: 10rpx;
+		.card-row {
+			padding: 16rpx 0;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
 
-			>text {
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.close {
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-
-		.buy-card {
-			border-radius: 20rpx;
-			padding: 30rpx 30rpx 30rpx 30rpx;
-			background: #FFFFFF;
-
-			.buy-info {
-				display: flex;
-
-				.pic {
-					width: 190rpx;
-					height: 190rpx;
-					border-radius: 10rpx;
+			.title {
+				>image {
+					width: 32rpx;
+					height: 32rpx;
 				}
 
-				.info-r {
-					width: calc(100% - 190rpx);
-					box-sizing: border-box;
-					display: flex;
-					flex-flow: column nowrap;
-					justify-content: space-between;
-					padding: 10rpx 10rpx 10rpx 30rpx;
-
-					.title {
-						font-size: 32rpx;
-						font-weight: 400;
-						color: #333333;
-					}
-
-
-					.type {
-						font-size: 20rpx;
-						font-weight: 400;
-						color: #999999;
-					}
-
-					.price-num {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						font-size: 16rpx;
-
-						.price {
-							ffont-weight: 500;
-							font-size: 35rpx;
-							color: #333333;
-							font-size: 28rpx;
-						}
-
-						.num {
-							font-size: 20rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-						}
-					}
+				>text {
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #FFFFFF;
 				}
 			}
 
-			.line {
-				height: 1px;
-				background: #222222;
-				margin: 30rpx 0 10rpx;
-			}
-
-			.yhfs {
-				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-			}
-
-			.card-row {
-				padding: 16rpx 0;
+			.row-r {
 				display: flex;
-				justify-content: space-between;
 				align-items: center;
 
-				.title {
-					>image {
-						width: 32rpx;
-						height: 32rpx;
-					}
-
-					>text {
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #FFFFFF;
-					}
-				}
-
-				.row-r {
-					display: flex;
-					align-items: center;
-
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #FFFFFF;
-
-					.icon {
-						width: 32rpx;
-						height: 32rpx;
-					}
-				}
-			}
-
-			.card-row {
-				.title {}
-
-				.row-r {
-					.icon {}
-				}
-			}
-		}
-
-		.pay-title {
-			margin-top: 30rpx;
-			font-size: 38rpx;
-			font-weight: 400;
-			color: #ffffff;
-		}
-
-		.pay-type {
-			padding: 30rpx;
-			border-radius: 20rpx;
-			display: flex;
-			align-items: center;
-			flex-direction: row;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-			}
-
-			.title {
-				flex: 1;
-				padding: 0 20rpx;
-				font-size: 28rpx;
+				font-size: 24rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #FFFFFF;
+
+				.icon {
+					width: 32rpx;
+					height: 32rpx;
+				}
 			}
 		}
 
-		.agree {
-			display: flex;
-			margin-top: 30rpx;
+		.card-row {
+			.title {}
 
-			font-size: 20rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			color: #999999;
-			line-height: 32rpx;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.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-weight: 400;
-				color: #999999;
-			}
-		}
-
-		.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: 28rpx;
-			}
-
-			>text:nth-child(2) {
-				font-size: 36rpx;
+			.row-r {
+				.icon {}
 			}
 		}
 	}
+
+	.pay-title {
+		margin-top: 30rpx;
+		font-size: 38rpx;
+		font-weight: 400;
+		color: #ffffff;
+	}
+
+	.pay-type {
+		padding: 30rpx;
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		flex-direction: row;
+
+		.icon {
+			width: 32rpx;
+			height: 32rpx;
+		}
+
+		.title {
+			flex: 1;
+			padding: 0 20rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #ffffff;
+		}
+	}
+
+	.agree {
+		display: flex;
+		margin-top: 30rpx;
+
+		font-size: 20rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		color: #999999;
+		line-height: 32rpx;
+
+		.icon {
+			width: 32rpx;
+			height: 32rpx;
+			margin-right: 10rpx;
+		}
+	}
+
+	.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-weight: 400;
+			color: #999999;
+		}
+	}
+
+	.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: 28rpx;
+		}
+
+		>text:nth-child(2) {
+			font-size: 36rpx;
+		}
+	}
+}
 </style>
\ No newline at end of file

From 6f5e1e1790d4ed31ae93f8b776a8cf9a97030950 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 24 Mar 2025 04:11:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/index/sign.vue | 416 ++++++++++++++++++++---------------------
 1 file changed, 208 insertions(+), 208 deletions(-)

diff --git a/package/index/sign.vue b/package/index/sign.vue
index e73d8db..fa82e6d 100644
--- a/package/index/sign.vue
+++ b/package/index/sign.vue
@@ -17,12 +17,12 @@
 		</view>
 
 		<view v-if="signData" class="sign-box common_bg" :style="{
-        backgroundImage: `url(${$img('/static/img/1_sign_bg.png')})`
-      }">
+			backgroundImage: `url(${$img('/static/img/1_sign_bg.png')})`
+		}">
 			<template v-for="(item, i) in signData.sign_info">
 				<view v-if="i < 6" class="sign-item" :key="i" :class="{
-            act: i + 1 <= signData.days
-          }">
+					act: i + 1 <= signData.days
+				}">
 					<view class="day">{{ i + 1 }}天</view>
 
 					<view class="icon">
@@ -35,16 +35,16 @@
 						<image src="/static/common/signImg.png" lazy-load></image>
 					</view>
 
-					<view class="num">{{ item }}吧唧币</view>
+					<view class="num">{{ item }}{{$config.getAppSetting('currency1_name')}}</view>
 				</view>
 
 				<view v-else class="sign-item large" :key="i" :class="{
-            act: i + 1 <= signData.days
-          }">
+					act: i + 1 <= signData.days
+				}">
 					<view class="item-l column justify-center">
 						<view class="day">第七天</view>
 
-						<view class="num">{{ item }}吧唧币</view>
+						<view class="num">{{ item }}{{$config.getAppSetting('currency1_name')}}</view>
 					</view>
 					<view class="icon relative">
 						<image src="/static/common/signImg.png" lazy-load></image>
@@ -54,18 +54,18 @@
 			</template>
 		</view>
 
-		<view class="sign-btn" :class="!is_sign?'signYes':'signNo'" @click="doSign">
+		<view class="sign-btn" :class="!is_sign ? 'signYes' : 'signNo'" @click="doSign">
 			<template v-if="!is_sign">立即签到</template>
 			<template v-else>已签到</template>
 		</view>
 
 		<uni-popup ref="sucPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
 			<view v-if="sucData" class="suc-pop common_bg center" :style="{
-          backgroundImage: `url(${$img('/static/img/signBg.png')})`
-		  
-        }">
+				backgroundImage: `url(${$img('/static/img/signBg.png')})`
+
+			}">
 				<image class="coin-img" :src="$img('/static/img/signJinbi.png')" mode=""></image>
-				<view class="coin-num">恭喜获得 {{ sucData.num }} 吧唧币</view>
+				<view class="coin-num">恭喜获得 {{ sucData.num }} {{$config.getAppSetting('currency1_name')}}</view>
 				<view class="close icon" @click="$refs.sucPop.close()">
 					<image :src="$img('/static/img/zdl.png')" lazy-load></image>
 				</view>
@@ -77,232 +77,232 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				signData: [],
-				sucData: '',
-				is_sign: 0
-			}
+export default {
+	data() {
+		return {
+			signData: [],
+			sucData: '',
+			is_sign: 0
+		}
+	},
+
+	onLoad(options) {
+		this.getData()
+	},
+	methods: {
+		doSign() {
+			this.req({
+				url: 'sign_add',
+				data: {},
+				success: res => {
+					if (res.status == 1) {
+						this.sucData = res.data
+
+						this.$refs.sucPop.open()
+
+						this.getData()
+					}
+				}
+			})
 		},
 
-		onLoad(options) {
-			this.getData()
-		},
-		methods: {
-			doSign() {
-				this.req({
-					url: 'sign_add',
-					data: {},
-					success: res => {
-						if (res.status == 1) {
-							this.sucData = res.data
-
-							this.$refs.sucPop.open()
-
-							this.getData()
-						}
+		getData() {
+			this.req({
+				url: 'sign',
+				data: {},
+				success: res => {
+					if (res.status == 1) {
+						this.signData = res.data.sign
+						this.is_sign = res.data.sign.is_sign
 					}
-				})
-			},
-
-			getData() {
-				this.req({
-					url: 'sign',
-					data: {},
-					success: res => {
-						if (res.status == 1) {
-							this.signData = res.data.sign
-							this.is_sign = res.data.sign.is_sign
-						}
-					}
-				})
-			}
+				}
+			})
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.content {
-		min-height: 100vh;
+.content {
+	min-height: 100vh;
+	box-sizing: border-box;
+	padding: 1rpx 0 40rpx;
+
+	.page-hd {
+		padding: 20rpx 30rpx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.title {
+			font-size: 60rpx;
+			font-family: YouSheBiaoTiHei;
+			font-weight: 400;
+			color: #ffffff;
+			text-shadow: 0rpx 0rpx 12rpx rgba(255, 135, 58, 0.8);
+		}
+
+		.icon {
+			width: 40rpx;
+			height: 40rpx;
+		}
+	}
+
+	.sign-box {
+		width: 710rpx;
 		box-sizing: border-box;
-		padding: 1rpx 0 40rpx;
+		padding: 30rpx 40rpx 40rpx;
+		margin: 30rpx auto 0;
+		display: flex;
+		flex-flow: row wrap;
+		justify-content: space-between;
 
-		.page-hd {
-			padding: 20rpx 30rpx 0;
+		.sign-item {
+			width: 150rpx;
+			height: 165rpx;
+			background: #ff873a;
+			border-radius: 20rpx;
 			display: flex;
-			justify-content: space-between;
+			flex-flow: column nowrap;
+			justify-content: space-evenly;
 			align-items: center;
+			margin-top: 10rpx;
+			border: 2rpx solid #FFFFFF;
 
-			.title {
-				font-size: 60rpx;
-				font-family: YouSheBiaoTiHei;
+			.day {
+				font-size: 24rpx;
+				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
-				text-shadow: 0rpx 0rpx 12rpx rgba(255, 135, 58, 0.8);
+				color: #dddddd;
 			}
 
 			.icon {
-				width: 40rpx;
-				height: 40rpx;
+				width: 50rpx;
+				height: 50rpx;
 			}
-		}
 
-		.sign-box {
-			width: 710rpx;
-			box-sizing: border-box;
-			padding: 30rpx 40rpx 40rpx;
-			margin: 30rpx auto 0;
-			display: flex;
-			flex-flow: row wrap;
-			justify-content: space-between;
+			.num {
+				font-size: 20rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
 
-			.sign-item {
-				width: 150rpx;
+			&.act {
+				position: relative;
+
+				&::after {
+					content: '已签';
+					position: absolute;
+					width: 100%;
+					height: 100%;
+					font-family: Alimama ShuHeiTi;
+					font-weight: 700;
+					font-size: 28rpx;
+					color: #FFFFFF;
+					background: rgba(0, 0, 0, 0.4);
+					display: flex;
+					align-items: center;
+					justify-content: center;
+				}
+			}
+
+			&.large {
+				width: 310rpx;
 				height: 165rpx;
-				background: #ff873a;
-				border-radius: 20rpx;
-				display: flex;
-				flex-flow: column nowrap;
-				justify-content: space-evenly;
+				flex-flow: row nowrap;
+				justify-content: space-around;
 				align-items: center;
-				margin-top: 10rpx;
-				border: 2rpx solid #FFFFFF;
 
-				.day {
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #dddddd;
+				.item-l {
+					height: 120rpx;
+					display: flex;
+					flex-flow: column nowrap;
+					align-items: center;
+
+					.num {
+						margin-top: 20rpx;
+					}
 				}
 
 				.icon {
-					width: 50rpx;
-					height: 50rpx;
-				}
+					width: 120rpx;
+					height: 100rpx;
 
-				.num {
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #FFFFFF;
-				}
-
-				&.act {
-					position: relative;
-
-					&::after {
-						content: '已签';
+					>image:nth-child(1) {
+						width: 34rpx;
+						height: 34rpx;
 						position: absolute;
-						width: 100%;
-						height: 100%;
-						font-family: Alimama ShuHeiTi;
-						font-weight: 700;
-						font-size: 28rpx;
-						color: #FFFFFF;
-						background: rgba(0, 0, 0, 0.4);
-						display: flex;
-						align-items: center;
-						justify-content: center;
+						left: 10rpx;
+						bottom: 10rpx;
+						transform: rotate(-28deg);
+					}
+
+					>image:nth-child(2) {
+						width: 72rpx;
+						height: 72rpx;
+						position: absolute;
+						top: 10rpx;
+						right: 10rpx;
 					}
 				}
-
-				&.large {
-					width: 310rpx;
-					height: 165rpx;
-					flex-flow: row nowrap;
-					justify-content: space-around;
-					align-items: center;
-
-					.item-l {
-						height: 120rpx;
-						display: flex;
-						flex-flow: column nowrap;
-						align-items: center;
-
-						.num {
-							margin-top: 20rpx;
-						}
-					}
-
-					.icon {
-						width: 120rpx;
-						height: 100rpx;
-
-						>image:nth-child(1) {
-							width: 34rpx;
-							height: 34rpx;
-							position: absolute;
-							left: 10rpx;
-							bottom: 10rpx;
-							transform: rotate(-28deg);
-						}
-
-						>image:nth-child(2) {
-							width: 72rpx;
-							height: 72rpx;
-							position: absolute;
-							top: 10rpx;
-							right: 10rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.sign-btn {
-			margin: 40rpx auto 0;
-			width: 400rpx;
-			height: 122rpx;
-			border-radius: 40rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 32rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			background: url($imgurl+'common/jixuchou.png') no-repeat 0 0 / 100% 100%;
-		}
-
-		.signYes {
-			color: #FFFFFF;
-		}
-
-		.signNo {
-			color: #FFFFFF;
-			filter: grayscale(100%);
-		}
-
-		.suc-pop {
-			width: 100vw;
-			height: 642rpx;
-			position: relative;
-			display: flex;
-			flex-flow: column nowrap;
-			justify-content: space-between;
-			align-items: center;
-
-
-			.coin-img {
-				width: 345rpx;
-				height: 345rpx;
-			}
-
-			.coin-num {
-				font-size: 32rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #ffffff;
-			}
-
-			.close {
-				width: 378rpx;
-				height: 80rpx;
-				position: absolute;
-				left: 50%;
-				bottom: 40rpx;
-				transform: translate(-50%, 200%);
 			}
 		}
 	}
+
+	.sign-btn {
+		margin: 40rpx auto 0;
+		width: 400rpx;
+		height: 122rpx;
+		border-radius: 40rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32rpx;
+		font-family: Source Han Sans CN;
+		font-weight: 400;
+		background: url($imgurl+'common/jixuchou.png') no-repeat 0 0 / 100% 100%;
+	}
+
+	.signYes {
+		color: #FFFFFF;
+	}
+
+	.signNo {
+		color: #FFFFFF;
+		filter: grayscale(100%);
+	}
+
+	.suc-pop {
+		width: 100vw;
+		height: 642rpx;
+		position: relative;
+		display: flex;
+		flex-flow: column nowrap;
+		justify-content: space-between;
+		align-items: center;
+
+
+		.coin-img {
+			width: 345rpx;
+			height: 345rpx;
+		}
+
+		.coin-num {
+			font-size: 32rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #ffffff;
+		}
+
+		.close {
+			width: 378rpx;
+			height: 80rpx;
+			position: absolute;
+			left: 50%;
+			bottom: 40rpx;
+			transform: translate(-50%, 200%);
+		}
+	}
+}
 </style>
\ No newline at end of file

From 4c15cabee23e026c3779f02e3c553fc8815a8cc8 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 24 Mar 2025 04:20:41 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/config.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/config.js b/common/config.js
index 6f3b749..405003d 100644
--- a/common/config.js
+++ b/common/config.js
@@ -8,6 +8,10 @@ import RequestManager from '@/common/request.js'
 let configData = null;
 let isLoading = false;
 let loadPromise = null;
+const defaultConfig = {
+  "good_type": [{ "value": 0, "sort_order": 0, "is_show": 1, "name": "全部", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 1, "sort_order": 1, "is_show": 0, "name": "一番赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 2, "sort_order": 2, "is_show": 1, "name": "无限赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 3, "sort_order": 3, "is_show": 0, "name": "擂台赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 5, "sort_order": 4, "is_show": 0, "name": "积分赏", "pay_wechat": 0, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 0 }, { "value": 6, "sort_order": 5, "is_show": 1, "name": "全局赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 8, "sort_order": 6, "is_show": 1, "name": "领主赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 9, "sort_order": 7, "is_show": 1, "name": "连击赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }, { "value": 10, "sort_order": 8, "is_show": 0, "name": "商城赏", "pay_wechat": 1, "pay_balance": 0, "pay_currency": 0, "pay_currency2": 1, "pay_coupon": 0, "is_deduction": 0 }, { "value": 11, "sort_order": 9, "is_show": 0, "name": "自制赏", "pay_wechat": 1, "pay_balance": 1, "pay_currency": 1, "pay_currency2": 1, "pay_coupon": 1, "is_deduction": 1 }],
+  "app_setting": { "key": "app_setting", "app_name": "友达赏", "purchase_popup": "1", "exchange_times": "2", "balance_name": "钻石", "balance_icon": "https://mh.shhuanmeng.com/app/icons/20250322/3d823aaa01e96aeeafc39cbb2d579612.jpg", "currency1_name": "货币", "currency1_icon": "https://mh.shhuanmeng.com/app/icons/20250322/8188634352e7f9edf5a2a42329b7c2c9.jpg", "currency2_name": "积分1", "currency2_icon": "", "win_audio": "https://mh.shhuanmeng.com/static/web/static/mp3/open.mp3", "update_time": 1742716262 }
+};
 
 // 配置类
 class ConfigManager {
@@ -77,14 +81,22 @@ class ConfigManager {
    * @param {any} defaultValue 默认值，当键不存在时返回
    * @returns {any} 配置值
    */
-  static get(key, defaultValue = null) {
+  static get(key) {
     if (!configData) {
       console.warn('配置数据尚未加载，获取本地缓存中。。。');
       configData = uni.getStorageSync("configData");
-      if (configData != null) {
+      if (configData != null && configData != "") {
         return configData;
       }
-      return defaultValue;
+      configData = defaultConfig;
+      //   wx.restartMiniProgram({
+      //     success(res) {
+      //         console.log('重启小程序成功', res);
+      //     },
+      //     fail(err) {
+      //         console.error('重启小程序失败', err);
+      //     }
+      // });
     }
     return key in configData ? configData[key] : defaultValue;
   }