From e74403f72a69fc89b2c698397063fe7d7919aa90 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 8 Jun 2025 20:23:01 +0800
Subject: [PATCH 1/3] 4444

---
 App.vue                                       |  484 +-
 common/audio.js                               |   40 +
 common/config.js                              |    2 +-
 common/platform/AppPlatform.js                |   35 +-
 common/platform/BasePlatform.js               |    3 +-
 common/platform/H5Platform.js                 |   10 +-
 common/platform/MiniProgramPlatform.js        |    7 +-
 common/platform/WebAppPlatform.js             |    1 -
 components/detail-lucky/detail-bao-xiang.vue  |  106 +
 .../detail-lucky/detail-grand-prize.vue       |   15 +-
 .../detail-lucky/detail-lucky-canvas.vue      |   23 +-
 components/detail-lucky/detail-lucky.vue      |   27 +-
 components/detail-results/detail-results.vue  |  341 ++
 pages.json                                    |   18 -
 pages/hegui/hegui.vue                         |    1 -
 pages/mall/goods_info.vue                     |    9 -
 pages/mall/index.vue                          |   15 +-
 pages/shouye/detail.vue                       |   64 +-
 pages/shouye/detail_wuxian.vue                | 4029 ++++++++---------
 pages/shouye/index.vue                        |    4 -
 pages/user/my_coupon copy.vue                 |  475 --
 pages/user/sy_jl.vue                          |  223 -
 pages/user/tui-guang-old.vue                  |  539 ---
 pages/user/tui-guang.vue                      |    2 +-
 24 files changed, 2788 insertions(+), 3685 deletions(-)
 create mode 100644 common/audio.js
 create mode 100644 components/detail-lucky/detail-bao-xiang.vue
 create mode 100644 components/detail-results/detail-results.vue
 delete mode 100644 pages/mall/goods_info.vue
 delete mode 100644 pages/user/my_coupon copy.vue
 delete mode 100644 pages/user/sy_jl.vue
 delete mode 100644 pages/user/tui-guang-old.vue

diff --git a/App.vue b/App.vue
index eb1fc67..5c197ab 100644
--- a/App.vue
+++ b/App.vue
@@ -1,264 +1,268 @@
 <script>
-	import Vue from "vue";
-	// 移除全局预览弹窗方法导入
+import Vue from "vue";
+import AudioManager from "./common/audio.js";
+// 移除全局预览弹窗方法导入
 
-	export default {
-		data() {
-			return {
-				isFirstLaunch: true, // 添加标志变量，用于标记是否是首次启动
-			}
-		},
-		onLaunch: function(options) {
-			// console.log("App Launch", options, window.location.href);
-			var that = this;
-			// 在需要检查的地方
-
-			this.$config.init().then(async (data) => {
-				//加载配置
-				let src = await that.$config.getAppSettingAsync("win_audio");
-				if (src == null || src == "") {
-					src = that.$img("/static/mp3/open.mp3");
-				}
-				//创建中奖音乐
-				const openBgm = uni.createInnerAudioContext();
-				Vue.prototype.bgmCtx = {};
-
-				openBgm.src = src;
-				openBgm.sessionCategory = "playback";
-				openBgm.onPlay(() => {
-					console.log('开始播放抽奖弹窗播放');
-				});
-				openBgm.onPause(() => {
-					console.log('播放抽奖弹窗音乐暂停');
-				});
-				openBgm.onStop(() => {
-					console.log('播放抽奖弹窗音乐停止');
-				});
-				openBgm.onError((res) => {
-					console.log('播放抽奖弹窗失败');
-					console.log(res.errMsg);
-					console.log(res.errCode);
-				});
-				Vue.prototype.bgmCtx.openBgm = openBgm;
-				//抽音效
-				let src2 = await that.$config.getAppSettingAsync("win_audio2");
-				if (src2 == null || src2 == "") {
-					src2 = that.$img("/static/mp3/slot_open.mp3");
-				}
-				//创建中奖音乐
-				const slotBgm = uni.createInnerAudioContext();
-				// Vue.prototype.bgmCtx = {};
-				slotBgm.src = src2;
-				Vue.prototype.bgmCtx.slotBgm = slotBgm;
-
-
-				//抽音效
-				let src3 = await that.$config.getAppSettingAsync("win_audio3");
-				if (src3 == null || src3 == "") {
-					src3 = that.$img("/static/mp3/chaoshen.mp3");
-				}
-				//创建中奖音乐
-				const csBgm = uni.createInnerAudioContext();
-				// Vue.prototype.bgmCtx = {};
-				csBgm.src = src3;
-
-				Vue.prototype.bgmCtx.csBgm = csBgm;
-
-
-
-
-			});
-
-			// 调用登录记录接口
-			this.callLoginRecordApi();
-
-			/* 重置首页公告弹窗状态 */
-			uni.setStorageSync("_is_this_show", false);
-
-			/* 清除缓存中的广告id */
-			uni.removeStorageSync("_ad_id");
-			/* 清除缓存中的click_id */
-			uni.removeStorageSync("_click_id");
-			// 调用平台启动方法
-			this.$platform.AppLaunch(options);
-
-
-		},
-
-		onShow: function() {
-			console.log("App Show");
-
-		},
-		onHide: function() {
-			console.log("App Hide");
-		},
-		methods: {
-			// 调用登录记录接口的方法
-			callLoginRecordApi() {
-				// 检查用户是否已登录
-				const token = uni.getStorageSync('token');
-				if (!token) {
-					console.log('用户未登录，不调用登录记录接口');
-					return;
-				}
-				this.req({
-					url: 'login_record',
-					method: 'POST',
-					success: (res) => {
-						console.log('登录记录接口调用成功', res);
-					},
-					fail: (err) => {
-						console.log('登录记录接口调用失败', err);
-					}
-				});
-			}
+export default {
+	data() {
+		return {
+			isFirstLaunch: true, // 添加标志变量，用于标记是否是首次启动
 		}
-	};
+	},
+	onLaunch: function (options) {
+		// console.log("App Launch", options, window.location.href);
+		var that = this;
+		// 在需要检查的地方
+
+		this.$config.init().then(async (data) => {
+			//加载配置
+			let src = await that.$config.getAppSettingAsync("win_audio");
+			if (src == null || src == "") {
+				src = that.$img("/static/mp3/open.mp3");
+			}
+			//创建中奖音乐
+			const openBgm = uni.createInnerAudioContext();
+			Vue.prototype.bgmCtx = {};
+			openBgm.src = src;
+			openBgm.sessionCategory = "playback";
+			openBgm.onPlay(() => {
+				console.log('开始播放抽奖弹窗播放');
+			});
+			openBgm.onPause(() => {
+				console.log('播放抽奖弹窗音乐暂停');
+			});
+			openBgm.onStop(() => {
+				console.log('播放抽奖弹窗音乐停止');
+			});
+			openBgm.onError((res) => {
+				console.log('播放抽奖弹窗失败');
+				console.log(res.errMsg);
+				console.log(res.errCode);
+			});
+			Vue.prototype.bgmCtx.openBgm = openBgm;
+			//抽音效
+			let src2 = await that.$config.getAppSettingAsync("win_audio2");
+			if (src2 == null || src2 == "") {
+				src2 = that.$img("/static/mp3/slot_open.mp3");
+			}
+			//创建中奖音乐
+			const slotBgm = uni.createInnerAudioContext();
+			// Vue.prototype.bgmCtx = {};
+			slotBgm.src = src2;
+			Vue.prototype.bgmCtx.slotBgm = slotBgm;
+			//超神音效
+			let src3 = await that.$config.getAppSettingAsync("win_audio3");
+			if (src3 == null || src3 == "") {
+				src3 = that.$img("/static/mp3/chaoshen.mp3");
+			}
+			//创建中奖音乐
+			const csBgm = uni.createInnerAudioContext();
+			// Vue.prototype.bgmCtx = {};
+			csBgm.src = src3;
+			Vue.prototype.bgmCtx.csBgm = csBgm;
+
+			//宝箱音效
+			let src4 = await that.$config.getAppSettingAsync("win_audio4");
+			if (src4 == null || src4 == "") {
+				src4 = that.$img("/static/mp3/clipchamp.mp3");
+			}
+			//创建中奖音乐 audio
+			const baoXiangBgm = uni.createInnerAudioContext();
+			baoXiangBgm.src = src4;
+			Vue.prototype.bgmCtx.baoXiangBgm = baoXiangBgm;
+			Vue.prototype.audioManager = new AudioManager(openBgm, slotBgm, csBgm, baoXiangBgm);
+		});
+
+		// 调用登录记录接口
+		this.callLoginRecordApi();
+
+		/* 重置首页公告弹窗状态 */
+		uni.setStorageSync("_is_this_show", false);
+
+		/* 清除缓存中的广告id */
+		uni.removeStorageSync("_ad_id");
+		/* 清除缓存中的click_id */
+		uni.removeStorageSync("_click_id");
+		// 调用平台启动方法
+		this.$platform.AppLaunch(options);
+
+
+	},
+
+	onShow: function () {
+		console.log("App Show");
+
+	},
+	onHide: function () {
+		console.log("App Hide");
+	},
+	methods: {
+		// 调用登录记录接口的方法
+		callLoginRecordApi() {
+			// 检查用户是否已登录
+			const token = uni.getStorageSync('token');
+			if (!token) {
+				console.log('用户未登录，不调用登录记录接口');
+				return;
+			}
+			this.req({
+				url: 'login_record',
+				method: 'POST',
+				success: (res) => {
+					console.log('登录记录接口调用成功', res);
+				},
+				fail: (err) => {
+					console.log('登录记录接口调用失败', err);
+				}
+			});
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	/*每个页面公共css */
-	@import "./common/animate.css";
-	@import url("./common/common.css");
+/*每个页面公共css */
+@import "./common/animate.css";
+@import url("./common/common.css");
 
-	uni-tabbar {
-		display: block;
-		box-sizing: border-box;
-		width: 100%;
-		z-index: 97 !important;
-	}
+uni-tabbar {
+	display: block;
+	box-sizing: border-box;
+	width: 100%;
+	z-index: 97 !important;
+}
 
-	/* 引入字体 */
-	@font-face {
-		font-family: "YouSheBiaoTiHei";
-		src: url($imgurl + "font/YouSheBiaoTiHei.ttf") format("truetype");
-	}
+/* 引入字体 */
+@font-face {
+	font-family: "YouSheBiaoTiHei";
+	src: url($imgurl + "font/YouSheBiaoTiHei.ttf") format("truetype");
+}
 
-	@font-face {
-		font-family: "zihun152hao-jijiachaojihei";
-		src: url($imgurl + "font/zihun152hao-jijiachaojihei.TTF") format("truetype");
-	}
+@font-face {
+	font-family: "zihun152hao-jijiachaojihei";
+	src: url($imgurl + "font/zihun152hao-jijiachaojihei.TTF") format("truetype");
+}
 
-	@font-face {
-		font-family: "zihun147hao-xingyuanhei";
-		src: url($imgurl + "font/zihun147hao-xingyuanhei.TTF") format("truetype");
-	}
+@font-face {
+	font-family: "zihun147hao-xingyuanhei";
+	src: url($imgurl + "font/zihun147hao-xingyuanhei.TTF") format("truetype");
+}
 
-	page {
-		overflow-x: hidden;
+page {
+	overflow-x: hidden;
 
-		&:before {
-			content: "";
-			position: fixed;
-			z-index: -1;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
-			background-color: #1c1b20;
-		}
-	}
-
-	.ziti {
-		font-family: YouSheBiaoTiHei;
-	}
-
-	.flex_center {
-		display: flex;
-		align-items: center;
-	}
-
-	.hang2 {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-		word-wrap: break-word;
-		word-break: break-all;
-	}
-
-	.hang1 {
-		overflow: hidden;
-		/*超出部分隐藏*/
-		white-space: nowrap;
-		/*不换行*/
-		text-overflow: ellipsis;
-		/*超出部分文字以...显示*/
-	}
-
-	.icon {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.common_bg {
-		background-repeat: no-repeat;
-		background-position: 0 0;
-		background-size: 100% 100%;
-	}
-
-	.relative {
-		position: relative;
-	}
-
-	button.hide {
-		position: absolute;
-		width: 100% !important;
-		height: 100% !important;
-		left: 0;
+	&:before {
+		content: "";
+		position: fixed;
+		z-index: -1;
 		top: 0;
-		z-index: 1;
-		opacity: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		background-color: #1c1b20;
 	}
+}
 
-	/* 重写组件样式 */
-	::v-deep.uni-noticebar {
-		padding: 0 !important;
+.ziti {
+	font-family: YouSheBiaoTiHei;
+}
+
+.flex_center {
+	display: flex;
+	align-items: center;
+}
+
+.hang2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	word-wrap: break-word;
+	word-break: break-all;
+}
+
+.hang1 {
+	overflow: hidden;
+	/*超出部分隐藏*/
+	white-space: nowrap;
+	/*不换行*/
+	text-overflow: ellipsis;
+	/*超出部分文字以...显示*/
+}
+
+.icon {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+.common_bg {
+	background-repeat: no-repeat;
+	background-position: 0 0;
+	background-size: 100% 100%;
+}
+
+.relative {
+	position: relative;
+}
+
+button.hide {
+	position: absolute;
+	width: 100% !important;
+	height: 100% !important;
+	left: 0;
+	top: 0;
+	z-index: 1;
+	opacity: 0;
+}
+
+/* 重写组件样式 */
+::v-deep.uni-noticebar {
+	padding: 0 !important;
+	margin: 0 !important;
+}
+
+::v-deep.mescroll-upwarp {
+	box-sizing: border-box;
+	min-height: 55px;
+	padding: 15px 0;
+	text-align: center;
+	clear: both;
+}
+
+::v-deep.cmd-progress-outer {
+	line-height: 0;
+
+	.cmd-progress-bg {
 		margin: 0 !important;
 	}
+}
 
-	::v-deep.mescroll-upwarp {
-		box-sizing: border-box;
-		min-height: 55px;
-		padding: 15px 0;
-		text-align: center;
-		clear: both;
+.uni-tabbar__bd {
+	height: 50px !important;
+}
+
+.uni-tabbar__icon {
+	height: 50px !important;
+}
+
+@keyframes m-zoom {
+	0% {
+		transform: scale(1);
 	}
 
-	::v-deep.cmd-progress-outer {
-		line-height: 0;
-
-		.cmd-progress-bg {
-			margin: 0 !important;
-		}
+	50% {
+		transform: scale(0.9);
 	}
 
-	.uni-tabbar__bd {
-		height: 50px !important;
-	}
-
-	.uni-tabbar__icon {
-		height: 50px !important;
-	}
-
-	@keyframes m-zoom {
-		0% {
-			transform: scale(1);
-		}
-
-		50% {
-			transform: scale(0.9);
-		}
-
-		100% {
-			transform: scale(1);
-		}
+	100% {
+		transform: scale(1);
 	}
+}
 </style>
\ No newline at end of file
diff --git a/common/audio.js b/common/audio.js
new file mode 100644
index 0000000..559feb7
--- /dev/null
+++ b/common/audio.js
@@ -0,0 +1,40 @@
+class AudioManager {
+    constructor(openBgm, slotBgm, csBgm, baoXiangBgm) {
+        this.openBgm = openBgm;
+        this.slotBgm = slotBgm;
+        this.csBgm = csBgm;
+        this.baoXiangBgm = baoXiangBgm;
+    }
+    stop() {
+        this.baoXiangBgm.stop();
+        this.csBgm.stop();
+        this.slotBgm.stop();
+        this.openBgm.stop();
+    }
+
+    playOpenBgm() {
+        this.stop();
+        this.openBgm.seek(0);
+        this.openBgm.play();
+    }
+
+    playSlotBgm() {
+        this.stop();
+        this.slotBgm.seek(0);
+        this.slotBgm.play();
+    }
+
+    playCsBgm() {
+        this.stop();
+        this.csBgm.seek(0);
+        this.csBgm.play();
+    }
+
+    playBaoXiangBgm() {
+        this.stop();
+        this.baoXiangBgm.seek(0);
+        this.baoXiangBgm.play();
+    }
+}
+
+export default AudioManager;
diff --git a/common/config.js b/common/config.js
index 28313d7..54edf6a 100644
--- a/common/config.js
+++ b/common/config.js
@@ -8,7 +8,7 @@ import RequestManager from '@/common/request.js'
 let configData = null;
 let isLoading = false;
 let loadPromise = null;
-const wx_version = "111";
+const wx_version = "113";
 
 // 白名单页面（不需要登录即可访问）
 export const whiteList = [
diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js
index b8d0bff..5f2dd76 100644
--- a/common/platform/AppPlatform.js
+++ b/common/platform/AppPlatform.js
@@ -20,41 +20,9 @@ class AppPlatform extends BasePlatform {
     getPayData(url, data) {
         return data;
     }
-    // async getPlatformConfig() {
-    //     console.log("开启动态获取数据。。。。。。。。");
-    //     const res = await getPlatform();
-    //     if (this.config != null) {
-    //         if (this.config.isCheck != res.isCheck) {
-    //             uni.setStorageSync('platformConfig', res);
-    //             plus.runtime.restart();
-    //         }
-    //     }
-    //     this.config = res;
-    //     uni.setStorageSync('platformConfig', res);
-    // }
-    // async getConfig() {
-    //     // return new Promise((resolve, reject) => {
-    //     if (this.config) {
-    //         return this.config;
-    //     }
-    //     if (uni.getStorageSync('platformConfig')) {
-    //         this.config = uni.getStorageSync('platformConfig');
-    //         this.getPlatformConfig();
-    //         return this.config;
-    //     }
-    //     this.config = {
-    //         isCheck: true,
-    //         isWebPay: false,
-    //         version: '1.0.0',
-    //     };
-    //     this.getPlatformConfig();
-    //     // const res = await getPlatform();
-    //     // this.config = res;
-    //     return this.config;
-    // }
     AppLaunch(options) {
         console.log("AppLaunch", options);
-        // uni.hideTabBar({})
+ 
         this.getConfig().then(res => {
             console.log("AppLaunch", res);
             if (res.isCheck) {
@@ -96,7 +64,6 @@ class AppPlatform extends BasePlatform {
 
     getOrderNo(event) {
         return new Promise((resolve, reject) => {
-
             resolve(null);
         });
     }
diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index 0c8313a..0a4579c 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -19,7 +19,8 @@ class BasePlatform {
 	}
 	async getConfig() {
 		// return new Promise((resolve, reject) => {
-		if (this.config) {
+			console.log("获取配置", this.config);
+		if (this.config != null) {
 			return this.config;
 		}
 		const res = await getPlatform();
diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js
index 27e647c..7a87c7d 100644
--- a/common/platform/H5Platform.js
+++ b/common/platform/H5Platform.js
@@ -2,7 +2,7 @@ import BasePlatform from './BasePlatform';
 import eruda from 'eruda';
 import { parseQueryString } from '@/common/util';
 
- 
+
 
 class H5Platform extends BasePlatform {
     constructor() {
@@ -14,6 +14,7 @@ class H5Platform extends BasePlatform {
         if (erudaInstance != null && erudaInstance != "") {
             this.startDeb();
         }
+
         // eruda.init();
     }
     getPayData(url, data) {
@@ -144,7 +145,6 @@ class H5Platform extends BasePlatform {
             if (query['version'] != null) {
                 uni.setStorageSync('version', query['version']);
             }
-            // if(){}
             if (query['method'] != null && query['method'] == "alipay.trade.wap.pay.return" && query[
                 'out_trade_no'] != null) {
                 //支付宝跳转过来的
@@ -169,6 +169,12 @@ class H5Platform extends BasePlatform {
                 window.location.href = url;
             }
         }
+      
+        if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") {
+            uni.switchTab({
+                url: '/pages/shouye/index'
+            });
+        }
     }
     getOrderNo(event) {
         return new Promise((resolve, reject) => {
diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js
index ccd2ce2..c3df34c 100644
--- a/common/platform/MiniProgramPlatform.js
+++ b/common/platform/MiniProgramPlatform.js
@@ -15,7 +15,7 @@ class MiniProgramPlatform extends BasePlatform {
 		super();
 		this.code = 'MP-WEIXIN';
 		this.env = 'miniProgram';
-		
+
 	}
 
 	getPayData(url, data) {
@@ -212,6 +212,11 @@ class MiniProgramPlatform extends BasePlatform {
 		updateManager.onUpdateFailed(function (res) {
 			// 新的版本下载失败
 		});
+		if (options != null && options.path == "pages/index/index") {
+			uni.switchTab({
+				url: '/pages/shouye/index'
+			});
+		}
 	}
 	async getOrderNo(event) {
 		return new Promise(async (resolve, reject) => {
diff --git a/common/platform/WebAppPlatform.js b/common/platform/WebAppPlatform.js
index aae59e5..4e2b8ce 100644
--- a/common/platform/WebAppPlatform.js
+++ b/common/platform/WebAppPlatform.js
@@ -36,7 +36,6 @@ class WebAppPlatform extends H5Platform {
         // alert(`请手动分享：${url}`);
     }
 
-
     downloadFile(url) {
         return new Promise((resolve, reject) => {
             try {
diff --git a/components/detail-lucky/detail-bao-xiang.vue b/components/detail-lucky/detail-bao-xiang.vue
new file mode 100644
index 0000000..96a9ed6
--- /dev/null
+++ b/components/detail-lucky/detail-bao-xiang.vue
@@ -0,0 +1,106 @@
+<template>
+    <view>
+        <view class="content-container" :class="{ 'fade-out': isFadingOut }" v-if="isVisible && isInitialized">
+            <img id="animatedWebp" style="width:90%; height:50%" :src="webpUrl" alt="超神特效" />
+            <view
+                style="color: rgb(197 168 168);font-size: 19rpx;text-align: center;position: fixed;bottom: 10%;width: 99.5vw;">
+                动画结果因设备差异可能会显示异常，获得赏品以（恭喜获得）结果为准</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+
+    },
+    data() {
+        return {
+            isVisible: false, // 控制组件显示/隐藏
+            isInitialized: false, // 控制是否已初始化
+            webpUrl: "https://image.zfunbox.cn/static/image/lucky/baoxiang.webp",
+            isFadingOut: false, // 控制淡出动画
+        };
+    },
+    computed: {},
+    methods: {
+        // 初始化老虎机组件
+        init() {
+            this.isInitialized = true;
+            this.webpUrl = "";
+        },
+        playWebP() {
+            const webpImg = document.getElementById("animatedWebp");
+            // 重新加载图片实现从头播放
+            webpImg.src = ""; // 先清空
+            webpImg.src = "https://image.zfunbox.cn/static/image/lucky/baoxiang.webp"; // 重新设置相同的URL
+            webpImg.style.animationPlayState = "running";
+            if (this.bgmCtx && this.bgmCtx.csBgm) {
+                this.bgmCtx.csBgm.seek(0);
+                this.bgmCtx.csBgm.play();
+            }
+        },
+
+        pauseWebP() {
+            const webpImg = document.getElementById("animatedWebp");
+            webpImg.style.animationPlayState = "paused";
+        },
+        // 显示老虎机组件
+        show() {
+            if (!this.isInitialized) {
+                console.error("尚未初始化，请先调用init方法");
+                return this;
+            }
+            this.isVisible = true;
+            this.isFadingOut = false; // 重置淡出状态
+            this.webpUrl =
+                "https://image.zfunbox.cn/static/image/lucky/baoxiang.webp?v=" + new Date().getTime();
+            this.audioManager.playBaoXiangBgm();
+            // 设置动画结束后的淡出效果
+            setTimeout(() => {
+                // 开始淡出动画
+                this.isFadingOut = true;
+                // 等待淡出动画完成后再隐藏组件
+                setTimeout(() => {
+                    this.audioManager.stop();
+                    this.isVisible = false;
+                    this.$emit("end");
+                }, 400); // 淡出动画持续800ms
+
+            }, 3500); // 4秒后开始淡出（总时间仍维持在4.2秒左右）
+
+            return this;
+        },
+    },
+    mounted() {
+        // 不再自动初始化
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+// 内容容器样式
+.content-container {
+    width: 100%;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+    //background-image: url('https://image.zfunbox.cn/static/image/lucky/grand.webp');
+    background-size: cover;
+    background-position: center;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    opacity: 1;
+    transition: opacity 0.8s ease;
+}
+
+// 淡出动画样式
+.fade-out {
+    opacity: 0;
+}
+</style>
\ No newline at end of file
diff --git a/components/detail-lucky/detail-grand-prize.vue b/components/detail-lucky/detail-grand-prize.vue
index 50bf40f..5e89ab2 100644
--- a/components/detail-lucky/detail-grand-prize.vue
+++ b/components/detail-lucky/detail-grand-prize.vue
@@ -55,25 +55,14 @@ export default {
       this.isFadingOut = false; // 重置淡出状态
       this.webpUrl =
         "https://image.zfunbox.cn/static/image/lucky/grand.webp?v=" + new Date().getTime();
-
-      if (this.bgmCtx && this.bgmCtx.csBgm) {
-        console.log('播放超神音乐');
-        this.bgmCtx.slotBgm.stop();
-        this.bgmCtx.csBgm.stop();
-        this.bgmCtx.csBgm.seek(0);
-        this.bgmCtx.csBgm.play();
-      }
-
+      this.audioManager.playCsBgm();
       // 设置动画结束后的淡出效果
       setTimeout(() => {
         // 开始淡出动画
         this.isFadingOut = true;
-
         // 等待淡出动画完成后再隐藏组件
         setTimeout(() => {
-          if (this.bgmCtx && this.bgmCtx.csBgm) {
-            this.bgmCtx.csBgm.pause();
-          }
+          this.audioManager.stop();
           this.isVisible = false;
           this.$emit("end");
         }, 400); // 淡出动画持续800ms
diff --git a/components/detail-lucky/detail-lucky-canvas.vue b/components/detail-lucky/detail-lucky-canvas.vue
index b212858..030758c 100644
--- a/components/detail-lucky/detail-lucky-canvas.vue
+++ b/components/detail-lucky/detail-lucky-canvas.vue
@@ -7,24 +7,22 @@
             </view>
             <view class="slot-view" :class="'slot-view-' + currentMode">
                 <!-- 抽奖特效组件 -->
-                <SlotMachine ref="myLucky" :width="windowWidth" :height="slotHeight" :blocks="blocks" :slots="slots"
-                    :prizes="prizes" :defaultConfig="defaultConfig" @start="startCallBack" @end="endCallBack">
+                <SlotMachine ref="myLucky" v-if="internalMode != 0" :width="windowWidth" :height="slotHeight"
+                    :blocks="blocks" :slots="slots" :prizes="prizes" :defaultConfig="defaultConfig"
+                    @start="startCallBack" @end="endCallBack">
                 </SlotMachine>
             </view>
             <view style="color: #484848;font-size: 19rpx;text-align: center;padding-top: 20rpx;">
                 动画结果因设备差异可能会显示异常，获得赏品以（恭喜获得）结果为准</view>
             <view class="skip-animation" @click="skipAnimation" :style="[skipButtonStyle()]">跳过动画</view>
         </view>
-        <!-- <DetailGrandPrize ref="detailGrandPrize" @end="onLuckyEnd1" /> -->
-
     </view>
 </template>
 
 <script>
 // 导入抽奖特效组件
 import SlotMachine from "@/components/@lucky-canvas/uni/slot-machine";
-//超神特效
-import DetailGrandPrize from "@/components/detail-lucky/detail-grand-prize.vue";
+
 import { sleep } from '@/common/util'
 function shuffle(array) {
     for (let i = array.length - 1; i > 0; i--) {
@@ -38,8 +36,7 @@ function shuffle(array) {
 
 export default {
     components: {
-        SlotMachine,
-        DetailGrandPrize
+        SlotMachine
     },
     props: {
         // 抽奖特效模式: 1, 3, 5, 10 (分别代表1列、3列、5列、10列分两批)
@@ -52,10 +49,12 @@ export default {
         }
     },
     data() {
+
+        let windowWidth = uni.getSystemInfoSync().windowWidth;
         return {
             isVisible: false, // 控制组件显示/隐藏
             isInitialized: false, // 控制是否已初始化
-            windowWidth: "0px",
+            windowWidth: windowWidth + "px",
             blocks: [],
             slots: [],
             prizes: [],
@@ -69,7 +68,7 @@ export default {
             luckyMessage: "恭喜您获得奖品",
             luckyPrize: null,
             currentPrizeIndex: -1,
-            internalMode: 1, // 内部存储模式的状态
+            internalMode: 0, // 内部存储模式的状态
             skipButtonOpacity: 0, // 跳过按钮的透明度
             isSkip: false,
             isBatchMode: false, // 是否为批次模式
@@ -199,7 +198,7 @@ export default {
                 });
             }
 
-            this.windowWidth = windowWidth + "px";
+            // this.windowWidth = windowWidth + "px";
             this.slots = slots;
             this.prizes = prizes;
             // 标记为已初始化
@@ -453,8 +452,6 @@ export default {
                 this.$emit("luckyStop", "");
 
                 if (this.chaoShenIndex != -1) {
-                    // this.$refs.detailGrandPrize.init();
-                    // this.$refs.detailGrandPrize.show();
                     return;
                 }
 
diff --git a/components/detail-lucky/detail-lucky.vue b/components/detail-lucky/detail-lucky.vue
index 1096043..bfca353 100644
--- a/components/detail-lucky/detail-lucky.vue
+++ b/components/detail-lucky/detail-lucky.vue
@@ -3,6 +3,7 @@
 		<detailLucky ref="_detailLucky" @end="onLuckyEnd" @luckyPlay="startCallBack" @luckyStop="endCallBack">
 		</detailLucky>
 		<detailGrandPrize ref="_detailGrandPrize" @end="onLuckyEnd1" />
+
 	</view>
 </template>
 
@@ -16,6 +17,7 @@ import detailLucky from "./detail-lucky-canvas.vue";
 import detailLucky from "./detail-lucky-web.vue";
 //#endif
 import detailGrandPrize from "@/components/detail-lucky/detail-grand-prize.vue";
+
 import { sleep } from '@/common/util'
 
 export default {
@@ -42,22 +44,15 @@ export default {
 				this.$refs._detailGrandPrize.show();
 				return;
 			}
-			if (this.bgmCtx && this.bgmCtx.slotBgm) {
-				this.bgmCtx.slotBgm.stop();
-				this.bgmCtx.csBgm.stop();
-			}
-			this.$emit("end", []);
+			this.audioManager.stop();
+			this.$emit("end", isSkip);
 		},
 		onLuckyEnd1() {
-			if (this.bgmCtx && this.bgmCtx.slotBgm) {
-				this.bgmCtx.slotBgm.stop();
-				this.bgmCtx.csBgm.stop();
-			}
-			this.$emit("end", []);
+			this.audioManager.stop();
+			this.$emit("end", false);
 		},
 		// 初始化抽奖特效组件
 		init(prizeList, mode) {
-
 			this.prizeList = prizeList;
 			this.mode = mode;
 			//#ifdef H5 || MP
@@ -83,19 +78,13 @@ export default {
 		// 抽奖特效开始回调
 		startCallBack() {
 			console.log('开始回调');
-
-			// 播放抽奖音乐
-			if (this.bgmCtx && this.bgmCtx.slotBgm) {
-				this.bgmCtx.slotBgm.seek(0);
-				console.log('开始回调，播放音乐');
-				this.bgmCtx.slotBgm.play();
-			}
+			this.audioManager.playSlotBgm();
 
 		},
 
 		// 抽奖结束回调
 		endCallBack(prize) {
-			this.bgmCtx.slotBgm.stop();
+			this.audioManager.stop();
 		},
 
 		/**
diff --git a/components/detail-results/detail-results.vue b/components/detail-results/detail-results.vue
new file mode 100644
index 0000000..f149052
--- /dev/null
+++ b/components/detail-results/detail-results.vue
@@ -0,0 +1,341 @@
+<template>
+	<view>
+		<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
+			<view class="res-pop common_bg column center" @click="close">
+				<view class="res-pop-hd"></view>
+				<scroll-view class="res-pop-bd" scroll-y>
+					<view class="res-list">
+						<view class="res-item" v-for="(item, i) in prizeList" :key="i" @click.stop="onPrizeClick(item)">
+							<view class="pic center">
+								<image :src="item.goodslist_imgurl" lazy-load></image>
+								<view class="type-tag center"
+									:style="{ backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title) }">
+									{{ item.shang_title }}
+								</view>
+								<view class="num center">{{ item.prize_num || '1' }}</view>
+								<view v-if="item.doubling > 1" class="yu-tag-text ziti log-multiple-tag" style="">
+									x{{ item.doubling }}</view>
+								<view v-if="item.is_lingzhu > 0" class="yu-tag-text ziti log-lingzhu-tag" style="">
+								</view>
+								<view v-if="item.goodslist_type == 4||item.parent_goods_list_id != 0" class="yu-tag-text ziti baoxiang-tag" style="">
+								</view>
+							</view>
+							<view class="title hang1" style="text-align: center;">
+								<text> {{ item.goodslist_title }}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<view class="res-pop-ft">
+					<view class="btn-list">
+						<view class="ft-btn common_bg justify-center center" :style="{
+							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="continueDraw">
+							<text>继续抽</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<DetailBaoXiang ref="baoXiangPop" @end="onBaoXiangEnd"></DetailBaoXiang>
+		<uni-popup ref="resPop1" type="center" mask-background-color="rgba(0,0,0,0.8)">
+			<view class="res-pop common_bg column center" @click="close1">
+				<view class="res-pop-hd"></view>
+				<scroll-view class="res-pop-bd" scroll-y>
+					<view class="res-list">
+						<view class="res-item" v-for="(item, i) in baoXiangList" :key="i">
+							<view class="pic center">
+								<image :src="item.goodslist_imgurl" lazy-load></image>
+								<view class="type-tag center"
+									:style="{ backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title) }">
+									{{ item.shang_title }}
+								</view>
+								<view class="num center">{{ item.prize_num || '1' }}</view>
+								<view v-if="item.doubling > 1" class="yu-tag-text ziti log-multiple-tag" style="">
+									x{{ item.doubling }}</view>
+								<view v-if="item.is_lingzhu > 0" class="yu-tag-text ziti log-lingzhu-tag" style="">
+								</view>
+								<view v-if="item.goodslist_type == 4" class="yu-tag-text ziti baoxiang-tag" style="">
+								</view>
+							</view>
+							<view class="title hang1" style="text-align: center;">
+								<text> {{ item.goodslist_title }}</text>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+import DetailBaoXiang from '@/components/detail-lucky/detail-bao-xiang.vue'
+import { sleep } from '../../common/util'
+export default {
+	name: 'DetailResults',
+	components: {
+		DetailBaoXiang
+	},
+	data() {
+		return {
+			prizeData: [],
+			isSkip: false
+		}
+	},
+	computed: {
+		prizeList() {
+			if (this.isSkip) {
+				let t = this.prizeData.filter(item => item.goodslist_type != 4);
+				return t;
+			}
+			return this.prizeData.filter(item => item.parent_goods_list_id == 0)
+		},
+		baoXiangList() {
+			return this.prizeData.filter(item => item.parent_goods_list_id != 0)
+		}
+	},
+	methods: {
+		onBaoXiangEnd() {
+			console.log('宝箱特效结束');
+			this.$refs.resPop1.open();
+		},
+		async open(data, is_skip = false) {
+			this.prizeData = data;
+			this.isSkip = is_skip;
+			this.audioManager.playOpenBgm();
+			this.$refs.resPop.open();
+			if (this.baoXiangList.length > 0 && !this.isSkip) {
+				await sleep(800);
+				console.log('展示宝箱特效');
+				this.$refs.baoXiangPop.init();
+				this.$refs.baoXiangPop.show();
+			}
+		},
+		close() {
+			this.$refs.resPop.close()
+			this.$emit('close')
+		},
+		close1() {
+			this.$refs.resPop1.close()
+		},
+		onPrizeClick(item) {
+			if (item.goodslist_type == 4) {
+				this.$refs.resPop1.open();
+			}
+		},
+		toBag() {
+			this.$emit('to-bag')
+		},
+		continueDraw() {
+			this.$emit('continue-draw')
+		},
+		// 设置背景颜色
+		getBgColor(text) {
+			switch (text) {
+				case "普通":
+					return "#DAFF27";
+				case "黄金":
+					return "#9A8EF6";
+				case "欧皇":
+					return "#FFEB8E";
+				case "超神":
+					return "#FF8E8E";
+				default:
+					return "#DAFF27";
+			}
+		},
+		// 设置文字颜色
+		getTextColor(text) {
+			switch (text) {
+				case "普通":
+					return "#86AD46";
+				case "黄金":
+					return "#FFFFFF";
+				case "欧皇":
+					return "#DA8A50";
+				case "超神":
+					return "#FFEFB4";
+				default:
+					return "#86AD46";
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.res-pop {
+	width: 100%;
+	height: 100vh;
+	position: relative;
+	background: url($imgurl+'common/yb.png') no-repeat 0 0 / 100% 100%;
+
+	.res-pop-hd {
+		width: 380rpx;
+		height: 104rpx;
+		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;
+						border-radius: 18rpx;
+						font-weight: 400;
+						font-size: 14rpx;
+					}
+
+					.num {
+						position: absolute;
+						z-index: 2;
+						left: 50%;
+						transform: translateX(-50%);
+						bottom: 10rpx;
+						min-width: 42rpx;
+						height: 28rpx;
+						font-weight: 400;
+						font-size: 14rpx;
+						color: #ffffff;
+						background: rgba(0, 0, 0, 0.5);
+						border-radius: 18rpx;
+					}
+				}
+
+				.title {
+					width: 90%;
+					padding: 0rpx 10rpx;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #333333;
+					height: 60rpx;
+					line-height: 60rpx;
+				}
+			}
+		}
+	}
+
+	.res-pop-ft {
+		padding-top: 40rpx;
+
+		.btn-list {
+			width: 750rpx;
+			display: flex;
+			justify-content: space-evenly;
+
+			.ft-btn {
+				width: 200rpx;
+				height: 68rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+		}
+	}
+}
+
+.yu-tag-text {
+	position: absolute;
+	right: 10rpx;
+	bottom: 10rpx;
+	z-index: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	font-size: 32rpx;
+}
+
+.log-multiple-tag {
+	position: absolute;
+	z-index: 5;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	background: url($iconurl + "fanbei.png") no-repeat;
+	background-size: 100% 100%;
+	color: #000;
+	width: 68rpx;
+	height: 32rpx;
+	top: 12rpx;
+	right: 12rpx;
+	font-size: 22rpx;
+	line-height: 32rpx;
+}
+
+.log-lingzhu-tag {
+	position: absolute;
+	z-index: 5;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	background: url($iconurl + "lingzhu.png") no-repeat;
+	background-size: 100% 100%;
+	color: #000;
+	width: 68rpx;
+	height: 32rpx;
+	top: 12rpx;
+	right: 12rpx;
+	font-size: 22rpx;
+	line-height: 32rpx;
+}
+
+.baoxiang-tag {
+	position: absolute;
+	right: 15rpx;
+	top: 15rpx;
+	z-index: 5;
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #333;
+	border-radius: 30rpx;
+	background-image: url($iconurl + "baoxiang.png");
+	background-size: 100% 100%;
+	height: 32rpx;
+	width: 68rpx;
+}
+</style>
diff --git a/pages.json b/pages.json
index df8391e..c727979 100644
--- a/pages.json
+++ b/pages.json
@@ -116,14 +116,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/user/bi_jl",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "星钻记录",
-				"navigationBarTextStyle": "black"
-			}
-		},
 		{
 			"path": "pages/user/jf_jl",
 			"style": {
@@ -132,16 +124,6 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-		{
-			"path": "pages/user/sy_jl",
-			"style": {
-				"navigationBarBackgroundColor": "#222222",
-				"navigationBarTitleText": "奖励明细",
-				"navigationBarTextStyle": "black",
-				"navigationStyle": "custom"
-			}
-		},
-
 		{
 			"path": "pages/user/vip",
 			"style": {
diff --git a/pages/hegui/hegui.vue b/pages/hegui/hegui.vue
index 603a9ce..b51d3f9 100644
--- a/pages/hegui/hegui.vue
+++ b/pages/hegui/hegui.vue
@@ -187,7 +187,6 @@
 			<view class="send-pop relative">
 				<view class="send-pop-hd">
 					发货确认单
-
 					<view class="close icon" @click="close('sendPop')">
 						<image :src="$img('/static/img/close2.png')" lazy-load></image>
 					</view>
diff --git a/pages/mall/goods_info.vue b/pages/mall/goods_info.vue
deleted file mode 100644
index 2b49cfd..0000000
--- a/pages/mall/goods_info.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-	
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 79f7f94..5e3b4a2 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -69,7 +69,8 @@
 
 					</view>
 					<view class="br20 mt20" style="background: #FFFFFF;">
-						<view class="pay-type" @click="changePay(0)">
+						<view class="pay-type" @click="changePay(0)"
+							v-if="orderData != null && orderData.goodsExtend.pay_wechat == 1">
 							<view class="" style="width: 100%;	color: #333333;">
 								微信支付
 							</view>
@@ -79,7 +80,8 @@
 								<image v-else :src="$img1('common/check.png')" lazy-load></image>
 							</view>
 						</view>
-						<view class="pay-type" @click="changePay(1)">
+						<view class="pay-type" @click="changePay(1)"
+							v-if="orderData != null && orderData.goodsExtend.pay_currency2 == 1">
 
 							<view class="" style="width: 100%;	color: #333333;">
 								{{ $config.getAppSetting('currency2_name') }}
@@ -134,10 +136,6 @@
 			<PayDialog ref="payDialog" />
 		</view>
 	</page-container>
-
-
-
-
 </template>
 
 <script>
@@ -268,6 +266,11 @@ export default {
 
 						that.orderData = res.data
 						that.zhifu = 0;
+						if (that.orderData.goodsExtend.pay_wechat == 1) {
+							that.zhifu = 0;
+						} else if (that.orderData.goodsExtend.pay_currency2 == 1) {
+							that.zhifu = 1;
+						}
 						that.$refs.pop.open()
 					}
 				}
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index eac8c3d..bc28f96 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -123,40 +123,10 @@
 
 			<buy-notice ref="buyNotice"
 				@confirm="$c.noDouble(confirmSubmit, [1, buyNum, true], choujiangloading)"></buy-notice>
-			<!--中奖动画-->
-			<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
-				<view v-if="prizeData" class="res-pop common_bg column center">
-					<view class="res-pop-hd"></view>
-					<scroll-view class="res-pop-bd" scroll-y>
-						<view class="res-list">
-							<view class="res-item" v-for="(item, i) in prizeData.data" :key="i">
-								<view class="pic center">
-									<image :src="item.goodslist_imgurl" lazy-load></image>
-									<view class="type-tag center">{{ item.shang_title }}</view>
-									<view class="num center">{{ item.prize_num }}</view>
-								</view>
-								<view class="title hang1 flex center">
-									<text> {{ item.goodslist_title }}</text>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-
-					<view class="res-pop-ft mt20">
-						<view class="ft-btn common_bg justify-center center" :style="{
-							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')">
-							<text>继续抽</text>
-						</view>
-					</view>
-				</view>
-			</uni-popup>
+					<!-- 抽奖结果 -->
+			<detail-results ref="resPop" @to-bag="toBag" >
+			</detail-results>
+		 
 
 			<view v-if="aniShow" class="ani-pop">
 				<image :src="aniSrc" lazy-load></image>
@@ -167,7 +137,7 @@
 			<detail-preview-popup ref="localPreviewPopup"></detail-preview-popup>
 			<!-- 使用抽取的老虎机组件 -->
 			<DetailLucky ref="detailLucky" @end="onLuckyEnd" />
-			<DetailGrandPrize ref="detailGrandPrize" @end="onLuckyEnd" />
+ 
 			<PayDialog ref="payDialog" />
 		</view>
 	</page-container>
@@ -183,8 +153,8 @@ import DetailPreviewPopup from '@/components/detail-preview-popup/detail-preview
 import preview from '@/components/detail-preview-popup/index.js'
 // 导入抽取的抽奖组件
 import DetailLucky from "@/components/detail-lucky/detail-lucky.vue";
-//超神特效
-import DetailGrandPrize from "@/components/detail-lucky/detail-grand-prize.vue";
+ 
+import DetailResults from '@/components/detail-results/detail-results.vue'
 import { sleep } from '../../common/util'
 export default {
 	components: {
@@ -194,7 +164,7 @@ export default {
 		DetailButton,
 		DetailPreviewPopup,
 		DetailLucky,
-		DetailGrandPrize
+		DetailResults
 	},
 	data() {
 		return {
@@ -341,14 +311,9 @@ export default {
 			uni.setStorageSync('effectSwitch', value ? 1 : 0);
 		},
 		// 老虎机结束抽奖回调
-		onLuckyEnd(data) {
-			console.log("抽奖结束", data);
-			this.$refs.resPop.open();
-			// 获取所有中奖奖品
-			this.bgmCtx.openBgm.stop();
-			this.bgmCtx.openBgm.seek(0);
-			this.bgmCtx.openBgm.play();
-			
+		onLuckyEnd(isSkip) {
+			console.log("抽奖结束", isSkip);
+			this.$refs.resPop.open(this.prizeData.data, isSkip);
 		},
 		previewDetail(item) {
 			console.log(item);
@@ -443,12 +408,7 @@ export default {
 				this.isPrizeLoading = false;
 				uni.hideLoading();
 				if (!this.effectSwitch) {
-					this.onLuckyEnd([]);
-					return;
-				}
-
-				if (this.prizeData.data.length > 10) {
-					this.onLuckyEnd([]);
+					this.onLuckyEnd(true);
 					return;
 				}
 				await sleep(200);
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 4d93033..9532108 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -145,58 +145,8 @@
 				@button-click="confirmSubmit"></detail-button>
 
 			<!-- 抽奖结果 -->
-			<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
-				<view class="res-pop common_bg column center" @click="close('resPop')">
-					<view class="res-pop-hd"></view>
-					<scroll-view class="res-pop-bd" scroll-y>
-						<view class="res-list">
-							<view class="res-item" v-for="(item, i) in prizeData.data" :key="i">
-								<view class="pic center">
-									<image :src="item.goodslist_imgurl" lazy-load></image>
-									<view class="type-tag center"
-										:style="{ backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title) }">
-										{{ item.shang_title }}
-									</view>
-									<view class="num center">{{ item.prize_num || '1' }}</view>
-									<view v-if="item.doubling > 1" class="yu-tag-text ziti log-multiple-tag" style="">
-										x{{ item.doubling }}</view>
-									<view v-if="item.is_lingzhu > 0" class="yu-tag-text ziti log-lingzhu-tag" style="">
-									</view>
-
-								</view>
-								<view class="title hang1" style="text-align: center;">
-									<text> {{ item.goodslist_title }}</text>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-
-					<view class="res-pop-ft">
-						<view class="btn-list">
-							<view class="ft-btn common_bg justify-center center" :style="{
-								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="confirmSubmit([0, buyNum])">
-								<text>继续抽</text>
-							</view>
-						</view>
-
-						<!-- <view class="r-draw common_bg justify-center" :style="{
-						backgroundImage: `url(${$img1('common/chongzhi.png')})`
-					}" @click="$c.noDouble(doReDraw)">
-						<text class="draw-num">
-							重置×{{ prizeData && prizeData.data.length }}
-						</text>
-						<text class="num">(余{{ prizeData.item_card_count }})</text>
-					</view> -->
-					</view>
-				</view>
-			</uni-popup>
+			<detail-results ref="resPop" @to-bag="toBag" @continue-draw="confirmSubmit([0, buyNum])">
+			</detail-results>
 
 			<uni-popup ref="dPop" type="center" maskBackgroundColor="rgba(0,0,0,0.9)">
 				<view v-if="previewData" class="d-pop">
@@ -245,2128 +195,2143 @@
 
 		<!-- 使用抽取的老虎机组件 -->
 		<DetailLucky ref="detailLucky" @end="onLuckyEnd" />
-		<DetailGrandPrize ref="detailGrandPrize" @end="onLuckyEnd" />
+	 
 		<PayDialog ref="payDialog" />
 	</page-container>
 </template>
 
 <script>
-	import PageContainer from '@/components/page-container/page-container.vue'
-	import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
-	import DetailListItem from '@/components/detail-list-item/detail-list-item.vue'
-	import DetailButton from '@/components/detail-button/detail-button.vue'
-	// 导入预览组件和方法
-	import DetailPreviewPopup from '@/components/detail-preview-popup/detail-preview-popup.vue'
-	import preview from '@/components/detail-preview-popup/index.js'
-	import DetailWuxianLingzhu from '@/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue'
-	import DetailWuxianRage from '@/components/detail-wuxian-rage/detail-wuxian-rage.vue'
-	// 导入抽取的抽奖组件
-	import DetailLucky from "@/components/detail-lucky/detail-lucky.vue";
-	//超神特效
-	import DetailGrandPrize from "@/components/detail-lucky/detail-grand-prize.vue";
-	import PayDialog from '@/components/pay-dialog/pay-dialog.vue'
-	import {
-		sleep
-	} from '../../common/util'
-	export default {
-		components: {
-			PageContainer,
-			OrderConfirmPopup,
-			DetailListItem,
-			DetailButton,
-			DetailPreviewPopup,
-			DetailWuxianLingzhu,
-			DetailWuxianRage, // 注册新组件
-			DetailLucky,
-			DetailGrandPrize,
-			PayDialog
-		},
-		data() {
-			return {
-				userCoupon: null,
-				optData: '',
-				title: '',
-				buyNum: 0,
-				useMoney: true,
-				useIntegral: true,
-				useMoney2: true,
-				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-				downOption: {
-					auto: false
-				},
-				// 上拉加载的配置(可选, 绝大部分情况无需配置)
-				upOption: {
-					auto: false,
-					page: {
-						size: 15 // 每页数据的数量,默认10
-					}
-				},
-				tabList: {
-					1: {
-						title: '包含以下赠品'
-					},
-					2: {
-						title: '中赏记录'
-					}
-				},
-				tabCur: 1,
-				swCur: 0,
-				autoplay: false,
-				subTab: [],
-				subTabCur: 0,
-				pageData: '',
-				previewData: '',
-				orderData: '',
-				prizeData: '',
-				sendRuleData: '',
-				couponData: '',
-				isAgree: true,
-				aniShow: false,
-				logList: [],
-				choujiangloading: false,
-				goods: null,
-				productList: [],
-				isPrizeLoading: false, // 是否显示抽奖loading
-				effectSwitch: true, // 特效开关
-			}
-		},
-
-		computed: {
-			reChooseNum() {
-				if (!this.prizeData || this.prizeData.data.length <= 0) {
-					return 0
-				}
-
-				const arr = this.prizeData.data.filter(item => item.isChoose)
-				console.log(arr.length)
-
-				return arr.length
+import PageContainer from '@/components/page-container/page-container.vue'
+import OrderConfirmPopup from '@/components/order-confirm-popup/order-confirm-popup.vue'
+import DetailListItem from '@/components/detail-list-item/detail-list-item.vue'
+import DetailButton from '@/components/detail-button/detail-button.vue'
+// 导入预览组件和方法
+import DetailPreviewPopup from '@/components/detail-preview-popup/detail-preview-popup.vue'
+import preview from '@/components/detail-preview-popup/index.js'
+import DetailWuxianLingzhu from '@/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue'
+import DetailWuxianRage from '@/components/detail-wuxian-rage/detail-wuxian-rage.vue'
+// 导入抽取的抽奖组件
+import DetailLucky from "@/components/detail-lucky/detail-lucky.vue";
+//超神特效
+ 
+import PayDialog from '@/components/pay-dialog/pay-dialog.vue'
+import {
+	sleep
+} from '../../common/util'
+import DetailResults from '@/components/detail-results/detail-results.vue'
+export default {
+	components: {
+		PageContainer,
+		OrderConfirmPopup,
+		DetailListItem,
+		DetailButton,
+		DetailPreviewPopup,
+		DetailWuxianLingzhu,
+		DetailWuxianRage, // 注册新组件
+		DetailLucky,
+		PayDialog,
+		DetailResults
+	},
+	data() {
+		return {
+			userCoupon: null,
+			optData: '',
+			title: '',
+			buyNum: 0,
+			useMoney: true,
+			useIntegral: true,
+			useMoney2: true,
+			// 下拉刷新的配置(可选, 绝大部分情况无需配置)
+			downOption: {
+				auto: false
 			},
-			getGoodList() {
-				if (this.pageData?.goods_list?.data == null) {
-					return [];
+			// 上拉加载的配置(可选, 绝大部分情况无需配置)
+			upOption: {
+				auto: false,
+				page: {
+					size: 15 // 每页数据的数量,默认10
 				}
-				return this.pageData.goods_list.data;
+			},
+			tabList: {
+				1: {
+					title: '包含以下赠品'
+				},
+				2: {
+					title: '中赏记录'
+				}
+			},
+			tabCur: 1,
+			swCur: 0,
+			autoplay: false,
+			subTab: [],
+			subTabCur: 0,
+			pageData: '',
+			previewData: '',
+			orderData: '',
+			prizeData: '',
+			sendRuleData: '',
+			couponData: '',
+			isAgree: true,
+			aniShow: false,
+			logList: [],
+			choujiangloading: false,
+			goods: null,
+			productList: [],
+			isPrizeLoading: false, // 是否显示抽奖loading
+			effectSwitch: true, // 特效开关
+		}
+	},
+
+	computed: {
+		reChooseNum() {
+			if (!this.prizeData || this.prizeData.data.length <= 0) {
+				return 0
 			}
+
+			const arr = this.prizeData.data.filter(item => item.isChoose)
+			console.log(arr.length)
+
+			return arr.length
+		},
+		getGoodList() {
+			if (this.pageData?.goods_list?.data == null) {
+				return [];
+			}
+			return this.pageData.goods_list.data;
+		}
+	},
+
+	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}系列`,
+			imageUrl: this.pageData.goods.imgurl_detail,
+			path: '/pages/shouye/detail_wuxian' +
+				this.$c.qs({
+					goods_id: this.pageData.goods.id,
+					goods_num: this.pageData.goods.num,
+					pid: uni.getStorageSync('userinfo').ID
+				})
+		}
+	},
+
+	onLoad(options) {
+		this.optData = options;
+		console.log(options);
+		uni.$on('chooseCoupon', data => {
+			// console.log('data', data)
+			this.couponData = data
+			this.confirmSubmit([0, this.buyNum])
+		})
+		this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
+		this.$c.getRule(10).then(res => {
+			if (res.status == 1) {
+				this.sendRuleData = res.data
+			}
+		});
+
+	},
+
+	onShow() {
+		this.autoplay = true;
+		console.log('onShow', this);
+		this.$platform.getOrderNo(this).then(order_num => {
+			console.log("order_num", order_num);
+			if (order_num != null && order_num != "") {
+				this.getPrize(order_num);
+			}
+		});
+	},
+
+	onReady() {
+		// this.tabChange(this.tabCur)
+		this.getData();
+	},
+
+	onHide() {
+		this.autoplay = false
+	},
+
+	onUnload() {
+		uni.$off('chooseCoupon')
+	},
+
+	methods: {
+		onEffectSwitch(value) {
+			this.effectSwitch = value;
+			uni.setStorageSync('effectSwitch', value ? 1 : 0);
+		},
+		// 特效结束回调
+		onLuckyEnd(isSkip) {
+			console.log('onLuckyEnd', isSkip);
+			// 获取所有中奖奖品
+
+			console.log("抽奖结束", this.prizeData, this.effectSwitch);
+			this.$refs.resPop.open(this.prizeData.data, isSkip);
+		},
+		previewDetail(item, a) {
+
+			const obj = {
+				imgurl: a.imgurl,
+				title: a.title,
+				// shang_title: item.shang_title,
+				pro: '概率:' + this.$c.removeTrailingZeros(a.real_pro) + '%',
+				shang_info: {
+					title: item.shang_title,
+					color: item.shang_color
+				},
+				goods_type: a.goods_type,
+				id: a.id
+
+			}
+			let goods = {
+				id: item.goods_id,
+				num: 0,
+			};
+			// console.log(a);
+
+			// 使用本地引入的方法调用预览弹窗
+			preview({
+				productType: this.optData.type_text,
+				dataItem: obj,
+				goods: goods
+			}).then(() => {
+				console.log('预览弹窗打开成功');
+			});
+			// this.previewData = obj
+
+			// this.open('dPop')
 		},
 
-		onShareAppMessage() {
+		doReDraw() {
+			if (this.orderData.item_card_count <= 0) {
+				this.$c.toast({
+					title: '重置卡不足'
+				})
 
-			if (this.$refs["couponPop"] != null) {
-				var co = this.$refs["couponPop"].getfengxiaodata();
-				if (co != null) {
-					console.log(co);
-					return co;
+				return
+			}
+
+			const arr = this.prizeData.data.map(item => item.id)
+
+			if (arr.length <= 0) {
+				this.$c.toast({
+					title: '请选择重置赏品'
+				})
+				return
+			}
+
+			this.req({
+				url: 'item_card_chou',
+				data: {
+					goods_id: this.pageData.goods.id,
+					order_list_ids: arr.join(',')
+				},
+				success: res => {
+					if (res.status == 1) {
+						// this.close('resPop')
+						this.$refs.resPop.close();
+						this.doRefresh()
+						this.getPrize(res.data.order_num)
+					}
 				}
-			}
-
-			return {
-				title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`,
-				imageUrl: this.pageData.goods.imgurl_detail,
-				path: '/pages/shouye/detail_wuxian' +
-					this.$c.qs({
-						goods_id: this.pageData.goods.id,
-						goods_num: this.pageData.goods.num,
-						pid: uni.getStorageSync('userinfo').ID
-					})
-			}
-		},
-
-		onLoad(options) {
-			this.optData = options;
-			console.log(options);
-			uni.$on('chooseCoupon', data => {
-				// console.log('data', data)
-				this.couponData = data
-				this.confirmSubmit([0, this.buyNum])
 			})
-			this.effectSwitch = uni.getStorageSync('effectSwitch') === 1 || uni.getStorageSync('effectSwitch') === "";
-			this.$c.getRule(10).then(res => {
-				if (res.status == 1) {
-					this.sendRuleData = res.data
-				}
-			});
-
 		},
 
-		onShow() {
-			this.autoplay = true;
-			console.log('onShow', this);
-			this.$platform.getOrderNo(this).then(order_num => {
-				console.log("order_num", order_num);
-				if (order_num != null && order_num != "") {
-					this.getPrize(order_num);
-				}
-			});
+		swChange(e) {
+			this.swCur = e.detail.current
 		},
 
-		onReady() {
-			// this.tabChange(this.tabCur)
-			this.getData();
+		toggleCollect() {
+			this.req({
+				url: 'addCollect',
+				data: {
+					goods_id: this.pageData.goods.id
+				},
+				success: res => {
+					if (res.status == 1) {
+						this.getData()
+					}
+				}
+			})
 		},
 
-		onHide() {
-			this.autoplay = false
+		toBag() {
+
+			// this.close('resPop')
+			this.$refs.resPop.close();
+			this.$c.to({
+				type: 3,
+				url: '/pages/hegui/hegui'
+			})
 		},
 
-		onUnload() {
-			uni.$off('chooseCoupon')
+		toCoupon() {
+			this.$c.to({
+				url: '/pages/user/coupon',
+				query: {
+					type: 2,
+					total_price: this.orderData.order_total
+				}
+			})
 		},
 
-		methods: {
-			onEffectSwitch(value) {
-
-				this.effectSwitch = value;
-				uni.setStorageSync('effectSwitch', value ? 1 : 0);
-			},
-			// 老虎机结束抽奖回调
-			onLuckyEnd(data) {
-				console.log("抽奖结束");
-				this.$refs.resPop.open(); 
-				// 获取所有中奖奖品
-				this.bgmCtx.openBgm.stop();
-				this.bgmCtx.openBgm.seek(0);
-				this.bgmCtx.openBgm.play();
-			},
-			previewDetail(item, a) {
-
-				const obj = {
-					imgurl: a.imgurl,
-					title: a.title,
-					// shang_title: item.shang_title,
-					pro: '概率:' + this.$c.removeTrailingZeros(a.real_pro) + '%',
-					shang_info: {
-						title: item.shang_title,
-						color: item.shang_color
-					},
-					goods_type: a.goods_type,
-					id: a.id
-
-				}
-				let goods = {
-					id: item.goods_id,
-					num: 0,
-				};
-				// console.log(a);
-
-				// 使用本地引入的方法调用预览弹窗
-				preview({
-					productType: this.optData.type_text,
-					dataItem: obj,
-					goods: goods
-				}).then(() => {
-					console.log('预览弹窗打开成功');
-				});
-				// this.previewData = obj
-
-				// this.open('dPop')
-			},
-
-			doReDraw() {
-				if (this.orderData.item_card_count <= 0) {
-					this.$c.toast({
-						title: '重置卡不足'
-					})
-
-					return
-				}
-
-				const arr = this.prizeData.data.map(item => item.id)
-
-				if (arr.length <= 0) {
-					this.$c.toast({
-						title: '请选择重置赏品'
-					})
-					return
-				}
-
-				this.req({
-					url: 'item_card_chou',
-					data: {
-						goods_id: this.pageData.goods.id,
-						order_list_ids: arr.join(',')
-					},
-					success: res => {
-						if (res.status == 1) {
-							// this.close('resPop')
-							this.$refs.resPop.close();
-							this.doRefresh()
-							this.getPrize(res.data.order_num)
-						}
-					}
-				})
-			},
-
-			swChange(e) {
-				this.swCur = e.detail.current
-			},
-
-			toggleCollect() {
-				this.req({
-					url: 'addCollect',
-					data: {
-						goods_id: this.pageData.goods.id
-					},
-					success: res => {
-						if (res.status == 1) {
-							this.getData()
-						}
-					}
-				})
-			},
-
-			toBag() {
-				
-				// this.close('resPop')
-				this.$refs.resPop.close();
-				this.$c.to({
-					type: 3,
-					url: '/pages/hegui/hegui'
-				})
-			},
-
-			toCoupon() {
-				this.$c.to({
-					url: '/pages/user/coupon',
-					query: {
-						type: 2,
-						total_price: this.orderData.order_total
-					}
-				})
-			},
-
-			async getPrize(order_num) {
-				if (!order_num) {
-					return
-				}
-				if (!this.isPrizeLoading) {
-					this.isPrizeLoading = true;
-					uni.showLoading({
-						title: '加载中...'
-					});
-				}
-				let that = this;
-				await sleep(500);
-				const res = await this.$request.post('infinite_prizeorderlog', {
-					order_num
-				}, false);
-				if (res.status == 1) {
-					res.data.data.map(item => {
-						item.isChoose = false
-					})
-					console.log(res.data);
-
-					this.prizeData = res.data
-
-					if (res.data.data.length <= 0) {
-						this.getPrize(order_num)
-						return
-					}
-
-					if (that.buyNum == 0 || that.buyNum == null) {
-						if (res.data.prize_num != null) {
-							that.buyNum = res.data.prize_num;
-							this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
-
-						}
-					}
-					this.isPrizeLoading = false;
-					uni.hideLoading();
-					if (!this.effectSwitch) {
-						this.onLuckyEnd([]);
-						return;
-					}
-					await sleep(200);
-					let chaoshen = this.prizeData.data.findIndex(it => it.shang_id == 34);
-					//获取奖品下标
-					let resultIndices = this.prizeData.data.map(it => {
-						const index = this.getGoodList.findIndex(item => item.id == it
-							.goodslist_id);
-						return index;
-					});
-					this.$refs.detailLucky.startDrawWithResult(this, resultIndices, chaoshen);
-				}
-			},
-
-			changePay(type) {
-				if (type === 'useMoney') {
-					this.useMoney = !this.useMoney;
-				} else if (type === 'useIntegral') {
-					if (this.couponData != null && this.couponData.id != '') {
-						this.couponData = null;
-					}
-					this.useIntegral = !this.useIntegral;
-				} else if (type === 'useMoney2') {
-					this.useMoney2 = !this.useMoney2;
-				}
-				this.confirmSubmit([0, this.buyNum]);
-			},
-
-			confirmSubmit([type, num, flag]) {
-				if (type === 0) {
-					// 计算订单
-					this.calculateOrder(num);
-				} else if (type === 1) {
-					// 提交订单
-					this.submitOrder(num, flag).then(res => {
-						console.log(res);
-					});
-				}
-			},
-
-			// 计算订单金额
-			calculateOrder(num) {
+		async getPrize(order_num) {
+			if (!order_num) {
+				return
+			}
+			if (!this.isPrizeLoading) {
+				this.isPrizeLoading = true;
 				uni.showLoading({
-					title: '计算中...'
+					title: '加载中...'
 				});
+			}
+			let that = this;
+			await sleep(500);
+			const res = await this.$request.post('infinite_prizeorderlog', {
+				order_num
+			}, false);
+			if (res.status == 1) {
+				res.data.data.map(item => {
+					item.isChoose = false
+				})
+				console.log(res.data);
 
-				this.buyNum = num;
+				this.prizeData = res.data
 
-				// 处理优惠券与积分互斥
-				let coupon_id = (this.couponData && this.couponData.id) || ''
-				if (coupon_id != '' && this.useIntegral) {
-					this.useIntegral = false;
-				} else if (this.useIntegral && coupon_id != '') {
-					this.couponData = null;
-					coupon_id = '';
-				}
-
-				// 构建请求数据
-				let postData = {
-					goods_id: this.pageData.goods.id,
-					prize_num: this.buyNum,
-					use_money_is: this.useMoney ? 1 : 2,
-					use_integral_is: this.useIntegral ? 1 : 2,
-					use_money2_is: this.useMoney2 ? 1 : 2,
-					coupon_id: coupon_id,
-				};
-				this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
-				// 发送请求
-				this.req({
-					url: 'infinite_ordermoney',
-					data: postData,
-					success: res => {
-						if (res.status == 1) {
-							// 保存服务器返回的优惠券信息
-							if (res.data.coupon_id) {
-								this.couponData = {
-									id: res.data.coupon_id,
-									price: res.data.coupon_price
-								}
-							}
-							// 保存订单数据
-							this.orderData = res.data
-							// 显示订单确认弹窗
-							this.$nextTick(() => {
-								if (this.$refs.buyPop) {
-									this.$refs.buyPop.open()
-								} else {
-									console.error('buyPop组件未找到')
-								}
-							})
-						}
-						uni.hideLoading();
-					}
-				});
-			},
-
-			// 支付订单
-			async submitOrder(num, flag) {
-				this.choujiangloading = true;
-				uni.showLoading({
-					title: '提交订单中'
-				});
-
-				this.buyNum = num;
-
-				// 处理优惠券与积分互斥
-				let coupon_id = (this.couponData && this.couponData.id) || ''
-				if (coupon_id != '' && this.useIntegral) {
-					this.useIntegral = false;
-				} else if (this.useIntegral && coupon_id != '') {
-					this.couponData = null;
-					coupon_id = '';
-				}
-
-				// 检查是否需要显示购买提示
-				if (this.$refs.buyNotice.getIsShow() && !flag) {
-					this.$refs.buyNotice.getRule(6)
-					uni.hideLoading();
-					this.choujiangloading = false;
+				if (res.data.data.length <= 0) {
+					this.getPrize(order_num)
 					return
 				}
 
-				// 构建基础数据
-				let baseData = {
-					goods_id: this.pageData.goods.id,
-					prize_num: this.buyNum,
-					use_money_is: this.useMoney ? 1 : 2,
-					use_integral_is: this.useIntegral ? 1 : 2,
-					use_money2_is: this.useMoney2 ? 1 : 2,
-					coupon_id: coupon_id,
-				};
+				if (that.buyNum == 0 || that.buyNum == null) {
+					if (res.data.prize_num != null) {
+						that.buyNum = res.data.prize_num;
+						this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
 
-				// 获取支付数据
-				let postData = this.$platform.getPayData('infinite_orderbuy', baseData);
-
-				// 关闭确认弹窗
-				this.close('buyPop');
-				const res = await this.$request.post('infinite_orderbuy', postData);
-				console.log(res);
+					}
+				}
+				this.isPrizeLoading = false;
 				uni.hideLoading();
-				if (res.status == 1) {
-					if (res.data.status == 1) {
-						// 需要支付
-						const status = await this.$platform.pay({
-							data: res.data.res
-						}, this)
+				if (!this.effectSwitch) {
+					this.onLuckyEnd(true);
+					return;
+				}
+				await sleep(200);
+				let chaoshen = this.prizeData.data.findIndex(it => it.shang_id == 34);
+				//获取奖品下标
+				let tempData = this.prizeData.data.filter(it => it.parent_goods_list_id == 0);
+				let resultIndices = tempData.map(it => {
+					const index = this.getGoodList.findIndex(item => item.id == it
+						.goodslist_id);
+					return index;
+				});
+				this.$refs.detailLucky.startDrawWithResult(this, resultIndices, chaoshen);
+			}
+		},
 
-						if (status == 'success') {
-							// 支付成功
-							this.getPrize(res.data.order_num);
-							this.getData(false)
-							// this.doRefresh();
+		changePay(type) {
+			if (type === 'useMoney') {
+				this.useMoney = !this.useMoney;
+			} else if (type === 'useIntegral') {
+				if (this.couponData != null && this.couponData.id != '') {
+					this.couponData = null;
+				}
+				this.useIntegral = !this.useIntegral;
+			} else if (type === 'useMoney2') {
+				this.useMoney2 = !this.useMoney2;
+			}
+			this.confirmSubmit([0, this.buyNum]);
+		},
+
+		confirmSubmit([type, num, flag]) {
+			if (type === 0) {
+				// 计算订单
+				this.calculateOrder(num);
+			} else if (type === 1) {
+				// 提交订单
+				this.submitOrder(num, flag).then(res => {
+					console.log(res);
+				});
+			}
+		},
+
+		// 计算订单金额
+		calculateOrder(num) {
+			uni.showLoading({
+				title: '计算中...'
+			});
+
+			this.buyNum = num;
+
+			// 处理优惠券与积分互斥
+			let coupon_id = (this.couponData && this.couponData.id) || ''
+			if (coupon_id != '' && this.useIntegral) {
+				this.useIntegral = false;
+			} else if (this.useIntegral && coupon_id != '') {
+				this.couponData = null;
+				coupon_id = '';
+			}
+
+			// 构建请求数据
+			let postData = {
+				goods_id: this.pageData.goods.id,
+				prize_num: this.buyNum,
+				use_money_is: this.useMoney ? 1 : 2,
+				use_integral_is: this.useIntegral ? 1 : 2,
+				use_money2_is: this.useMoney2 ? 1 : 2,
+				coupon_id: coupon_id,
+			};
+			this.$refs.detailLucky.init(this.getGoodList, this.buyNum);
+			// 发送请求
+			this.req({
+				url: 'infinite_ordermoney',
+				data: postData,
+				success: res => {
+					if (res.status == 1) {
+						// 保存服务器返回的优惠券信息
+						if (res.data.coupon_id) {
+							this.couponData = {
+								id: res.data.coupon_id,
+								price: res.data.coupon_price
+							}
 						}
-					} else {
-						// 无需支付（如使用积分等）
-						this.$c.toast({
-							title: res.msg,
-							duration: 500,
-							success: () => {
-								this.getPrize(res.data.order_num);
-								this.getData(false)
+						// 保存订单数据
+						this.orderData = res.data
+						// 显示订单确认弹窗
+						this.$nextTick(() => {
+							if (this.$refs.buyPop) {
+								this.$refs.buyPop.open()
+							} else {
+								console.error('buyPop组件未找到')
 							}
 						})
 					}
+					uni.hideLoading();
 				}
+			});
+		},
+
+		// 支付订单
+		async submitOrder(num, flag) {
+			this.choujiangloading = true;
+			uni.showLoading({
+				title: '提交订单中'
+			});
+
+			this.buyNum = num;
+
+			// 处理优惠券与积分互斥
+			let coupon_id = (this.couponData && this.couponData.id) || ''
+			if (coupon_id != '' && this.useIntegral) {
+				this.useIntegral = false;
+			} else if (this.useIntegral && coupon_id != '') {
+				this.couponData = null;
+				coupon_id = '';
+			}
+
+			// 检查是否需要显示购买提示
+			if (this.$refs.buyNotice.getIsShow() && !flag) {
+				this.$refs.buyNotice.getRule(6)
+				uni.hideLoading();
 				this.choujiangloading = false;
+				return
+			}
 
-			},
+			// 构建基础数据
+			let baseData = {
+				goods_id: this.pageData.goods.id,
+				prize_num: this.buyNum,
+				use_money_is: this.useMoney ? 1 : 2,
+				use_integral_is: this.useIntegral ? 1 : 2,
+				use_money2_is: this.useMoney2 ? 1 : 2,
+				coupon_id: coupon_id,
+			};
 
-			doRefresh() {
-				this.getData()
+			// 获取支付数据
+			let postData = this.$platform.getPayData('infinite_orderbuy', baseData);
 
-				if (this.tabCur == 2) {
-					this.tabChange(this.tabCur)
-				}
-			},
+			// 关闭确认弹窗
+			this.close('buyPop');
+			const res = await this.$request.post('infinite_orderbuy', postData);
+			console.log(res);
+			uni.hideLoading();
+			if (res.status == 1) {
+				if (res.data.status == 1) {
+					// 需要支付
+					const status = await this.$platform.pay({
+						data: res.data.res
+					}, this)
 
-			subTabChange(i) {
-				this.subTabCur = i
-				this.logList = []
-
-				this.$nextTick(() => {
-					setTimeout(() => {
-						this.mescroll.resetUpScroll()
-					}, 100)
-				})
-			},
-
-			tabChange(i) {
-				if (i == this.tabCur) {
-					return;
-				}
-				this.tabCur = i
-
-				switch (Number(i)) {
-					case 1:
-						this.getData()
-						break
-					case 2:
-						this.subTabChange(this.subTabCur)
-						break
-				}
-			},
-
-			getLog({
-				num,
-				size
-			}) {
-				if (num > 1) return this.mescroll.endByPage(this.logList.length, 1)
-				this.req({
-					url: 'infinite_shang_log',
-					data: {
-						page: num,
-						goods_id: this.optData.goods_id,
-						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)
-
-							// console.log(this.logList)
-
-							// setTimeout(() => {
-							//   console.log(this.logList)
-							// }, 1000)
+					if (status == 'success') {
+						// 支付成功
+						this.getPrize(res.data.order_num);
+						this.getData(false)
+						// this.doRefresh();
+					}
+				} else {
+					// 无需支付（如使用积分等）
+					this.$c.toast({
+						title: res.msg,
+						duration: 500,
+						success: () => {
+							this.getPrize(res.data.order_num);
+							this.getData(false)
 						}
-					}
-				})
-			},
-
-			async getData(isLoading = true) {
-
-				const res = await this.$request.post("infinite_goodsdetail", {
-					goods_id: this.optData.goods_id
-				}, isLoading);
-				if (res.status == 1) {
-					this.goods = res.data.goods;
-					res.data.goodslist.forEach(item => {
-						this.$set(item, 'open', false)
 					})
-					if (res.data.goods.type_text) {
-						this.title = res.data.goods.type_text
-					}
-					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);
-
 				}
-			},
+			}
+			this.choujiangloading = false;
 
-			close(e) {
-				if (e === 'buyPop') {
-					if (this.$refs.buyPop) {
-						this.$refs.buyPop.close()
-					}
-				}else if(e === 'resPop') {
-					this.$refs.resPop.close()
-				} else {
-					this.$refs[e].close()
-				}
-				if (e == "resPop") {
-					
-					if (this.prizeData['user_coupon'] != null) {
-						this.$refs["couponPop"].open(this.prizeData['user_coupon']);
+		},
+
+		doRefresh() {
+			this.getData()
+
+			if (this.tabCur == 2) {
+				this.tabChange(this.tabCur)
+			}
+		},
+
+		subTabChange(i) {
+			this.subTabCur = i
+			this.logList = []
+
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.mescroll.resetUpScroll()
+				}, 100)
+			})
+		},
+
+		tabChange(i) {
+			if (i == this.tabCur) {
+				return;
+			}
+			this.tabCur = i
+
+			switch (Number(i)) {
+				case 1:
+					this.getData()
+					break
+				case 2:
+					this.subTabChange(this.subTabCur)
+					break
+			}
+		},
+
+		getLog({
+			num,
+			size
+		}) {
+			if (num > 1) return this.mescroll.endByPage(this.logList.length, 1)
+			this.req({
+				url: 'infinite_shang_log',
+				data: {
+					page: num,
+					goods_id: this.optData.goods_id,
+					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)
+
+						// console.log(this.logList)
+
+						// setTimeout(() => {
+						//   console.log(this.logList)
+						// }, 1000)
 					}
 				}
-			},
+			})
+		},
 
-			open(e) {
-				if (this.$refs[e]) {
-					this.$refs[e].open();
-				} else {
-					uni.showToast({
-						title: '找不到buyPop组件引用',
-						icon: 'none',
-					});
-					console.error('找不到buyPop组件引用');
+		async getData(isLoading = true) {
+
+			const res = await this.$request.post("infinite_goodsdetail", {
+				goods_id: this.optData.goods_id
+			}, isLoading);
+			if (res.status == 1) {
+				this.goods = res.data.goods;
+				res.data.goodslist.forEach(item => {
+					this.$set(item, 'open', false)
+				})
+				if (res.data.goods.type_text) {
+					this.title = res.data.goods.type_text
 				}
-			},
+				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);
 
-			// 设置背景颜色
-			getBgColor(text) {
-				switch (text) {
-					case "普通":
-						return "#DAFF27";
-						break;
-					case "黄金":
-						return "#9A8EF6";
-						break;
-					case "欧皇":
-						return "#FFEB8E";
-						break;
-					case "超神":
-						return "#FF8E8E";
-						break;
+			}
+		},
+
+		close(e) {
+			if (e === 'buyPop') {
+				if (this.$refs.buyPop) {
+					this.$refs.buyPop.close()
 				}
-			},
+			} else if (e === 'resPop') {
+				this.$refs.resPop.close()
+			} else {
+				this.$refs[e].close()
+			}
+			if (e == "resPop") {
 
-			// 设置文字颜色
-			getTextColor(text) {
-				switch (text) {
-					case "普通":
-						return "#86AD46";
-						break;
-					case "黄金":
-						return "#FFFFFF";
-						break;
-					case "欧皇":
-						return "#DA8A50";
-						break;
-					case "超神":
-						return "#FFEFB4";
-						break;
+				if (this.prizeData['user_coupon'] != null) {
+					this.$refs["couponPop"].open(this.prizeData['user_coupon']);
+				}
+			}
+		},
+
+		open(e) {
+			if (this.$refs[e]) {
+				this.$refs[e].open();
+			} else {
+				uni.showToast({
+					title: '找不到buyPop组件引用',
+					icon: 'none',
+				});
+				console.error('找不到buyPop组件引用');
+			}
+		},
+
+		// 设置背景颜色
+		getBgColor(text) {
+			switch (text) {
+				case "普通":
+					return "#DAFF27";
+					break;
+				case "黄金":
+					return "#9A8EF6";
+					break;
+				case "欧皇":
+					return "#FFEB8E";
+					break;
+				case "超神":
+					return "#FF8E8E";
+					break;
+			}
+		},
+
+		// 设置文字颜色
+		getTextColor(text) {
+			switch (text) {
+				case "普通":
+					return "#86AD46";
+					break;
+				case "黄金":
+					return "#FFFFFF";
+					break;
+				case "欧皇":
+					return "#DA8A50";
+					break;
+				case "超神":
+					return "#FFEFB4";
+					break;
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.navLeft {
+	position: fixed;
+	left: 30rpx;
+	z-index: 100;
+	height: 44px;
+
+	>view {
+		font-weight: 600;
+		font-size: 50rpx;
+		color: #FFFFFF;
+	}
+}
+
+
+.content {
+	padding: 0 0 0rpx;
+	background-color: #FFFFFF;
+
+	.boss-card {
+		margin: 0 auto -20rpx;
+		width: 690rpx;
+		height: 260rpx;
+		box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		padding: 50rpx 50rpx 0 40rpx;
+
+		.boss-l {
+			flex: 1;
+			padding-top: 10rpx;
+
+			.user {
+				display: flex;
+				align-items: center;
+
+				.avatar {
+					width: 100rpx;
+					height: 100rpx;
+					background: #9d9d9d;
+					border: 1px solid #cccccc;
+					border-radius: 50%;
+				}
+
+				.info {
+					width: 250rpx;
+					margin-left: 20rpx;
+
+					.name {
+						font-size: 32rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #ffffff;
+					}
+
+					.hang1 {}
+
+					.btn-text {
+						margin-top: 6rpx;
+						white-space: nowrap;
+
+						font-size: 36rpx;
+						font-family: YouSheBiaoTiHei;
+						font-weight: 400;
+						color: #d0d1ff;
+					}
+				}
+			}
+
+			.btn-list {
+				display: flex;
+				justify-content: flex-end;
+				margin-top: 20rpx;
+
+				.btn {
+					width: 110rpx;
+					height: 40rpx;
+					margin-left: 30rpx;
+
+					&.large {
+						width: 150rpx;
+					}
+				}
+
+				.btn {}
+
+				.large {}
+			}
+		}
+
+		.boss-r {
+			display: flex;
+			flex-flow: column nowrap;
+			align-items: center;
+			padding-left: 50rpx;
+
+			.pic {
+				width: 130rpx;
+				height: 130rpx;
+				border: 1px solid;
+				border-image: linear-gradient(90deg, #6adeff, #7ab5ff, #ff7feb) 1 1;
+				box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(176, 128, 255, 0.8);
+			}
+
+			.ling {
+				width: 142rpx;
+				height: 50rpx;
+			}
+		}
+	}
+
+	.header {
+		width: 750rpx;
+		height: 722rpx;
+		margin-top: 0rpx;
+		background-color: #D8D8D8;
+
+		&-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;
+		}
+
+		&-shoucang {
+			width: 65rpx;
+			height: 95rpx;
+			position: absolute;
+			right: 0;
+			top: 56rpx;
+			box-sizing: border-box;
+			// background: url($imgurl+'/common/shoucang.png') no-repeat 0 0 / 100% 100%;
+
+			>image {
+				width: 64rpx;
+				height: 64rpx;
+				// margin-top: 22rpx;
+			}
+
+			>text {
+				width: 100%;
+				text-align: center;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				margin-top: 4rpx;
+				// line-height: 66rpx;
+				text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+			}
+		}
+
+		&-suoxiang {
+			position: absolute;
+			width: 584rpx;
+			height: 120rpx;
+			background: rgba(0, 0, 0, 0.73);
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 390rpx;
+			z-index: 2;
+
+			>image:nth-of-type(1) {
+				width: 46rpx;
+				height: 46rpx;
+				border: 2rpx solid #FFFFFF;
+				border-radius: 50rpx;
+			}
+
+			>image:nth-of-type(2) {
+				width: 144rpx;
+				height: 68rpx;
+			}
+
+			>view:nth-of-type(1) {
+				width: 140rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #FFFFFF;
+			}
+
+			>view:nth-of-type(2) {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #FFFFFF;
+			}
+		}
+
+		&-title {
+			position: absolute;
+			padding: 0 20rpx;
+			width: 280rpx;
+			height: 44rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			bottom: 78rpx;
+			z-index: 10;
+
+			>text:nth-child(2n+1) {
+				font-weight: 400;
+				font-size: 18rpx;
+				color: #000000;
+			}
+
+			>text:nth-child(2) {
+				font-weight: 700;
+				font-size: 24rpx;
+				color: #000000;
+			}
+		}
+
+		&-canyu {
+			position: absolute;
+			left: 304rpx;
+			bottom: 142rpx;
+			z-index: 10;
+
+			&-imgs {
+				>image {
+					margin-left: -12rpx;
+					width: 32rpx;
+					height: 32rpx;
+					border-radius: 50rpx;
+				}
+			}
+
+			&-num {
+				font-weight: 400;
+				font-size: 20rpx;
+				margin-left: 8rpx;
+				color: #FFFFFF;
+				// text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
+			}
+		}
+
+		&-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%;
 				}
 			}
 		}
 	}
-</script>
 
-<style lang="scss">
-	.navLeft {
-		position: fixed;
-		left: 30rpx;
-		z-index: 100;
-		height: 44px;
+	.user-btns {
+		width: 690rpx;
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: absolute;
+		left: 0;
+		top: 60rpx;
+		z-index: 1;
 
-		>view {
-			font-weight: 600;
-			font-size: 50rpx;
-			color: #FFFFFF;
+		.user-num {
+			display: flex;
+			align-items: center;
+
+			font-size: 24rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #dddddd;
+
+			.user-list {
+				display: flex;
+				padding-left: 26rpx;
+				padding-right: 10rpx;
+
+				.avatar {
+					width: 50rpx;
+					height: 50rpx;
+					background: #7f7f7f;
+					border: 1px solid #cccccc;
+					border-radius: 50%;
+					box-sizing: border-box;
+					position: relative;
+					margin-left: -26rpx;
+				}
+			}
+		}
+
+		.btns {
+			display: flex;
+			align-items: center;
+
+			.btn {
+				display: flex;
+				align-items: center;
+				margin-left: 40rpx;
+
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #ffffff;
+
+				.icon {
+					width: 32rpx;
+					height: 32rpx;
+					margin-right: 6rpx;
+				}
+
+				&.pd {
+					padding-left: 60rpx;
+				}
+
+				&.dis {
+					filter: grayscale(1);
+				}
+			}
+
+			.btn {
+				.icon {}
+			}
 		}
 	}
 
+	.angry {
+		margin: 30rpx auto 0;
+		width: 690rpx;
+		height: 136rpx;
+		box-sizing: border-box;
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background: #3B3941;
+		border-radius: 24rpx 24rpx 24rpx 24rpx;
+		border: 2rpx solid #FFFFFF;
 
-	.content {
-		padding: 0 0 0rpx;
-		background-color: #FFFFFF;
+		.icon {
+			width: 100rpx;
+			height: 58rpx;
+		}
 
-		.boss-card {
-			margin: 0 auto -20rpx;
-			width: 690rpx;
-			height: 260rpx;
+		.ang-info {
+			width: 490rpx;
+
+			.ang-num {
+				text-align: center;
+				font-size: 24rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+
+			.progress {
+				margin-top: 10rpx;
+
+				::v-deep.cmd-progress-inner {
+					border-radius: 0;
+					background: #444444;
+				}
+			}
+
+			.tip {
+				margin-top: 20rpx;
+				display: flex;
+				font-size: 20rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #ffffff;
+				line-height: 20rpx;
+			}
+		}
+	}
+
+	.list {
+
+
+		.list-item {
 			box-sizing: border-box;
+
+			.list-title {
+				height: 52rpx;
+
+				>view:nth-child(1) {
+					>image {
+						width: 160rpx;
+						height: 72rpx;
+					}
+
+					>text {
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #FFFFFF;
+					}
+				}
+			}
+
+			.goods-list {
+				margin-top: 25rpx;
+				margin-bottom: 5rpx;
+				display: grid;
+				grid-template-columns: repeat(3, 31.5%);
+				gap: 30rpx 20rpx;
+
+				.goods-item {
+					display: inline-flex;
+					width: 220rpx;
+					background-color: #F8F8F8;
+					border-radius: 16rpx;
+					// height: 255rpx;
+
+					.pic {
+						width: 220rpx;
+						height: 220rpx;
+						border-radius: 12rpx;
+						position: relative;
+						margin: 0 auto;
+						background-color: #D8D8D8;
+						border-radius: 16rpx 16rpx 0rpx 0rpx;
+
+						.yu-tag {
+							position: absolute;
+							right: 10rpx;
+							bottom: 10rpx;
+							z-index: 1;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							font-weight: 400;
+							font-size: 32rpx;
+							color: #894DD3;
+							text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
+						}
+					}
+
+					.title {
+						text-align: left;
+						width: 200rpx;
+						margin: 20rpx auto 0;
+						font-size: 20rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+
+					.price {
+						width: 200rpx;
+						margin: 12rpx auto 24rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+
+	.sub-tab {
+		white-space: nowrap;
+		padding: 10rpx 0 10rpx;
+
+		.sub-tab-item {
+			display: inline-flex;
+			align-items: center;
+			justify-content: center;
+			min-width: 88rpx;
+			height: 44rpx;
+			margin-left: 30rpx;
+			// font-family: YouSheBiaoTiHei;
+			font-weight: 400;
+			font-size: 20rpx;
+			color: #333333;
+			background: #F5F5F5;
+			border-radius: 8rpx;
+			border: 2rpx solid rgba(#FFFFFF, 0.7);
+
+			&.act {
+				background: #E6F791;
+				// font-family: YouSheBiaoTiHei;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #333333;
+			}
+
+			&:last-child {
+				margin-right: 30rpx;
+			}
+		}
+
+	}
+
+	.log-list {
+		padding: 1rpx 30rpx 30rpx;
+
+		.log-item {
+			height: 144rpx;
+			padding: 0 20rpx;
 			display: flex;
-			justify-content: space-between;
-			padding: 50rpx 50rpx 0 40rpx;
+			align-items: center;
+			background: #F8F8F8;
+			margin-top: 24rpx;
+			position: relative;
+			/* 添加相对定位 */
 
-			.boss-l {
+			.avatar {
+				width: 80rpx;
+				height: 80rpx;
+				background: #9d9d9d;
+				border: 1px solid #cccccc;
+				border-radius: 50%;
+				overflow: hidden;
+			}
+
+			.info {
+				width: 230rpx;
+				margin-left: 20rpx;
+
+				.name {
+					font-size: 28rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #333333;
+				}
+
+				.hang1 {}
+
+				.time {
+					margin-top: 10rpx;
+					white-space: nowrap;
+
+					font-size: 24rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+
+			.prize {
 				flex: 1;
-				padding-top: 10rpx;
+				padding-left: 50rpx;
+				display: flex;
+				align-items: center;
 
-				.user {
+				.pic {
+					width: 100rpx;
+					height: 100rpx;
+				}
+
+				// >view:nth-child(2) {
+				// 	>view:nth-child(1) {
+				// 		padding: 0 20rpx;
+				// 		min-width: 68rpx;
+				// 		height: 32rpx;
+				// 		box-sizing: border-box;
+				// 		line-height: 40rpx;
+				// 		border-radius: 18rpx;
+				// 		font-size: 14rpx;
+				// 		color: #FFFFFF;
+				// 	}
+
+				// }
+
+				.title {
+					width: 120rpx;
+					margin-left: 10rpx;
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #333333;
+				}
+
+				.num {
+					font-size: 24rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+		}
+	}
+
+	/* **************************************** */
+	/* **************************************** */
+	/* **************************************** */
+
+	.fixed-btns {
+		position: fixed;
+		z-index: 10;
+		right: 20rpx;
+		bottom: 300rpx;
+
+		.btn {
+			width: 94rpx;
+			height: 110rpx;
+			margin-top: 40rpx;
+		}
+	}
+
+	.res-pop {
+		width: 100%;
+		height: 100vh;
+		position: relative;
+		background: url($imgurl+'common/yb.png') no-repeat 0 0 / 100% 100%;
+
+		.res-pop-hd {
+			width: 380rpx;
+			height: 104rpx;
+			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;
+							border-radius: 18rpx;
+							// background: url($imgurl+ 'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
+							font-weight: 400;
+							font-size: 14rpx;
+							// color: #F8F8F8;
+						}
+
+						.num {
+							position: absolute;
+							z-index: 2;
+							left: 50%;
+							transform: translateX(-50%);
+							bottom: 10rpx;
+							min-width: 42rpx;
+							height: 28rpx;
+							font-weight: 400;
+							font-size: 14rpx;
+							color: #ffffff;
+							background: rgba(0, 0, 0, 0.5);
+							border-radius: 18rpx;
+						}
+					}
+
+					.title {
+						width: 180rpx;
+						padding: 22rpx 0;
+						font-weight: 400;
+						font-size: 16rpx;
+						color: #333333;
+					}
+
+					.exchange {
+						padding: 10rpx 10rpx;
+						font-weight: 400;
+						font-size: 20rpx;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.res-pop-ft {
+			padding-top: 40rpx;
+
+			.btn-list {
+				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;
+				}
+			}
+
+			.r-draw {
+				margin: 50rpx auto 0;
+				width: 244rpx;
+				height: 116rpx;
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #0E7792;
+
+				>text {
+					margin-top: 36rpx;
+				}
+			}
+		}
+	}
+
+	.boss-pop {
+		width: 750rpx;
+		box-sizing: border-box;
+		padding: 0 46rpx 40rpx;
+		position: relative;
+		background: #F7F7F7;
+		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%;
+		}
+
+		.boss-pop-title {
+			padding: 40rpx 0;
+			text-align: center;
+			// font-family: YouSheBiaoTiHei;
+			font-weight: 400;
+			font-size: 44rpx;
+			color: #333333;
+		}
+
+		.boss-pop-guize {
+			position: absolute;
+			top: 24rpx;
+			right: 24rpx;
+			color: #FFFFFF;
+			font-size: 28rpx;
+
+			>image {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+
+		.close {
+			position: absolute;
+			width: 30rpx;
+			height: 30rpx;
+			top: 50rpx;
+			right: 36rpx;
+		}
+
+		.boss-avatar {
+			margin: 20rpx auto 0;
+			width: 686rpx;
+			height: 264rpx;
+			background-color: #FFFFFF;
+
+			>image:nth-child(1) {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 112rpx;
+				width: 98rpx;
+				height: 98rpx;
+				border-radius: 50%;
+				z-index: 1;
+			}
+
+			>image:nth-child(2) {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 181rpx;
+				height: 173rpx;
+				bottom: 80rpx;
+				z-index: 2;
+			}
+		}
+
+		.boss-name {
+			margin: 30rpx auto 0;
+			width: 200rpx;
+			text-align: center;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #333333;
+			left: 50%;
+			transform: translateX(-50%);
+			position: absolute;
+			bottom: 32rpx;
+		}
+
+		.hang1 {}
+
+		.boss-box {
+			margin: 70rpx auto 0;
+			width: 590rpx;
+			position: relative;
+			background: #3B3941;
+			border-radius: 22rpx;
+			padding: 30rpx;
+
+			.box-title {
+				color: #999999;
+
+				>text:nth-child(1) {
+					color: #999999;
+					font-size: 20rpx;
+					font-weight: bold;
+				}
+
+				>text:nth-child(2) {
+					font-size: 20rpx;
+					font-weight: 400;
+				}
+			}
+
+			.get-money {
+				margin-top: 30rpx;
+				font-size: 24rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #ffffff;
+
+				&-one {
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #999999;
+				}
+
+				// &-two {
+				// 	width: 34rpx;
+				// 	height: 34rpx;
+				// 	margin: 0 10rpx;
+				// }
+
+				&-three {
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #999999;
+				}
+			}
+		}
+
+		.common_bg {}
+
+		.boss-tab {
+			padding: 30rpx 0;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			.boss-tab-item {
+				width: 33%;
+				height: 60rpx;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #8A8A8A;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				text-align: center;
+				background-color: #FFFFFF;
+				border-radius: 8rpx;
+
+				&.act {
+					font-weight: 500;
+					font-size: 20rpx;
+					color: #333333;
+					background-color: #E6F791;
+					border-radius: 8rpx;
+				}
+			}
+		}
+
+		.list-wrap {
+			// height: 350rpx;
+
+			.boss-list {
+				display: flex;
+				flex-flow: row wrap;
+				justify-content: space-between;
+
+				.people-item {
+					display: flex;
+					align-items: center;
+					width: 30%;
+
+					.avatar {
+						width: 52rpx;
+						height: 52rpx;
+						background: #9d9d9d;
+						border-radius: 50%;
+						box-sizing: border-box;
+						overflow: hidden;
+					}
+
+					.name {
+						width: calc(100% - 70rpx);
+						box-sizing: border-box;
+						padding-left: 10rpx;
+
+						font-size: 20rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #999999;
+					}
+
+					.hang1 {}
+				}
+
+				.boss-log {
+					width: 100%;
+					box-sizing: border-box;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: space-between;
+					padding: 10rpx;
+
+					.avatar {
+						width: 60rpx;
+						height: 60rpx;
+						background: #9d9d9d;
+						// border: 1px solid #cccccc;
+						border-radius: 50%;
+						overflow: hidden;
+					}
+
+					.name {
+						width: 100rpx;
+						margin-left: 20rpx;
+						font-size: 20rpx;
+						// font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #999999;
+					}
+
+					.hang1 {}
+
+					.place {
+						margin-left: 30rpx;
+
+						font-size: 20rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #999999;
+
+						text {
+							padding-left: 4rpx;
+							color: #999999;
+						}
+					}
+
+					.time {
+						flex: 1;
+						padding-left: 30rpx;
+
+						font-size: 24rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #999999;
+					}
+				}
+
+				.boss-money {
+					width: 100%;
+					padding: 10rpx;
 					display: flex;
 					align-items: center;
 
 					.avatar {
-						width: 100rpx;
-						height: 100rpx;
+						width: 60rpx;
+						height: 60rpx;
 						background: #9d9d9d;
 						border: 1px solid #cccccc;
 						border-radius: 50%;
 					}
 
-					.info {
-						width: 250rpx;
+					.name {
+						width: 200rpx;
 						margin-left: 20rpx;
 
-						.name {
-							font-size: 32rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #ffffff;
-						}
-
-						.hang1 {}
-
-						.btn-text {
-							margin-top: 6rpx;
-							white-space: nowrap;
-
-							font-size: 36rpx;
-							font-family: YouSheBiaoTiHei;
-							font-weight: 400;
-							color: #d0d1ff;
-						}
-					}
-				}
-
-				.btn-list {
-					display: flex;
-					justify-content: flex-end;
-					margin-top: 20rpx;
-
-					.btn {
-						width: 110rpx;
-						height: 40rpx;
-						margin-left: 30rpx;
-
-						&.large {
-							width: 150rpx;
-						}
-					}
-
-					.btn {}
-
-					.large {}
-				}
-			}
-
-			.boss-r {
-				display: flex;
-				flex-flow: column nowrap;
-				align-items: center;
-				padding-left: 50rpx;
-
-				.pic {
-					width: 130rpx;
-					height: 130rpx;
-					border: 1px solid;
-					border-image: linear-gradient(90deg, #6adeff, #7ab5ff, #ff7feb) 1 1;
-					box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(176, 128, 255, 0.8);
-				}
-
-				.ling {
-					width: 142rpx;
-					height: 50rpx;
-				}
-			}
-		}
-
-		.header {
-			width: 750rpx;
-			height: 722rpx;
-			margin-top: 0rpx;
-			background-color: #D8D8D8;
-
-			&-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;
-			}
-
-			&-shoucang {
-				width: 65rpx;
-				height: 95rpx;
-				position: absolute;
-				right: 0;
-				top: 56rpx;
-				box-sizing: border-box;
-				// background: url($imgurl+'/common/shoucang.png') no-repeat 0 0 / 100% 100%;
-
-				>image {
-					width: 64rpx;
-					height: 64rpx;
-					// margin-top: 22rpx;
-				}
-
-				>text {
-					width: 100%;
-					text-align: center;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #FFFFFF;
-					margin-top: 4rpx;
-					// line-height: 66rpx;
-					text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
-				}
-			}
-
-			&-suoxiang {
-				position: absolute;
-				width: 584rpx;
-				height: 120rpx;
-				background: rgba(0, 0, 0, 0.73);
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 390rpx;
-				z-index: 2;
-
-				>image:nth-of-type(1) {
-					width: 46rpx;
-					height: 46rpx;
-					border: 2rpx solid #FFFFFF;
-					border-radius: 50rpx;
-				}
-
-				>image:nth-of-type(2) {
-					width: 144rpx;
-					height: 68rpx;
-				}
-
-				>view:nth-of-type(1) {
-					width: 140rpx;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				>view:nth-of-type(2) {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-				}
-			}
-
-			&-title {
-				position: absolute;
-				padding: 0 20rpx;
-				width: 280rpx;
-				height: 44rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 78rpx;
-				z-index: 10;
-
-				>text:nth-child(2n+1) {
-					font-weight: 400;
-					font-size: 18rpx;
-					color: #000000;
-				}
-
-				>text:nth-child(2) {
-					font-weight: 700;
-					font-size: 24rpx;
-					color: #000000;
-				}
-			}
-
-			&-canyu {
-				position: absolute;
-				left: 304rpx;
-				bottom: 142rpx;
-				z-index: 10;
-
-				&-imgs {
-					>image {
-						margin-left: -12rpx;
-						width: 32rpx;
-						height: 32rpx;
-						border-radius: 50rpx;
-					}
-				}
-
-				&-num {
-					font-weight: 400;
-					font-size: 20rpx;
-					margin-left: 8rpx;
-					color: #FFFFFF;
-					// text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
-				}
-			}
-
-			&-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%;
-					}
-				}
-			}
-		}
-
-		.user-btns {
-			width: 690rpx;
-			padding: 0 30rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			position: absolute;
-			left: 0;
-			top: 60rpx;
-			z-index: 1;
-
-			.user-num {
-				display: flex;
-				align-items: center;
-
-				font-size: 24rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #dddddd;
-
-				.user-list {
-					display: flex;
-					padding-left: 26rpx;
-					padding-right: 10rpx;
-
-					.avatar {
-						width: 50rpx;
-						height: 50rpx;
-						background: #7f7f7f;
-						border: 1px solid #cccccc;
-						border-radius: 50%;
-						box-sizing: border-box;
-						position: relative;
-						margin-left: -26rpx;
-					}
-				}
-			}
-
-			.btns {
-				display: flex;
-				align-items: center;
-
-				.btn {
-					display: flex;
-					align-items: center;
-					margin-left: 40rpx;
-
-					font-size: 28rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-
-					.icon {
-						width: 32rpx;
-						height: 32rpx;
-						margin-right: 6rpx;
-					}
-
-					&.pd {
-						padding-left: 60rpx;
-					}
-
-					&.dis {
-						filter: grayscale(1);
-					}
-				}
-
-				.btn {
-					.icon {}
-				}
-			}
-		}
-
-		.angry {
-			margin: 30rpx auto 0;
-			width: 690rpx;
-			height: 136rpx;
-			box-sizing: border-box;
-			padding: 0 30rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			background: #3B3941;
-			border-radius: 24rpx 24rpx 24rpx 24rpx;
-			border: 2rpx solid #FFFFFF;
-
-			.icon {
-				width: 100rpx;
-				height: 58rpx;
-			}
-
-			.ang-info {
-				width: 490rpx;
-
-				.ang-num {
-					text-align: center;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #FFFFFF;
-				}
-
-				.progress {
-					margin-top: 10rpx;
-
-					::v-deep.cmd-progress-inner {
-						border-radius: 0;
-						background: #444444;
-					}
-				}
-
-				.tip {
-					margin-top: 20rpx;
-					display: flex;
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-					line-height: 20rpx;
-				}
-			}
-		}
-
-		.list {
-
-
-			.list-item {
-				box-sizing: border-box;
-
-				.list-title {
-					height: 52rpx;
-
-					>view:nth-child(1) {
-						>image {
-							width: 160rpx;
-							height: 72rpx;
-						}
-
-						>text {
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #FFFFFF;
-						}
-					}
-				}
-
-				.goods-list {
-					margin-top: 25rpx;
-					margin-bottom: 5rpx;
-					display: grid;
-					grid-template-columns: repeat(3, 31.5%);
-					gap: 30rpx 20rpx;
-
-					.goods-item {
-						display: inline-flex;
-						width: 220rpx;
-						background-color: #F8F8F8;
-						border-radius: 16rpx;
-						// height: 255rpx;
-
-						.pic {
-							width: 220rpx;
-							height: 220rpx;
-							border-radius: 12rpx;
-							position: relative;
-							margin: 0 auto;
-							background-color: #D8D8D8;
-							border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-							.yu-tag {
-								position: absolute;
-								right: 10rpx;
-								bottom: 10rpx;
-								z-index: 1;
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								font-weight: 400;
-								font-size: 32rpx;
-								color: #894DD3;
-								text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
-							}
-						}
-
-						.title {
-							text-align: left;
-							width: 200rpx;
-							margin: 20rpx auto 0;
-							font-size: 20rpx;
-							font-weight: 400;
-							color: #333333;
-						}
-
-						.price {
-							width: 200rpx;
-							margin: 12rpx auto 24rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #333333;
-						}
-					}
-				}
-			}
-		}
-
-		.sub-tab {
-			white-space: nowrap;
-			padding: 10rpx 0 10rpx;
-
-			.sub-tab-item {
-				display: inline-flex;
-				align-items: center;
-				justify-content: center;
-				min-width: 88rpx;
-				height: 44rpx;
-				margin-left: 30rpx;
-				// font-family: YouSheBiaoTiHei;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #333333;
-				background: #F5F5F5;
-				border-radius: 8rpx;
-				border: 2rpx solid rgba(#FFFFFF, 0.7);
-
-				&.act {
-					background: #E6F791;
-					// font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #333333;
-				}
-
-				&:last-child {
-					margin-right: 30rpx;
-				}
-			}
-
-		}
-
-		.log-list {
-			padding: 1rpx 30rpx 30rpx;
-
-			.log-item {
-				height: 144rpx;
-				padding: 0 20rpx;
-				display: flex;
-				align-items: center;
-				background: #F8F8F8;
-				margin-top: 24rpx;
-				position: relative;
-				/* 添加相对定位 */
-
-				.avatar {
-					width: 80rpx;
-					height: 80rpx;
-					background: #9d9d9d;
-					border: 1px solid #cccccc;
-					border-radius: 50%;
-					overflow: hidden;
-				}
-
-				.info {
-					width: 230rpx;
-					margin-left: 20rpx;
-
-					.name {
-						font-size: 28rpx;
+						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #333333;
+						color: #ffffff;
 					}
 
 					.hang1 {}
 
-					.time {
-						margin-top: 10rpx;
-						white-space: nowrap;
+					.money {
+						flex: 1;
+						text-align: right;
 
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #999999;
-					}
-				}
+						color: #ffffff;
 
-				.prize {
-					flex: 1;
-					padding-left: 50rpx;
-					display: flex;
-					align-items: center;
-
-					.pic {
-						width: 100rpx;
-						height: 100rpx;
-					}
-
-					// >view:nth-child(2) {
-					// 	>view:nth-child(1) {
-					// 		padding: 0 20rpx;
-					// 		min-width: 68rpx;
-					// 		height: 32rpx;
-					// 		box-sizing: border-box;
-					// 		line-height: 40rpx;
-					// 		border-radius: 18rpx;
-					// 		font-size: 14rpx;
-					// 		color: #FFFFFF;
-					// 	}
-
-					// }
-
-					.title {
-						width: 120rpx;
-						margin-left: 10rpx;
-						font-weight: 400;
-						font-size: 24rpx;
-						color: #333333;
-					}
-
-					.num {
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #333333;
+						text {
+							padding-left: 10rpx;
+							color: #d0d1ff;
+						}
 					}
 				}
 			}
 		}
+	}
 
-		/* **************************************** */
-		/* **************************************** */
-		/* **************************************** */
+	.play-pop {
+		width: 680rpx;
+		box-sizing: border-box;
+		padding: 0 46rpx 40rpx;
+		position: relative;
+		background: #FFFFFF;
+		border-radius: 30rpx;
+		// border: 1px solid #7776AD;
 
-		.fixed-btns {
-			position: fixed;
-			z-index: 10;
-			right: 20rpx;
-			bottom: 300rpx;
-
-			.btn {
-				width: 94rpx;
-				height: 110rpx;
-				margin-top: 40rpx;
-			}
-		}
-
-		.res-pop {
-			width: 100%;
-			height: 100vh;
+		.play-pop-hd {
 			position: relative;
-			background: url($imgurl+'common/yb.png') no-repeat 0 0 / 100% 100%;
-
-			.res-pop-hd {
-				width: 380rpx;
-				height: 104rpx;
-				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;
-								border-radius: 18rpx;
-								// background: url($imgurl+ 'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
-								font-weight: 400;
-								font-size: 14rpx;
-								// color: #F8F8F8;
-							}
-
-							.num {
-								position: absolute;
-								z-index: 2;
-								left: 50%;
-								transform: translateX(-50%);
-								bottom: 10rpx;
-								min-width: 42rpx;
-								height: 28rpx;
-								font-weight: 400;
-								font-size: 14rpx;
-								color: #ffffff;
-								background: rgba(0, 0, 0, 0.5);
-								border-radius: 18rpx;
-							}
-						}
-
-						.title {
-							width: 180rpx;
-							padding: 22rpx 0;
-							font-weight: 400;
-							font-size: 16rpx;
-							color: #333333;
-						}
-
-						.exchange {
-							padding: 10rpx 10rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #FFFFFF;
-						}
-					}
-				}
-			}
-
-			.res-pop-ft {
-				padding-top: 40rpx;
-
-				.btn-list {
-					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;
-					}
-				}
-
-				.r-draw {
-					margin: 50rpx auto 0;
-					width: 244rpx;
-					height: 116rpx;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #0E7792;
-
-					>text {
-						margin-top: 36rpx;
-					}
-				}
-			}
+			top: -50rpx;
+			margin: 0 auto;
+			width: 460rpx;
+			height: 120rpx;
 		}
 
-		.boss-pop {
-			width: 750rpx;
-			box-sizing: border-box;
-			padding: 0 46rpx 40rpx;
-			position: relative;
-			background: #F7F7F7;
-			border-radius: 16rpx 16rpx 0rpx 0rpx;
+		.close {
+			padding: 30rpx 0;
 
-			&::after {
-				content: '';
-				position: absolute;
-				top: -62rpx;
-				left: 0;
-				width: 750rpx;
-				height: 62rpx;
-				// background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
-			}
-
-			.boss-pop-title {
-				padding: 40rpx 0;
-				text-align: center;
-				// font-family: YouSheBiaoTiHei;
-				font-weight: 400;
-				font-size: 44rpx;
+			.close-title {
+				font-weight: 500;
+				font-size: 28rpx;
 				color: #333333;
 			}
 
-			.boss-pop-guize {
-				position: absolute;
-				top: 24rpx;
-				right: 24rpx;
-				color: #FFFFFF;
-				font-size: 28rpx;
-
-				>image {
-					width: 30rpx;
-					height: 30rpx;
-				}
-			}
-
-			.close {
-				position: absolute;
+			.close-icon {
 				width: 30rpx;
 				height: 30rpx;
-				top: 50rpx;
-				right: 36rpx;
-			}
-
-			.boss-avatar {
-				margin: 20rpx auto 0;
-				width: 686rpx;
-				height: 264rpx;
-				background-color: #FFFFFF;
-
-				>image:nth-child(1) {
-					position: absolute;
-					left: 50%;
-					transform: translateX(-50%);
-					bottom: 112rpx;
-					width: 98rpx;
-					height: 98rpx;
-					border-radius: 50%;
-					z-index: 1;
-				}
-
-				>image:nth-child(2) {
-					position: absolute;
-					left: 50%;
-					transform: translateX(-50%);
-					width: 181rpx;
-					height: 173rpx;
-					bottom: 80rpx;
-					z-index: 2;
-				}
-			}
-
-			.boss-name {
-				margin: 30rpx auto 0;
-				width: 200rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #333333;
-				left: 50%;
-				transform: translateX(-50%);
-				position: absolute;
-				bottom: 32rpx;
-			}
-
-			.hang1 {}
-
-			.boss-box {
-				margin: 70rpx auto 0;
-				width: 590rpx;
-				position: relative;
-				background: #3B3941;
-				border-radius: 22rpx;
-				padding: 30rpx;
-
-				.box-title {
-					color: #999999;
-
-					>text:nth-child(1) {
-						color: #999999;
-						font-size: 20rpx;
-						font-weight: bold;
-					}
-
-					>text:nth-child(2) {
-						font-size: 20rpx;
-						font-weight: 400;
-					}
-				}
-
-				.get-money {
-					margin-top: 30rpx;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-
-					&-one {
-						font-weight: 400;
-						font-size: 26rpx;
-						color: #999999;
-					}
-
-					// &-two {
-					// 	width: 34rpx;
-					// 	height: 34rpx;
-					// 	margin: 0 10rpx;
-					// }
-
-					&-three {
-						font-weight: 400;
-						font-size: 26rpx;
-						color: #999999;
-					}
-				}
-			}
-
-			.common_bg {}
-
-			.boss-tab {
-				padding: 30rpx 0;
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-
-				.boss-tab-item {
-					width: 33%;
-					height: 60rpx;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #8A8A8A;
-					display: flex;
-					justify-content: space-around;
-					align-items: center;
-					text-align: center;
-					background-color: #FFFFFF;
-					border-radius: 8rpx;
-
-					&.act {
-						font-weight: 500;
-						font-size: 20rpx;
-						color: #333333;
-						background-color: #E6F791;
-						border-radius: 8rpx;
-					}
-				}
-			}
-
-			.list-wrap {
-				// height: 350rpx;
-
-				.boss-list {
-					display: flex;
-					flex-flow: row wrap;
-					justify-content: space-between;
-
-					.people-item {
-						display: flex;
-						align-items: center;
-						width: 30%;
-
-						.avatar {
-							width: 52rpx;
-							height: 52rpx;
-							background: #9d9d9d;
-							border-radius: 50%;
-							box-sizing: border-box;
-							overflow: hidden;
-						}
-
-						.name {
-							width: calc(100% - 70rpx);
-							box-sizing: border-box;
-							padding-left: 10rpx;
-
-							font-size: 20rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-						}
-
-						.hang1 {}
-					}
-
-					.boss-log {
-						width: 100%;
-						box-sizing: border-box;
-						display: flex;
-						flex-direction: row;
-						align-items: center;
-						justify-content: space-between;
-						padding: 10rpx;
-
-						.avatar {
-							width: 60rpx;
-							height: 60rpx;
-							background: #9d9d9d;
-							// border: 1px solid #cccccc;
-							border-radius: 50%;
-							overflow: hidden;
-						}
-
-						.name {
-							width: 100rpx;
-							margin-left: 20rpx;
-							font-size: 20rpx;
-							// font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-						}
-
-						.hang1 {}
-
-						.place {
-							margin-left: 30rpx;
-
-							font-size: 20rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-
-							text {
-								padding-left: 4rpx;
-								color: #999999;
-							}
-						}
-
-						.time {
-							flex: 1;
-							padding-left: 30rpx;
-
-							font-size: 24rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #999999;
-						}
-					}
-
-					.boss-money {
-						width: 100%;
-						padding: 10rpx;
-						display: flex;
-						align-items: center;
-
-						.avatar {
-							width: 60rpx;
-							height: 60rpx;
-							background: #9d9d9d;
-							border: 1px solid #cccccc;
-							border-radius: 50%;
-						}
-
-						.name {
-							width: 200rpx;
-							margin-left: 20rpx;
-
-							font-size: 24rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #ffffff;
-						}
-
-						.hang1 {}
-
-						.money {
-							flex: 1;
-							text-align: right;
-
-							font-size: 24rpx;
-							font-family: Source Han Sans CN;
-							font-weight: 400;
-							color: #ffffff;
-
-							text {
-								padding-left: 10rpx;
-								color: #d0d1ff;
-							}
-						}
-					}
-				}
 			}
 		}
 
-		.play-pop {
-			width: 680rpx;
-			box-sizing: border-box;
-			padding: 0 46rpx 40rpx;
-			position: relative;
-			background: #FFFFFF;
-			border-radius: 30rpx;
-			// border: 1px solid #7776AD;
+		.p-swiper {
+			margin-top: 10rpx;
+			width: 100%;
+			height: 300rpx;
 
-			.play-pop-hd {
-				position: relative;
-				top: -50rpx;
-				margin: 0 auto;
-				width: 460rpx;
-				height: 120rpx;
-			}
+			.p-item {
+				.play-pic {
+					margin: 0 auto 0;
+					width: 200rpx;
+					height: 200rpx;
+					position: relative;
 
-			.close {
-				padding: 30rpx 0;
+					.play-type {
+						position: absolute;
+						left: 50%;
+						top: 20rpx;
+						z-index: 1;
+						width: 120rpx;
+						border-radius: 20rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						transform: translateX(-50%);
 
-				.close-title {
-					font-weight: 500;
-					font-size: 28rpx;
+						text {
+							font-family: YouSheBiaoTiHei;
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #FFFFFF;
+							text-stroke: 1rpx #F42FEA;
+							-webkit-text-stroke: 1rpx #F42FEA;
+						}
+					}
+				}
+
+				.play-ling {
+					width: 180rpx;
+					height: 60rpx;
+					margin: 10rpx auto 0;
+				}
+
+				.play-name {
+					width: 310rpx;
+					margin: 16rpx auto 0;
+					text-align: center;
+
+					font-size: 20rpx;
+					// font-family: Source Han Sans CN;
+					font-weight: 400;
 					color: #333333;
 				}
-
-				.close-icon {
-					width: 30rpx;
-					height: 30rpx;
-				}
-			}
-
-			.p-swiper {
-				margin-top: 10rpx;
-				width: 100%;
-				height: 300rpx;
-
-				.p-item {
-					.play-pic {
-						margin: 0 auto 0;
-						width: 200rpx;
-						height: 200rpx;
-						position: relative;
-
-						.play-type {
-							position: absolute;
-							left: 50%;
-							top: 20rpx;
-							z-index: 1;
-							width: 120rpx;
-							border-radius: 20rpx;
-							display: flex;
-							justify-content: center;
-							align-items: center;
-							transform: translateX(-50%);
-
-							text {
-								font-family: YouSheBiaoTiHei;
-								font-weight: 400;
-								font-size: 28rpx;
-								color: #FFFFFF;
-								text-stroke: 1rpx #F42FEA;
-								-webkit-text-stroke: 1rpx #F42FEA;
-							}
-						}
-					}
-
-					.play-ling {
-						width: 180rpx;
-						height: 60rpx;
-						margin: 10rpx auto 0;
-					}
-
-					.play-name {
-						width: 310rpx;
-						margin: 16rpx auto 0;
-						text-align: center;
-
-						font-size: 20rpx;
-						// font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #333333;
-					}
-				}
-			}
-
-			.hang1 {}
-
-			.line {
-				margin: 0 auto 0;
-				width: 560rpx;
-				height: 1px;
-				background: #444444;
-			}
-
-			.rule-title {
-				width: 118rpx;
-				margin-left: 10rpx;
-				// font-family: YouSheBiaoTiHei;
-				font-weight: 400;
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-
-			.rule-text {
-				width: 560rpx;
-				height: 200rpx;
-				margin: 20rpx auto 0;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #8A8A8A;
 			}
 		}
 
-		.d-pop {
-			position: relative;
-			width: 564rpx;
-			box-sizing: border-box;
+		.hang1 {}
 
-			.pic {
+		.line {
+			margin: 0 auto 0;
+			width: 560rpx;
+			height: 1px;
+			background: #444444;
+		}
+
+		.rule-title {
+			width: 118rpx;
+			margin-left: 10rpx;
+			// font-family: YouSheBiaoTiHei;
+			font-weight: 400;
+			font-size: 32rpx;
+			color: #FFFFFF;
+		}
+
+		.rule-text {
+			width: 560rpx;
+			height: 200rpx;
+			margin: 20rpx auto 0;
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #8A8A8A;
+		}
+	}
+
+	.d-pop {
+		position: relative;
+		width: 564rpx;
+		box-sizing: border-box;
+
+		.pic {
+			width: 564rpx;
+			height: 564rpx;
+			border-radius: 16rpx;
+
+			>image {
 				width: 564rpx;
 				height: 564rpx;
 				border-radius: 16rpx;
-
-				>image {
-					width: 564rpx;
-					height: 564rpx;
-					border-radius: 16rpx;
-				}
-
-				>view {
-					width: 68rpx;
-					height: 32rpx;
-					position: absolute;
-					top: 24rpx;
-					left: 24rpx;
-					font-weight: 400;
-					font-size: 14rpx;
-					color: #FFFFFF;
-					box-sizing: border-box;
-					background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
-				}
 			}
 
-			.title {
-				margin: 40rpx auto 0;
-				width: 564rpx;
-				height: 82rpx;
-				box-sizing: border-box;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				box-sizing: border-box;
-				padding: 20rpx;
-				// border: 2rpx solid #894DD3;
-				border-radius: 12rpx;
-				background: #F5F5F5;
-
-				>text {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			.d-list {
-				display: flex;
-				flex-flow: row wrap;
-				justify-content: space-between;
-				padding: 20rpx 0 0;
-
-				.d-item {
-					margin-top: 14rpx;
-
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-				}
-			}
-
-			.close {
-				width: 48rpx;
-				height: 48rpx;
+			>view {
+				width: 68rpx;
+				height: 32rpx;
 				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translate(-50%, 160%);
+				top: 24rpx;
+				left: 24rpx;
+				font-weight: 400;
+				font-size: 14rpx;
+				color: #FFFFFF;
+				box-sizing: border-box;
+				background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
 			}
 		}
 
-
-		.ani-pop {
-			width: 100vw;
-			height: 100vh;
-			position: fixed;
-			left: 0;
-			top: 0;
-			z-index: 88;
+		.title {
+			margin: 40rpx auto 0;
+			width: 564rpx;
+			height: 82rpx;
+			box-sizing: border-box;
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			background: #000;
+			box-sizing: border-box;
+			padding: 20rpx;
+			// border: 2rpx solid #894DD3;
+			border-radius: 12rpx;
+			background: #F5F5F5;
 
-			image {
-				width: 100%;
-				height: 1624rpx;
+			>text {
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
 			}
 		}
+
+		.d-list {
+			display: flex;
+			flex-flow: row wrap;
+			justify-content: space-between;
+			padding: 20rpx 0 0;
+
+			.d-item {
+				margin-top: 14rpx;
+
+				font-size: 24rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #ffffff;
+			}
+		}
+
+		.close {
+			width: 48rpx;
+			height: 48rpx;
+			position: absolute;
+			left: 50%;
+			bottom: 0;
+			transform: translate(-50%, 160%);
+		}
 	}
 
-	.gradient-text {
-		background-image: linear-gradient(to right, #FF5722, #FFEB3B);
-		/* 从橙色到黄色的渐变 */
-		-webkit-background-clip: text;
-		background-clip: text;
-		-webkit-text-fill-color: transparent;
-		color: #FF5722;
-	}
 
-	.yu-tag-text {
-		position: absolute;
-		right: 10rpx;
-		bottom: 10rpx;
-		z-index: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-weight: 400;
-		font-size: 32rpx;
-
-	}
-
-
-	.item-info {
-		padding: 5rpx 0;
-	}
-
-	.item-title {
-		padding: 0 2%;
-		margin: 10rpx 0rpx 0rpx 0rpx;
-		width: 96%;
-		font-size: 21rpx;
-		text-align: left;
-		height: 35rpx;
-		line-height: 35rpx;
-		font-weight: 500;
-		color: #333333;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.item-probability {
-		padding: 0 2%;
-		margin: 1rpx 0;
-		width: 100%;
-		font-size: 21rpx;
-		text-align: left;
-		height: 35rpx;
-		line-height: 35rpx;
-		color: #f39205;
-	}
-
-	.item-price {
-		padding: 0 2%;
-		margin: 1rpx 0;
-		width: 100%;
-		font-size: 21rpx;
-		text-align: left;
-		height: 35rpx;
-		line-height: 35rpx;
-		color: #333333;
-	}
-
-	.log-tag {
-		padding: 0 20rpx;
-		min-width: 68rpx;
-		height: 32rpx;
-		box-sizing: border-box;
-		line-height: 32rpx;
-		border-radius: 18rpx;
-		font-size: 22rpx;
-		color: #FFFFFF;
-	}
-
-	.multiple-tag {
-
-		padding: 0 20rpx;
-		min-width: 50rpx;
-		height: 32rpx;
-		box-sizing: border-box;
-		line-height: 32rpx;
-		border-radius: 18rpx;
-
-		color: #FFFFFF;
-		background-color: #BBF3D0;
-		font-size: 22rpx;
-		margin-left: 6rpx;
-	}
-
-	/* 添加角标样式 */
-	.corner-tag {
-		position: absolute;
+	.ani-pop {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
 		left: 0;
 		top: 0;
-		background: url($iconurl + "fbs.png") no-repeat;
-		background-size: 100% 100%;
-		color: #FFFFFF;
-		font-size: 20rpx;
-		padding: 4rpx 12rpx;
-		border-radius: 0 0 12rpx 0;
-		z-index: 10;
-		min-width: 68rpx;
-		height: 32rpx;
-	}
-
-	.lingzhu-tag {
-		position: absolute;
-		left: 0;
-		top: 0;
-		background: url($iconurl + "lingzhu.png") no-repeat;
-		background-size: 100% 100%;
-		color: #FFFFFF;
-		font-size: 20rpx;
-		padding: 4rpx 12rpx;
-		border-radius: 0 0 12rpx 0;
-		z-index: 10;
-		min-width: 68rpx;
-		height: 32rpx;
-	}
-
-	.log-multiple-tag {
-		position: absolute;
-		z-index: 5;
+		z-index: 88;
 		display: flex;
 		justify-content: center;
 		align-items: center;
-		font-weight: 400;
-		background: url($iconurl + "fanbei.png") no-repeat;
-		background-size: 100% 100%;
-		color: #000;
-		width: 68rpx;
-		height: 32rpx;
-		// border-radius: 25rpx;
-		top: 12rpx;
-		right: 12rpx;
-		font-size: 22rpx;
-		line-height: 32rpx;
-	}
+		background: #000;
 
-	.log-lingzhu-tag {
-		position: absolute;
-		z-index: 5;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-weight: 400;
-		background: url($iconurl + "lingzhu.png") no-repeat;
-		background-size: 100% 100%;
-		color: #000;
-		width: 68rpx;
-		height: 32rpx;
-		// border-radius: 25rpx;
-		top: 12rpx;
-		right: 12rpx;
-		font-size: 22rpx;
-		line-height: 32rpx;
+		image {
+			width: 100%;
+			height: 1624rpx;
+		}
 	}
+}
+
+.gradient-text {
+	background-image: linear-gradient(to right, #FF5722, #FFEB3B);
+	/* 从橙色到黄色的渐变 */
+	-webkit-background-clip: text;
+	background-clip: text;
+	-webkit-text-fill-color: transparent;
+	color: #FF5722;
+}
+
+.yu-tag-text {
+	position: absolute;
+	right: 10rpx;
+	bottom: 10rpx;
+	z-index: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	font-size: 32rpx;
+
+}
+
+
+.item-info {
+	padding: 5rpx 0;
+}
+
+.item-title {
+	padding: 0 2%;
+	margin: 10rpx 0rpx 0rpx 0rpx;
+	width: 96%;
+	font-size: 21rpx;
+	text-align: left;
+	height: 35rpx;
+	line-height: 35rpx;
+	font-weight: 500;
+	color: #333333;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.item-probability {
+	padding: 0 2%;
+	margin: 1rpx 0;
+	width: 100%;
+	font-size: 21rpx;
+	text-align: left;
+	height: 35rpx;
+	line-height: 35rpx;
+	color: #f39205;
+}
+
+.item-price {
+	padding: 0 2%;
+	margin: 1rpx 0;
+	width: 100%;
+	font-size: 21rpx;
+	text-align: left;
+	height: 35rpx;
+	line-height: 35rpx;
+	color: #333333;
+}
+
+.log-tag {
+	padding: 0 20rpx;
+	min-width: 68rpx;
+	height: 32rpx;
+	box-sizing: border-box;
+	line-height: 32rpx;
+	border-radius: 18rpx;
+	font-size: 22rpx;
+	color: #FFFFFF;
+}
+
+.multiple-tag {
+
+	padding: 0 20rpx;
+	min-width: 50rpx;
+	height: 32rpx;
+	box-sizing: border-box;
+	line-height: 32rpx;
+	border-radius: 18rpx;
+
+	color: #FFFFFF;
+	background-color: #BBF3D0;
+	font-size: 22rpx;
+	margin-left: 6rpx;
+}
+
+/* 添加角标样式 */
+.corner-tag {
+	position: absolute;
+	left: 0;
+	top: 0;
+	background: url($iconurl + "fbs.png") no-repeat;
+	background-size: 100% 100%;
+	color: #FFFFFF;
+	font-size: 20rpx;
+	padding: 4rpx 12rpx;
+	border-radius: 0 0 12rpx 0;
+	z-index: 10;
+	min-width: 68rpx;
+	height: 32rpx;
+}
+
+.lingzhu-tag {
+	position: absolute;
+	left: 0;
+	top: 0;
+	background: url($iconurl + "lingzhu.png") no-repeat;
+	background-size: 100% 100%;
+	color: #FFFFFF;
+	font-size: 20rpx;
+	padding: 4rpx 12rpx;
+	border-radius: 0 0 12rpx 0;
+	z-index: 10;
+	min-width: 68rpx;
+	height: 32rpx;
+}
+
+.log-multiple-tag {
+	position: absolute;
+	z-index: 5;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	background: url($iconurl + "fanbei.png") no-repeat;
+	background-size: 100% 100%;
+	color: #000;
+	width: 68rpx;
+	height: 32rpx;
+	// border-radius: 25rpx;
+	top: 12rpx;
+	right: 12rpx;
+	font-size: 22rpx;
+	line-height: 32rpx;
+}
+
+.log-lingzhu-tag {
+	position: absolute;
+	z-index: 5;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-weight: 400;
+	background: url($iconurl + "lingzhu.png") no-repeat;
+	background-size: 100% 100%;
+	color: #000;
+	width: 68rpx;
+	height: 32rpx;
+	// border-radius: 25rpx;
+	top: 12rpx;
+	right: 12rpx;
+	font-size: 22rpx;
+	line-height: 32rpx;
+}
+
+.baoxiang-tag {
+	position: absolute;
+	right: 15rpx;
+	top: 15rpx;
+	z-index: 5;
+	font-weight: 400;
+	font-size: 24rpx;
+	color: #333;
+	border-radius: 30rpx;
+	background-image: url($iconurl + "baoxiang.png");
+	background-size: 100% 100%;
+	height: 32rpx;
+	width: 68rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 3959fa5..4baf1e6 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -120,13 +120,9 @@
 					<image class="img100" :src="$img1('common/close.png')"></image>
 				</view>
 			</view>
-
 		</uni-popup>
-		<!-- <tab-bar :index="0"></tab-bar> -->
 		<rule-pop ref="rulePop"></rule-pop>
-
 		<rule-pop ref="appNotice" notice-check></rule-pop>
-
 		<float-ball v-if="!$config.GetVersion()"></float-ball>
 
 		<!-- #ifdef MP -->
diff --git a/pages/user/my_coupon copy.vue b/pages/user/my_coupon copy.vue
deleted file mode 100644
index 76e00c7..0000000
--- a/pages/user/my_coupon copy.vue	
+++ /dev/null
@@ -1,475 +0,0 @@
-<template>
-  <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      title="欧气券"
-      color="#fff"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="back"
-    ></uni-nav-bar>
-
-    <view class="tab-list">
-      <view
-        @click="getlist(i + 1)"
-        v-for="(item, i) in arr"
-        :key="i"
-        class="tab-list-item"
-        :class="{
-          active: show == i + 1
-        }"
-      >
-        {{ item }}
-
-        <view v-if="show == i + 1" class="arrow"></view>
-      </view>
-    </view>
-    <!-- <view class="header">
-      <view class="qiehuan">
-        <view @click="getlist(i + 1)" v-for="(v, i) in arr" :key="i">
-          <view :class="show == i + 1 ? 'xzs' : 'wzs'">{{ v }}</view>
-          <view class="qiehuan_line" v-if="show == i + 1">
-            <image src="../../static/shouye/top.png"></image>
-          </view>
-        </view>
-      </view>
-    </view> -->
-    <!-- 内容 -->
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      :down="downOption"
-      @down="downCallback"
-      @up="upCallback"
-    >
-      <view
-        class="coupon common_bg"
-        v-for="(item, index) in aixuanArr"
-        :key="index"
-        :style="{
-          backgroundImage: `url(${$img('/static/img/coupon_bg.png')})`
-        }"
-      >
-        <view class="coupon_item">
-          <view class="coupon_item_1">
-            <view class="coupon-title">
-              <text>{{ item.title }}级</text>
-              欧气券
-            </view>
-            <view>
-              可随机开出
-              <text>{{ item.min }}-{{ item.max }}</text>
-              友达币
-            </view>
-          </view>
-          <view
-            v-if="show == 1"
-            class="coupon_r common_bg"
-            :style="{
-              'background-image': `url(${$img('/static/img/coupon_ljfx.png')})`
-            }"
-          >
-            <button
-              open-type="share"
-              :data-id="item.id"
-              :data-img="item.share_imgurl"
-              style="width: 100%; height: 100%"
-            >
-              <!-- 立即分享 -->
-            </button>
-          </view>
-          <view
-            class="coupon_r common_bg"
-            v-else
-            @click="kaiquan(item.id)"
-            :style="{
-              'background-image': `url(${$img('/static/img/coupon_ljkq.png')})`
-            }"
-          >
-            <!-- 立即开启 -->
-          </view>
-        </view>
-      </view>
-    </mescroll-body>
-
-    <!-- 奖品弹窗 -->
-    <uni-popup ref="pop_show" type="center">
-      <view
-        class="pop_jp common_bg"
-        :style="{
-          'background-image': `url(${$img(
-            '/static/img/coupon_prize_pop_bg.png'
-          )})`
-        }"
-      >
-        <view class="get-num">恭喜您获得{{ num }}个潮币</view>
-
-        <image :src="$img('/static/img/coupon_coin.png')"></image>
-
-        <!-- <view>
-          <text>恭喜获得{{ num }}个潮币</text>
-        </view> -->
-        <view
-          class="pop_btn common_bg"
-          @click="$refs.pop_show.close()"
-          :style="{
-            'background-image': `url(${$img('/static/img/coupon_kxsx.png')})`
-          }"
-        >
-          <!-- 知道了 -->
-        </view>
-      </view>
-    </uni-popup>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      z_imgPath: this.$z_img2,
-      arr: ['我的券', '参与中'],
-      show: 1,
-
-      downOption: {
-        auto: false
-      },
-      aixuanArr: [],
-
-      // 开券获得币的数量
-      num: ''
-    }
-  },
-  onLoad(e) {
-    if (e && e.show == 2) {
-      this.show = 2
-    }
-  },
-
-  onReady() {
-    // this.$refs.pop_show.open()
-  },
-
-  onShareAppMessage(e) {
-    console.log(e)
-    return {
-      title: '点击领取欧气券吧~',
-      imageUrl: e.target.dataset.img,
-      path:
-        '/pages/user/index?coupon_id=' +
-        e.target.dataset.id +
-        '&pid=' +
-        uni.getStorageSync('userinfo').ID
-    }
-  },
-  methods: {
-    back() {
-      let page = getCurrentPages()
-
-      if (page.length > 1) {
-        uni.navigateBack({ delta: 1 })
-      } else {
-        uni.switchTab({ url: '/pages/user/index' })
-      }
-    },
-
-    kaiquan(e) {
-      let that = this
-      that.req({
-        url: 'coupon_open',
-        data: {
-          coupon_id: e
-        },
-        success(res) {
-          if (res.status == 1) {
-            that.num = res.data
-            that.$refs.pop_show.open()
-            that.loadData(1)
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: 'none',
-              duration: 1500,
-              success() {
-                setTimeout(() => {
-                  that.loadData(1)
-                })
-              }
-            })
-          }
-        }
-      })
-    },
-    getlist(v) {
-      this.show = v
-      this.aixuanArr = []
-      this.mescroll.resetUpScroll()
-    },
-    downCallback() {
-      this.mescroll.resetUpScroll()
-    },
-    upCallback(page) {
-      this.loadData(page.num)
-    },
-    loadData(pageNo) {
-      let that = this
-      that.req({
-        url: 'coupon_list',
-        Loading: true,
-        data: {
-          page: pageNo,
-          type: that.show
-        },
-        success(res) {
-          that.mescroll.endByPage(res.data.data.length, res.data.last_page)
-          if (pageNo == 1) {
-            that.aixuanArr = res.data.data
-          } else {
-            that.aixuanArr = that.aixuanArr.concat(res.data.data)
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.mengban {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  background: rgba(0, 0, 0, 0.45);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-button::after {
-  border: none;
-}
-
-button {
-  background-color: transparent;
-  padding-left: 0;
-  padding-right: 0;
-  line-height: inherit;
-  border-radius: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: 28rpx;
-  color: #fff;
-}
-
-.sixiao {
-  position: absolute;
-  width: 92rpx;
-  height: 69rpx;
-  right: 20rpx;
-  bottom: 20rpx;
-}
-
-.sy_btn {
-  background: #96fffe !important;
-}
-
-.coupon_r {
-  height: 60rpx;
-  width: 143rpx;
-  // height: 74rpx;
-  // margin-top: 20rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  font-size: 24rpx;
-  box-sizing: border-box;
-
-  button {
-    padding: 0 36rpx;
-    font-size: 36rpx;
-    font-family: ZhenyanGB-Regular, ZhenyanGB;
-    font-weight: 400;
-    color: #290066;
-    letter-spacing: 1px;
-  }
-}
-
-.coupon_item_1 {
-  font-size: 28rpx;
-  color: #ffffff;
-  // padding-top: 88rpx;
-  box-sizing: border-box;
-  margin-left: 10rpx;
-
-  .coupon-title {
-    font-size: 44rpx;
-    font-family: zihun152hao-jijiachaojihei;
-    font-weight: 400;
-    color: transparent;
-
-    background: linear-gradient(0deg, #85dfff 0%, #ba39ff 100%);
-    background-clip: text;
-  }
-}
-
-.coupon_item {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 0;
-  box-sizing: border-box;
-  /* width: 690rpx;
-		height: 146rpx; */
-  /* background: url(../../static/mine/A_bg.png) no-repeat; */
-  /* background-size: 100% 100%; */
-  // margin-top: 24rpx;
-  position: relative;
-}
-
-.coupon {
-  display: flex;
-  align-items: center;
-  width: 700rpx;
-  height: 156rpx;
-  margin: 0rpx auto 24rpx;
-  /* background: #11141D; */
-  /* box-shadow: 0px 0px 10rpx 0px rgba(150, 255, 254, 0.7); */
-  padding: 0 30rpx;
-  box-sizing: border-box;
-  border-radius: 20rpx;
-}
-
-.qiehuan {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 16rpx;
-  width: 300rpx;
-}
-
-.qiehuan_line {
-  margin: -10rpx auto;
-  width: 40rpx;
-  height: 20rpx;
-  border-bottom: 4rpx solid #1ac762;
-  border-radius: 2rpx;
-}
-
-.qiehuan_line > image {
-  width: 30rpx;
-  height: 20rpx;
-}
-
-.qiehuan > view {
-  flex: 1;
-  text-align: center;
-}
-
-.wzs {
-  font-size: 34rpx;
-  color: rgba(255, 255, 255, 0.6);
-}
-
-.xzs {
-  font-size: 34rpx;
-  color: #ffffff;
-}
-
-.header {
-  width: 750rpx;
-  /* height: 176rpx; */
-  padding-bottom: 30rpx;
-  /* background: #222222; */
-  font-size: 28rpx;
-  color: #333333;
-  box-sizing: border-box;
-  position: fixed;
-  /* #ifdef MP */
-  top: 0;
-  /* #endif */
-  /* #ifndef MP */
-  top: 88rpx;
-  /* #endif */
-  z-index: 15;
-}
-
-.content {
-  width: 100vw;
-  min-height: 100vh;
-  // padding-top: 88rpx;
-  box-sizing: border-box;
-  background-attachment: fixed;
-  background-size: 100vw 100vh;
-}
-
-.tab-list {
-  display: flex;
-  padding: 30rpx;
-
-  .tab-list-item {
-    margin-right: 40rpx;
-    position: relative;
-
-    font-size: 28rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #999999;
-
-    .arrow {
-      position: absolute;
-      left: 50%;
-      bottom: -10rpx;
-      transform: translateX(-50%);
-      width: 32rpx;
-      height: 4rpx;
-      background: linear-gradient(90deg, #2dcbff 0%, #ff95fb 100%);
-      border-radius: 2rpx;
-    }
-
-    &.active {
-      color: transparent;
-      background: linear-gradient(90deg, #6adeff 0%, #7ab5ff 50%, #ff7feb 100%);
-      background-clip: text;
-    }
-  }
-}
-
-.pop_jp {
-  width: 534rpx;
-  height: 696rpx;
-  display: flex;
-  flex-flow: column nowrap;
-  align-items: center;
-
-  .get-num {
-    padding-top: 160rpx;
-
-    font-size: 32rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #ffffff;
-  }
-
-  image {
-    width: 324rpx;
-    height: 324rpx;
-    margin-top: 10rpx;
-  }
-
-  .pop_btn {
-    margin-top: 20rpx;
-    width: 256rpx;
-    height: 84rpx;
-  }
-}
-</style>
diff --git a/pages/user/sy_jl.vue b/pages/user/sy_jl.vue
deleted file mode 100644
index ad9ad0c..0000000
--- a/pages/user/sy_jl.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-	<view class="content pd20">
-		<!-- 内容 -->
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<uni-nav-bar left-icon="left" title="奖励明细" color="#fff" backgroundColor="transparent" :fixed="true"
-				:statusBar="true" :border="false" @clickLeft="back"></uni-nav-bar>
-			<view class="coupon">
-				<view v-for="(item, index) in aixuanArr" :key="index" class="coupon_item">
-					<view class="coupon_item_1">
-						<view>{{ item.content }}</view>
-						<view>{{ item.addtime }}</view>
-					</view>
-					<view class="coupon_r flex_center">
-						<text>{{ item.change_money }}</text>
-					</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				arr: ['全部', '收入', '花费'],
-				show: 1,
-				aixuanArr: [],
-				downOption: {
-					auto: false
-				}
-			}
-		},
-		onLoad(e) {
-			// setTimeout(() => {
-			//   this.aixuanArr = [
-			//     {
-			//       content: '邀请获得',
-			//       nickname:
-			//         '名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字',
-			//       addtime: '2333-23-23 23:23:23',
-			//       change_money: 233.33
-			//     },
-			//     {
-			//       content: '邀请获得',
-			//       nickname:
-			//         '名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字名字',
-			//       addtime: '2333-23-23 23:23:23',
-			//       change_money: 233.33
-			//     }
-			//   ]
-			// }, 1000)
-		},
-		methods: {
-			back() {
-				uni.navigateBack()
-			},
-
-			getlist(v) {
-				this.show = v
-				this.mescroll.resetUpScroll()
-			},
-			downCallback() {
-				this.mescroll.resetUpScroll()
-			},
-			upCallback(page) {
-				this.loadData(page.num)
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this
-				that.req({
-					url: 'invitation_commission',
-					Loading: true,
-					data: {
-						page: pageNo
-					},
-					success(res) {
-						that.mescroll.endByPage(res.data.data.length, res.data.last_page)
-						if (pageNo == 1) {
-							that.aixuanArr = res.data.data
-						} else {
-							that.aixuanArr = that.aixuanArr.concat(res.data.data)
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.coupon_r>image {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 10rpx;
-	}
-
-	.coupon_r {
-		font-weight: 500;
-		font-size: 28rpx;
-		color: #FFFFFF;
-	}
-
-	.coupon_item_1>view:nth-of-type(2) {
-		font-size: 24rpx;
-		color: #ccc;
-		margin-top: 10rpx;
-	}
-
-	.coupon_item_1>view:nth-of-type(1) {
-		font-size: 28rpx;
-		// font-weight: bold;
-		color: #ffffff;
-	}
-
-	.coupon_item {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		box-sizing: border-box;
-		border-bottom: 1px solid #FFFFFF;
-		margin-bottom: 20rpx;
-		position: relative;
-	}
-
-	.coupon {
-		width: 690rpx;
-		margin: 20rpx auto;
-		/* background: #11141D;
-		box-shadow: 0px 0px 10rpx 0px rgba(150, 255, 254, 0.7);
-		padding: 0 30rpx; */
-		box-sizing: border-box;
-		/* border-radius: 20rpx; */
-	}
-
-	.qiehuan {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		color: #333333;
-		width: 300rpx;
-	}
-
-	.qiehuan_line {
-		margin: auto;
-		width: 48rpx;
-		height: 4rpx;
-		background: #f96026;
-	}
-
-	.qiehuan>view {
-		flex: 1;
-		text-align: center;
-	}
-
-	.wzs {
-		font-size: 28rpx;
-		color: #999999;
-		margin-bottom: 10rpx;
-	}
-
-	.xzs {
-		font-size: 32rpx;
-		font-weight: bold;
-		margin-bottom: 10rpx;
-	}
-
-	.close {
-		text-align: left;
-	}
-
-	.close>image {
-		width: 48rpx;
-		height: 48rpx;
-	}
-
-	.head>view {
-		flex: 1;
-	}
-
-	.head {
-		width: 750rpx;
-		height: 88rpx;
-		padding: 0 20rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		/* font-family: 'zcq'; */
-		color: #ffffff;
-		font-size: 36rpx;
-		text-shadow: 0px 0px 10rpx rgba(150, 255, 254, 0.6);
-	}
-
-	.header {
-		width: 750rpx;
-		/* height: 176rpx; */
-		padding-bottom: 30rpx;
-		background: rgba(0, 0, 0, 0.8);
-		font-size: 28rpx;
-		color: #333333;
-		box-sizing: border-box;
-		position: fixed;
-		top: 0;
-		/* #ifdef MP */
-		padding-top: 24rpx;
-		/* #endif */
-		z-index: 15;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.content {
-		width: 100vw;
-		min-height: 100vh;
-		box-sizing: border-box;
-		padding-top: 1rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/user/tui-guang-old.vue b/pages/user/tui-guang-old.vue
deleted file mode 100644
index 4aba6a1..0000000
--- a/pages/user/tui-guang-old.vue
+++ /dev/null
@@ -1,539 +0,0 @@
-<template>
-	<view class="page-wrap">
-
-		<view class="top-bg">
-			<image :src="z_imgPath + 'tuiguang-bg.png'" />
-		</view>
-		<view class="gzbox" @click="$refs.shuoming.open()">
-			<image :src="z_imgPath+'yqgz.png'"></image>
-		</view>
-
-		<uni-popup ref="shuoming" type="center">
-			<view class="pop" :style="'background: url('+ z_imgPath + 'gz_bg.png'+ ') no-repeat 0 0 / 100% 100%;'">
-				<view class="pop_con">
-					<scroll-view scroll-y="true" style="height: 440rpx;">
-						<view v-html="news"></view>
-					</scroll-view>
-				</view>
-			</view>
-		</uni-popup>
-
-		<view class="card">
-			<view class="people-money">
-				<view class="people">
-					<image :src="z_imgPath+'yyq.png'" style="height:27rpx;width: 109rpx;"></image>
-					<view class="num"> {{ total }} <text>人</text> </view>
-				</view>
-				<view class="line"></view>
-				<view class="moneys">
-					<view class="content" @click="gotoPage('/pages/user/sy_jl')">
-						<image :src="z_imgPath+'jl.png'" style="height:27rpx;width: 145rpx;"></image>
-						<view class="money"> {{ commission }} <text>元</text> </view>
-					</view>
-					<view class="icon">
-						<image :src="z_imgPath+'point_right.png'" mode="scaleToFill" />
-					</view>
-				</view>
-			</view>
-			<button open-type="share" class="invite-btn">
-				<image :src="z_imgPath+'invite-btn.png'" />
-				<!-- 去邀请好友 -->
-			</button>
-
-		</view>
-
-		<view class="card two">
-
-			<image :src="z_imgPath + 'yqjl.png'" class="title-img" style="height: 33rpx;width: 156rpx;"></image>
-			<view class="list-wrap" :style="{height: upOption.isLock == false ? 'auto' : '510rpx' }">
-				<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getList"
-					:down="downOption" :up="upOption">
-					<view v-for="(item, i) of listData" :key="i" class="list-wrap-item">
-						<view class="content">
-							<view class="avatar">
-								<image :src="item.headimg" mode="scaleToFill" />
-							</view>
-							<view class="info">
-								<view class="info-hd">
-									<text style="color: #fff;">{{ item.nickname }}</text>
-									<text class="title">累计消费</text>
-								</view>
-								<view class="info-bd">
-									<text>{{ item.addtime }}</text>
-									<text class="money">¥{{ item.commission_money }}</text>
-								</view>
-							</view>
-						</view>
-						<view class="invite-name">
-							<!-- 邀请人：
-              <text>{{ item.parent_name }}</text> -->
-						</view>
-					</view>
-				</mescroll-body>
-			</view>
-			<view v-if="upOption.isLock" class="show-more">
-				<view v-if="listData.length > 3" @click="openUpPage" class="btn">
-					<view>查看更多</view>
-					<view class="icon">
-						<image :src=" z_imgPath + 'arrow-right-circle.png' " style="position: relative;bottom: 6rpx;"
-							mode="scaleToFill" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <blank :height="30"></blank> -->
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				z_imgPath: this.$z_img + 'mine/yaoqing/',
-				downOption: {
-					use: false,
-					auto: false
-				},
-				upOption: {
-					isLock: true,
-					auto: true,
-					page: {
-						size: 10 // 每页数据的数量,默认10
-					}
-				},
-				tabList: [{
-						name: '直推',
-						id: 1
-					},
-					{
-						name: '荐推',
-						id: 2
-					}
-				],
-				tabCur: 0,
-				pop_show: false,
-				userInfo: '',
-				listData: '',
-				news: '',
-				total: 0,
-				logo_image: '',
-				commission: 0,
-				pid: ''
-			}
-		},
-		onShareAppMessage() {
-			let that = this;
-			return {
-				title: "友达赏，正版潮玩手办一番赏",
-				imageUrl: that.logo_image,
-				path: "/pages/shouye/index?pid=" + uni.getStorageSync('userinfo').ID
-			};
-		},
-		onLoad() {
-			console.log(uni.getStorageSync('userinfo').ID)
-			this.getDanye(9)
-		},
-		methods: {
-			getDanye(e) {
-				let that = this;
-				that.req({
-					url: 'danye',
-					data: {
-						type: e
-					},
-					success(res) {
-						if (res.status == 1) {
-							that.news = res.data
-						}
-					}
-				})
-			},
-
-			openUpPage() {
-				this.upOption.isLock = false
-				this.mescroll.lockUpScroll(false)
-			},
-
-			getList({
-				num,
-				size
-			}) {
-				var that = this;
-				this.req({
-					url: 'invitation',
-					data: {
-						page: num,
-						per_page: size,
-						depth: this.tabList[this.tabCur].id
-					},
-					success: res => {
-						that.total = res.data.count
-						that.commission = res.data.money
-						that.logo_image = res.data.share_image
-						if (num == 1) {
-							this.listData = []
-						}
-						this.mescroll.endBySize(res.data.data.length, res.data.last_page)
-						this.listData = [...this.listData, ...res.data.data]
-					},
-					fail: err => {
-						console.log('err', err)
-						// this.mescroll.endErr()
-					}
-				})
-			},
-
-			/**
-			 * @description: tab栏切换
-			 * @param {*}
-			 * @return {*}
-			 */
-			tabChange(item, i) {
-				this.tabCur = i
-				this.mescroll.resetUpScroll()
-				// this.mescroll.scrollTo(0, 0)
-			},
-
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	button::after {
-		border: none;
-	}
-
-	button {
-		background-color: transparent;
-		padding-left: 0;
-		padding-right: 0;
-		line-height: inherit;
-		border-radius: 0;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-
-	}
-
-	image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.page-wrap {
-		background: #080808;
-		padding-bottom: 100rpx;
-		padding-top: 183rpx;
-		box-sizing: border-box;
-
-		::v-deep.uni-navbar__content {
-			z-index: 998;
-		}
-
-
-		.top-bg {
-			width: 750rpx;
-			height: 790rpx;
-			position: absolute;
-			left: 0;
-			top: 0;
-
-		}
-
-		.card {
-			position: relative;
-			z-index: 1;
-			margin: 299rpx auto 0;
-			width: 712rpx;
-			// height: 540rpx;
-			box-sizing: border-box;
-			border-radius: 20rpx;
-			// background: #fff;
-			padding: 10rpx 30rpx;
-
-			.title-img {
-				display: block;
-				margin: 0 auto;
-			}
-
-			.people-money {
-				display: flex;
-				align-items: center;
-				justify-content: space-evenly;
-				margin-top: 60rpx;
-				// padding: 40rpx 0;
-				border-radius: 10rpx;
-				// background: #000000;
-				color: #ffffff;
-
-				.people {
-					display: flex;
-					flex-flow: column nowrap;
-					align-items: center;
-
-
-					.num {
-						margin-top: 30rpx;
-						font-size: 36rpx;
-						font-weight: 400;
-						color: #F37400;
-
-						text {
-							font-size: 28rpx;
-							color: #fff;
-							margin-left: 6rpx;
-						}
-					}
-				}
-
-				.line {
-					height: 122rpx;
-					width: 0;
-					border-left: 1px solid rgba(255, 255, 255, 0.3);
-				}
-
-				.moneys {
-					display: flex;
-					align-items: center;
-
-					.content {
-						display: flex;
-						flex-flow: column nowrap;
-						align-items: center;
-
-
-
-						.money {
-							margin-top: 30rpx;
-							font-size: 36rpx;
-							color: #F37400;
-
-							text {
-								font-size: 28rpx;
-								color: #fff;
-								margin-left: 6rpx;
-							}
-						}
-					}
-
-					.icon {
-						width: 20rpx;
-						height: 32rpx;
-						margin-left: 10rpx;
-					}
-				}
-			}
-
-			.invite-btn {
-				width: 391rpx;
-				height: 74rpx;
-				margin: 10rpx auto 30rpx;
-				color: #FFFFFF;
-				text-align: center;
-				line-height: 88rpx;
-				border: none;
-
-			}
-
-
-		}
-
-		.two {
-			margin-top: 30rpx;
-			background: #151515;
-			padding-top: 35rpx;
-
-			.tab-wrap {
-				margin-top: 15rpx;
-				padding: 0 30rpx;
-				display: flex;
-				justify-content: space-around;
-				align-items: center;
-				background: #fff;
-				// width: 100%;
-				height: 88rpx;
-				position: relative;
-
-				.tab-item {
-					font-size: 28rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #999999;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-
-					.bar {
-						width: 48rpx;
-						height: 4rpx;
-						background: #61e3ff;
-						border-radius: 2rpx;
-						position: absolute;
-						bottom: 15rpx;
-						opacity: 0;
-					}
-
-					&.active {
-						color: #222;
-
-						.bar {
-							opacity: 1;
-						}
-					}
-				}
-			}
-
-			.list-wrap {
-				height: auto;
-				overflow: hidden;
-
-				&-item {
-					height: 140rpx;
-					display: flex;
-					flex-flow: column nowrap;
-					justify-content: space-evenly;
-					box-sizing: border-box;
-					border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-
-					.content {
-						display: flex;
-						justify-content: space-between;
-
-						.avatar {
-							width: 86rpx;
-							height: 86rpx;
-							border-radius: 50%;
-							overflow: hidden;
-							background: #eee;
-						}
-
-						.info {
-							width: calc(100% - 110rpx);
-
-							&-hd {
-								display: flex;
-								justify-content: space-between;
-								align-items: center;
-
-								font-size: 32rpx;
-								font-family: Source Han Sans CN;
-								font-weight: 400;
-								color: #333333;
-
-								.title {
-									font-size: 24rpx;
-									font-family: Source Han Sans CN;
-									font-weight: 400;
-									color: #999999;
-								}
-							}
-
-							&-bd {
-								margin-top: 10rpx;
-								display: flex;
-								justify-content: space-between;
-								align-items: center;
-
-								font-size: 24rpx;
-								font-family: Source Han Sans CN;
-								font-weight: 400;
-								color: #999999;
-
-								.money {
-									color: #F37400;
-									font-size: 28rpx;
-								}
-							}
-						}
-					}
-
-					.invite-name {
-						padding-left: 110rpx;
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #333333;
-
-						text {
-							color: #ef2200;
-						}
-					}
-				}
-			}
-
-			.show-more {
-				height: 70rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.btn {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-
-					font-size: 28rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #999999;
-
-					.icon {
-						width: 24rpx;
-						height: 24rpx;
-						margin-left: 10rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.gzbox {
-		width: 90rpx;
-		height: 75rpx;
-		position: absolute;
-		top: 74rpx;
-		left: 40rpx;
-	}
-
-	.gzbox>image {
-		width: 100%;
-		height: 100%;
-		// margin-right: 9rpx;
-		// margin-left: 20rpx;
-		position: relative;
-		// top: 6rpx;
-	}
-
-
-
-	.pop_con {
-		height: 440rpx;
-		margin: auto;
-		padding: 0rpx 36rpx;
-		font-size: 24rpx;
-		line-height: 36rpx;
-		color: #FFFFFF;
-		box-sizing: border-box;
-		overflow-y: scroll;
-	}
-
-	.pop_title {
-		// font-family: 'zcq';
-		font-size: 40rpx;
-		color: #96FFFE;
-		height: 128rpx;
-		line-height: 128rpx;
-		text-align: center;
-	}
-
-	.pop {
-		width: 543rpx;
-		height: 801rpx;
-		padding-top: 192rpx;
-		box-sizing: border-box;
-		/* background: #FFFFFF; */
-		/* border-radius: 20rpx; */
-	}
-</style>
diff --git a/pages/user/tui-guang.vue b/pages/user/tui-guang.vue
index 2481a9c..73ca99c 100644
--- a/pages/user/tui-guang.vue
+++ b/pages/user/tui-guang.vue
@@ -32,7 +32,7 @@
 						</view>
 					</view>
 					<view class="moneys">
-						<view class="content" @click="gotoPage('/pages/user/sy_jl')">
+						<view class="content">
 							<view>奖励总额</view>
 							<view class="money">
 								{{ commission }}

From e55ce53e045c4c20cd7112a55eee3ff8455c9c40 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 8 Jun 2025 22:54:24 +0800
Subject: [PATCH 2/3] 4444

---
 common/platform/MiniProgramPlatform.js        |  15 +-
 .../detail-lucky/detail-lucky-canvas.vue      | 382 +++---------------
 components/detail-lucky/detail-lucky.vue      |   2 +-
 pages/index/index.vue                         | 271 +++++++------
 4 files changed, 212 insertions(+), 458 deletions(-)

diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js
index c3df34c..b1a884d 100644
--- a/common/platform/MiniProgramPlatform.js
+++ b/common/platform/MiniProgramPlatform.js
@@ -212,11 +212,16 @@ class MiniProgramPlatform extends BasePlatform {
 		updateManager.onUpdateFailed(function (res) {
 			// 新的版本下载失败
 		});
-		if (options != null && options.path == "pages/index/index") {
-			uni.switchTab({
-				url: '/pages/shouye/index'
-			});
-		}
+		// setTimeout(() => {
+		// 	const currentPage = getCurrentPages().pop();
+		// 	console.log('currentPagecurrentPagecurrentPage', currentPage);
+		// }, 300);
+
+		// if (options != null && options.path == "pages/index/index") {
+		// 	uni.switchTab({
+		// 		url: '/pages/shouye/index'
+		// 	});
+		// }
 	}
 	async getOrderNo(event) {
 		return new Promise(async (resolve, reject) => {
diff --git a/components/detail-lucky/detail-lucky-canvas.vue b/components/detail-lucky/detail-lucky-canvas.vue
index 030758c..04ab6b9 100644
--- a/components/detail-lucky/detail-lucky-canvas.vue
+++ b/components/detail-lucky/detail-lucky-canvas.vue
@@ -76,7 +76,7 @@ export default {
             batchResults: [], // 保存批次结果
             batchCallback: null, // 批次模式回调
             batchIndices: [], // 批次索引
-            chaoShenIndex: -1,
+            prizeIndices: [],
             timers: {
                 skipButton: null,    // 控制跳过按钮渐显的定时器
                 firstBatch: null,    // 第一批次抽奖的定时器，用于控制第一批次停止时间
@@ -333,166 +333,28 @@ export default {
         },
 
         // 抽奖结束回调
-        endCallBack(prize) {
-            try {
-                console.log("[批次抽奖] endCallBack 被调用，批次模式:", this.isBatchMode, "当前模式:", this.internalMode, "批次计数:", this
-                    .batchCount);
-                if (this.isSkip) {
-                    return;
-                }
-                // 准备中奖信息
-                const prizeData =
-                    this.prizes[this.currentPrizeIndex]?.data || this.prizes[0]?.data;
-
-                if (!prizeData) {
-                    console.error("无法获取奖品数据");
-                    return;
-                }
-
-                // 获取所有中奖奖品
-                let allPrizes = [];
-
-                // 检查prize是否是数组，如果是则使用map，否则只使用当前prize
-                if (Array.isArray(prize)) {
-                    allPrizes = prize
-                        .map((item) => {
-                            const index = typeof item.index === "number" ? item.index : 0;
-                            return this.prizes[index]?.data || this.prizes[0]?.data;
-                        })
-                        .filter((item) => !!item);
-                } else if (prize && typeof prize.index === "number") {
-                    // 如果prize是单个对象
-                    const index = prize.index;
-                    const itemData = this.prizes[index]?.data;
-                    if (itemData) {
-                        allPrizes.push(itemData);
-                    }
-                } else {
-                    // 都不符合则使用当前索引的奖品
-                    allPrizes.push(prizeData);
-                }
-
-                // 准备返回结果
-                const result = {
-                    prize: prize,
-                    prizeData: prizeData, // 主要奖品数据
-                    allPrizes: allPrizes, // 所有中奖奖品数据
-                    message: `恭喜您获得 ${prizeData.title}`,
-                    prizeInfo: {
-                        name: prizeData.title,
-                        image: prizeData.imgurl,
-                        description: `价值：${prizeData.price} 元`,
-                        data: prizeData,
-                    },
-                };
-
-                // 批次模式处理
-                if (this.isBatchMode && this.internalMode === 10) {
-                    this.batchCount++;
-
-                    // 添加到批次结果
-                    this.batchResults.push(...allPrizes);
-
-                    console.log("[批次抽奖] 批次抽奖完成", this.batchCount, "共", this.batchResults.length, "个奖品");
-
-                    if (this.batchCount < 2) {
-                        // 第一批次完成，延时开始第二批次
-                        console.log("[批次抽奖] 第一批次完成，准备开始第二批次");
-                        this.timers.firstBatch = setTimeout(() => {
-                            console.log("[批次抽奖] 即将调用startSecondBatch");
-                            this.startSecondBatch();
-                        }, 800);
-                        return;
-                    } else {
-                        // 两批次都完成
-                        console.log("[批次抽奖] 两批次都完成，返回最终结果");
-                        const batchResult = {
-                            prize: prize,
-                            prizeData: prizeData,
-                            allPrizes: this.batchResults,
-                            message: `恭喜您获得 ${this.batchResults.length} 件奖品`,
-                            prizeInfo: {
-                                name: "批次抽奖",
-                                image: prizeData.imgurl,
-                                description: `共获得 ${this.batchResults.length} 件奖品`,
-                                data: this.batchResults,
-                            },
-                        };
-                        this.$emit("luckyStop", "");
-                        if (this.chaoShenIndex != -1) {
-                            // 重置批次状态
-                            this.isBatchMode = false;
-                            this.batchCount = 0;
-                            this.batchResults = [];
-                            // this.$refs.detailGrandPrize.init();
-                            // this.$refs.detailGrandPrize.show();
-                            return;
-                        }
-                        this.timers.drawResult = setTimeout(() => {
-
-                            // 发送中奖信息到父组件
-                            this.$emit("end", false);
-
-                            // 调用保存的批次回调
-                            if (this.batchCallback && typeof this.batchCallback === 'function') {
-                                console.log("[批次抽奖] 调用批次回调函数");
-                                this.batchCallback(batchResult);
-                                this.batchCallback = null;
-                            }
-
-                            // 重置批次状态
-                            this.isBatchMode = false;
-                            this.batchCount = 0;
-                            this.batchResults = [];
-                        }, 800);
-
-                        return;
-                    }
-                }
-                this.$emit("luckyStop", "");
-
-                if (this.chaoShenIndex != -1) {
-                    return;
-                }
-
-                this.timers.drawResult = setTimeout(() => {
-
-                    // 发送中奖信息到父组件
-                    this.$emit("end", false);
-
-                    // 调用startDrawWithResult方法中保存的回调函数
-                    if (this.drawResultCallback && typeof this.drawResultCallback === 'function') {
-                        this.drawResultCallback(result);
-                        // 清除回调，避免重复调用
-                        this.drawResultCallback = null;
-                    }
-                }, 800);
-
-            } catch (error) {
-                console.error("[批次抽奖] 处理抽奖结果时出错:", error);
-                this.hide();
-
-                // 如果有回调，通知调用者处理出错
-                if (this.drawResultCallback && typeof this.drawResultCallback === 'function') {
-                    this.drawResultCallback({
-                        success: false,
-                        error: error.message || "处理抽奖结果时出错"
-                    });
-                    this.drawResultCallback = null;
-                }
-
-                // 批次模式错误处理
-                if (this.isBatchMode && this.batchCallback) {
-                    this.batchCallback({
-                        success: false,
-                        error: error.message || "批次抽奖出错"
-                    });
-                    this.isBatchMode = false;
-                    this.batchCount = 0;
-                    this.batchResults = [];
-                    this.batchCallback = null;
-                }
+        async endCallBack(prize) {
+            if (this.isSkip) {
+                return;
             }
+            // 准备中奖信息
+            const prizeData =
+                this.prizes[this.currentPrizeIndex]?.data || this.prizes[0]?.data;
+
+            if (!prizeData) {
+                console.error("无法获取奖品数据");
+                return;
+            }
+            this.$emit("luckyStop", "");
+            if (this.prizeIndices.length > 0) {
+                await sleep(800);
+                // this.$refs.myLucky.init();
+                this.startDrawWithResult(this.prizeIndices);
+                return;
+            }
+            await sleep(800);
+            // 发送中奖信息到父组件
+            this.$emit("end", false);
         },
 
         // 强制结束抽奖
@@ -501,24 +363,9 @@ export default {
                 console.error("抽奖特效尚未初始化，请先调用init方法");
                 return this;
             }
-
-            this.$emit("luckyStop", "");
-            console.log("[跳过动画] 批次模式:", this.isBatchMode, "当前模式:", this.internalMode, "批次计数:", this.batchCount);
-
             this.hide();
-            let stopIndex = 0;
-            if (this.internalMode > 1) {
-                stopIndex = [];
-                let maxIndex = this.internalMode;
-                if (maxIndex > 5) {
-                    maxIndex = 5;
-                }
-                for (let i = 0; i < maxIndex; i++) {
-                    stopIndex.push(0);
-                }
-            }
             // 调用stop方法停止旋转
-            this.$refs.myLucky.stop(stopIndex);
+            this.$refs.myLucky.init();
             // 发送事件到父组件
             this.$emit("end", true);
             return this; // 返回this以支持链式调用
@@ -541,8 +388,7 @@ export default {
 
 
         // 停止抽奖并指定中奖索引
-        stopDraw(prizeIndices) {
-            console.log("stopDraw", prizeIndices);
+        async stopDraw(prizeIndices) {
 
             // 检查是否已初始化
             if (!this.isInitialized) {
@@ -554,10 +400,13 @@ export default {
                 console.error("抽奖特效组件未初始化");
                 return this;
             }
-
-            // 如果是批次模式，添加日志
-            if (this.isBatchMode && this.internalMode === 10) {
-                console.log("[批次抽奖] 停止抽奖，批次:", this.batchCount + 1, "索引:", prizeIndices);
+            let prizeIndices_l = [];
+            if (prizeIndices.length > 0 && prizeIndices.length > 5) {
+                prizeIndices_l = prizeIndices.slice(5);
+                prizeIndices = prizeIndices.slice(0, 5);
+                this.prizeIndices = prizeIndices_l;
+            } else {
+                this.prizeIndices = [];
             }
 
             // 如果没有传入奖品索引数组或传入的不是数组
@@ -622,7 +471,15 @@ export default {
          * @param {Function} callback 抽奖结束后的回调函数
          * @return {Object} this 返回组件实例，支持链式调用
          */
-        async startDrawWithResult(resultIndices, callback, chaoShenIndex = -1) {
+        async startDrawWithResult(resultIndices) {
+            this.prizeIndices = resultIndices;
+            if (this.internalMode == 0) {
+                if (resultIndices.length > 5) {
+                    this.internalMode = 5;
+                } else {
+                    this.internalMode = this.prizeIndices.length;
+                }
+            }
             // 检查是否已初始化
             if (!this.isInitialized) {
                 console.error("抽奖特效尚未初始化，请先调用init方法");
@@ -638,151 +495,34 @@ export default {
                 console.error("抽奖结果必须是数组");
                 return this;
             }
-            this.chaoShenIndex = chaoShenIndex;
-            // 模式10特殊处理（批次模式）
-            if (this.internalMode === 10) {
-                // 检查是否有足够的索引
-                if (resultIndices.length < 10) {
-                    console.error("模式10需要至少10个索引，当前只有", resultIndices.length);
-                    // 自动补足到10个
-                    const originalLength = resultIndices.length;
-                    for (let i = originalLength; i < 10; i++) {
-                        resultIndices.push(Math.floor(Math.random() * this.prizes.length));
-                    }
-                    console.log("[批次抽奖] 自动补足索引到10个:", resultIndices);
-                }
-
-                console.log("[批次抽奖] 检测到模式10，启用批次模式，共", resultIndices.length, "个索引");
-
-                // 保存回调函数
-                this.drawResultCallback = null;
-                this.batchCallback = typeof callback === 'function' ? callback : null;
-
-                // 初始化批次模式
-                this.isBatchMode = true;
-                this.batchCount = 0;
-                this.batchResults = [];
-                this.batchIndices = resultIndices;
-
-                // 重置跳过按钮透明度
-                // this.skipButtonOpacity = 0;
-
-                // 显示抽奖特效
-                this.show();
-                let that = this;
-                setTimeout(() => {
-                    // 确保DOM已渲染完成后再调用play方法
-                    this.$nextTick(() => {
-                        // 检查组件是否已初始化
-                        if (this.$refs.myLucky) {
-                            console.log("[批次抽奖] 开始第一批次抽奖");
-                            // 开始第一批次抽奖
-                            this.$refs.myLucky.play();
-                            this.$emit("luckyPlay", "")
-                            // 渐显跳过按钮
-                            this.timers.skipButton = setTimeout(() => {
-                                this.skipButtonOpacity = 1;
-                            }, 1000);
-
-                            // 2秒后停止第一批次抽奖
-                            this.timers.firstBatch = setTimeout(() => {
-                                // 使用前5个索引作为第一批次结果
-                                const firstBatchIndices = resultIndices.slice(0, 5);
-                                console.log("[批次抽奖] 停止第一批次抽奖，使用索引:", firstBatchIndices);
-                                this.stopDraw(firstBatchIndices);
-                            }, 2000);
-                        } else {
-                            console.error("[批次抽奖] 抽奖特效组件未初始化");
-                            if (this.batchCallback) {
-                                this.batchCallback({
-                                    success: false,
-                                    error: "抽奖特效组件未初始化"
-                                });
-                                this.batchCallback = null;
-                            }
-                            this.isBatchMode = false;
-                        }
-                    });
-                }, 200);
-
-                return this; // 返回this以支持链式调用
-            }
-
-            // 非批次模式的普通处理（原有逻辑）
-            // 保存回调函数
-            this.drawResultCallback = typeof callback === 'function' ? callback : null;
-
             // 重置跳过按钮透明度
             this.skipButtonOpacity = 0;
 
             // 显示抽奖特效
             this.show();
-            try {
-                await sleep(500);
-                // 确保DOM已渲染完成后再调用play方法
-                this.$nextTick(() => {
-                    // 检查组件是否已初始化
-                    if (this.$refs.myLucky) {
-                        // 开始旋转
-                        this.$refs.myLucky.play();
-                        this.$emit("luckyPlay", "")
+            await sleep(500);
 
-                        // 渐显跳过按钮
-                        this.timers.skipButton = setTimeout(() => {
-                            this.skipButtonOpacity = 1;
-                        }, 1000);
+            // 确保DOM已渲染完成后再调用play方法
+            this.$nextTick(async () => {
+                // 检查组件是否已初始化
+                if (this.$refs.myLucky) {
+                    await sleep(200);
+                    // 开始旋转
+                    this.$refs.myLucky.play();
+                    this.$emit("luckyPlay", "")
+                    console.log('开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖');
+                    // 渐显跳过按钮
+                    this.timers.skipButton = setTimeout(() => {
+                        this.skipButtonOpacity = 1;
+                    }, 1000);
 
-                        // 2秒后自动停止抽奖
-                        this.timers.drawResult = setTimeout(() => {
-                            // 停止抽奖并显示结果
-                            this.stopDraw(resultIndices);
-                        }, 2000);
-                    } else {
-                        console.error("抽奖特效组件未初始化");
-                        // 如果有回调，通知调用者初始化失败
-                        if (this.drawResultCallback) {
-                            this.drawResultCallback({
-                                success: false,
-                                error: "抽奖特效组件未初始化"
-                            });
-                            this.drawResultCallback = null;
-                        }
-                    }
-                });
-
-            } catch (error) {
-                sleep(500);
-                // 确保DOM已渲染完成后再调用play方法
-                this.$nextTick(() => {
-                    // 检查组件是否已初始化
-                    if (this.$refs.myLucky) {
-                        // 开始旋转
-                        this.$refs.myLucky.play();
-                        this.$emit("luckyPlay", "")
-
-                        // 渐显跳过按钮
-                        this.timers.skipButton = setTimeout(() => {
-                            this.skipButtonOpacity = 1;
-                        }, 1000);
-
-                        // 2秒后自动停止抽奖
-                        this.timers.drawResult = setTimeout(() => {
-                            // 停止抽奖并显示结果
-                            this.stopDraw(resultIndices);
-                        }, 2000);
-                    } else {
-                        console.error("抽奖特效组件未初始化");
-                        // 如果有回调，通知调用者初始化失败
-                        if (this.drawResultCallback) {
-                            this.drawResultCallback({
-                                success: false,
-                                error: "抽奖特效组件未初始化"
-                            });
-                            this.drawResultCallback = null;
-                        }
-                    }
-                });
-            }
+                    // 2秒后自动停止抽奖
+                    this.timers.drawResult = setTimeout(() => {
+                        // 停止抽奖并显示结果
+                        this.stopDraw(resultIndices);
+                    }, 2000);
+                }
+            });
 
             return this; // 返回this以支持链式调用
         },
diff --git a/components/detail-lucky/detail-lucky.vue b/components/detail-lucky/detail-lucky.vue
index bfca353..2cf7e89 100644
--- a/components/detail-lucky/detail-lucky.vue
+++ b/components/detail-lucky/detail-lucky.vue
@@ -97,7 +97,7 @@ export default {
 			this.chaoShenIndex = chaoShenIndex;
 			console.log('开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖开始抽奖', this.prizeList, resultIndices,);
 			//#ifdef H5 || MP
-			await this.$refs._detailLucky.startDrawWithResult(resultIndices, chaoShenIndex);
+			await this.$refs._detailLucky.startDrawWithResult(resultIndices);
 			//#endif
 			//#ifdef APP
 			this.$refs._detailLucky.init(this.prizeList, page, resultIndices);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3c51af4..9ee8dd9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -10,155 +10,164 @@
 </template>
 
 <script>
-	import PageContainer from '@/components/page-container/page-container.vue'
+import PageContainer from '@/components/page-container/page-container.vue'
 
 
-	export default {
-		components: {
-			PageContainer
-		},
-		data() {
-			let icon = "https://image.zfunbox.cn/icon_108.png";
-			let login_icon = "https://image.zfunbox.cn/app/index_login.gif";
-			// #ifdef APP
-			icon = "/static/app-plus/icon_108.png";
-			login_icon = "/static/app-plus/index_login.gif";
-			// #endif
-			return {
-				icon: icon,
-				login_icon: login_icon,
-				tips: "正在加载中。。。"
-			}
-		},
-		onLoad() {
-			this.load();
-
-		},
-		methods: {
-			async load() {
-				var that = this;
-				uni.getNetworkType({
-					success(res) {
-						if (res.networkType === 'none') {
-							// uni.hi
-							uni.hideToast();
-							// 可能是无网络或权限被拒绝
-							console.log('无网络连接或权限被拒绝');
-							that.tips = "无网络连接或权限被拒绝";
-							uni.onNetworkStatusChange(function(res) {
-								console.log('网络状态变化:', res.isConnected, res.networkType);
-								if (res.isConnected) {
-									// 网络已连接
-									that.tips = "正在加载中。。。";
-									// #ifdef APP
-									if (plus.runtime.restart) {
-										plus.runtime.restart();
-									} else {
-										uni.showToast({
-											title: "重启失败",
-											icon: "none"
-										});
-									}
-									// #endif
-								} else {
-									// 网络断开
-									that.tips = "网络断开";
-								}
-							});
-						} else {
-							// 有网络权限
-							console.log('网络权限已授予');
-						}
-					},
-					fail() {
-						// 获取网络状态失败，可能是权限问题
-						console.log('获取网络状态失败，可能无权限');
-					}
-				});
-
-			},
-
+export default {
+	components: {
+		PageContainer
+	},
+	data() {
+		let icon = "https://image.zfunbox.cn/icon_108.png";
+		let login_icon = "https://image.zfunbox.cn/app/index_login.gif";
+		// #ifdef APP
+		icon = "/static/app-plus/icon_108.png";
+		login_icon = "/static/app-plus/index_login.gif";
+		// #endif
+		return {
+			icon: icon,
+			login_icon: login_icon,
+			tips: "正在加载中。。。"
 		}
+	},
+	onLoad() {
+		this.load();
+		// const currentPage = getCurrentPages();
+		// console.log('currentPagecurrentPagecurrentPage', currentPage);
+	},
+	methods: {
+		toHome() {
+			// #ifdef H5 || MP
+			uni.switchTab({
+				url: '/pages/shouye/index'
+			});
+			// #endif
+		},
+		async load() {
+			var that = this;
+			uni.getNetworkType({
+				success(res) {
+					if (res.networkType === 'none') {
+						// uni.hi
+						uni.hideToast();
+						// 可能是无网络或权限被拒绝
+						console.log('无网络连接或权限被拒绝');
+						that.tips = "无网络连接或权限被拒绝";
+						uni.onNetworkStatusChange(function (res) {
+							console.log('网络状态变化:', res.isConnected, res.networkType);
+							if (res.isConnected) {
+								// 网络已连接
+								that.tips = "正在加载中。。。";
+								// #ifdef APP
+								if (plus.runtime.restart) {
+									plus.runtime.restart();
+								} else {
+									uni.showToast({
+										title: "重启失败",
+										icon: "none"
+									});
+								}
+								// #endif
+							} else {
+								// 网络断开
+								that.tips = "网络断开";
+							}
+						});
+					} else {
+						// 有网络权限
+						console.log('网络权限已授予');
+						that.toHome();
+					}
+				},
+				fail() {
+					// 获取网络状态失败，可能是权限问题
+					console.log('获取网络状态失败，可能无权限');
+				}
+			});
+
+		},
+
 	}
+}
 </script>
 
 <style lang="scss">
-	.index-page {
-		width: 100vw;
-		height: 100vh;
-		background-color: #f8f8f8;
+.index-page {
+	width: 100vw;
+	height: 100vh;
+	background-color: #f8f8f8;
+}
+
+.about-container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 20px;
+
+	.app-icon {
+		width: 96px;
+		height: 96px;
+		margin-top: 20vh;
+		border-radius: 50%;
 	}
 
-	.about-container {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 20px;
+	.app-info {
+		margin-top: 20px;
+		text-align: center;
 
-		.app-icon {
-			width: 96px;
-			height: 96px;
-			margin-top: 20vh;
-			border-radius: 50%;
+		.app-name {
+			font-size: 18px;
+			font-weight: bold;
+			margin-bottom: 10px;
 		}
 
-		.app-info {
-			margin-top: 20px;
+		.app-version {
+			font-size: 14px;
+			color: #666;
+			margin-bottom: 5px;
+		}
+	}
+
+	.test-mode-container {
+		margin-top: 30px;
+		border: 1px dashed #ff6600;
+		border-radius: 8px;
+		padding: 15px;
+		width: 80%;
+
+		.test-mode-content {
+			width: 100%;
+		}
+
+		.test-mode-title {
 			text-align: center;
-
-			.app-name {
-				font-size: 18px;
-				font-weight: bold;
-				margin-bottom: 10px;
-			}
-
-			.app-version {
-				font-size: 14px;
-				color: #666;
-				margin-bottom: 5px;
-			}
+			font-weight: bold;
+			font-size: 16px;
+			color: #ff6600;
+			margin-bottom: 15px;
 		}
 
-		.test-mode-container {
-			margin-top: 30px;
-			border: 1px dashed #ff6600;
-			border-radius: 8px;
-			padding: 15px;
-			width: 80%;
+		.test-mode-item {
+			margin: 10px 0;
+			font-size: 14px;
+		}
 
-			.test-mode-content {
-				width: 100%;
-			}
+		.button-group {
+			display: flex;
+			justify-content: space-between;
+		}
 
-			.test-mode-title {
-				text-align: center;
-				font-weight: bold;
-				font-size: 16px;
-				color: #ff6600;
-				margin-bottom: 15px;
-			}
+		.log-button {
+			width: 48%;
+			margin: 0;
+		}
 
-			.test-mode-item {
-				margin: 10px 0;
-				font-size: 14px;
-			}
-
-			.button-group {
-				display: flex;
-				justify-content: space-between;
-			}
-
-			.log-button {
-				width: 48%;
-				margin: 0;
-			}
-
-			.test-button {
-				margin-top: 15px;
-				background-color: #ff6600;
-				color: white;
-				font-size: 14px;
-			}
+		.test-button {
+			margin-top: 15px;
+			background-color: #ff6600;
+			color: white;
+			font-size: 14px;
 		}
 	}
+}
 </style>
\ No newline at end of file

From 1540183101aea7e5805dbf422db90133233fda98 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Mon, 9 Jun 2025 10:28:57 +0800
Subject: [PATCH 3/3] 333

---
 common/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/config.js b/common/config.js
index 54edf6a..6e2db42 100644
--- a/common/config.js
+++ b/common/config.js
@@ -8,7 +8,7 @@ import RequestManager from '@/common/request.js'
 let configData = null;
 let isLoading = false;
 let loadPromise = null;
-const wx_version = "113";
+const wx_version = "114";
 
 // 白名单页面（不需要登录即可访问）
 export const whiteList = [