diff --git a/common/common.js b/common/common.js
index db4abc7..7aa4e1e 100644
--- a/common/common.js
+++ b/common/common.js
@@ -118,7 +118,7 @@ export default {
 			if (item.ttype == 2) {
 				/* 一番赏 */
 				this.to({
-					url: '/pages/shouye/detail',
+					url: '/pages/main/detail',
 					query: {
 						goods_id: item.goods_id
 					}
@@ -128,7 +128,7 @@ export default {
 			/* 无限赏 */
 			if (item.ttype == 3) {
 				this.to({
-					url: '/pages/shouye/detail_wuxian',
+					url: '/pages/main/detail_wuxian',
 					query: {
 						goods_id: item.goods_id
 					}
@@ -492,7 +492,7 @@ export default {
 		routerNavigateBack(delta)
 			.catch(() => {
 				// 如果返回失败，则回到首页
-				routerNavigateTo('/pages/shouye/index', {}, 'switchTab');
+				routerNavigateTo('/pages/main/index', {}, 'switchTab');
 			});
 	},
 
@@ -516,7 +516,7 @@ export default {
 			routerNavigateBack(num)
 				.catch(() => {
 					// 如果返回失败，则回到首页
-					routerNavigateTo('/pages/shouye/index', {}, 'reLaunch');
+					routerNavigateTo('/pages/main/index', {}, 'reLaunch');
 				});
 		}, time * 1000)
 	},
diff --git a/common/config.js b/common/config.js
index 3b8af44..829fb21 100644
--- a/common/config.js
+++ b/common/config.js
@@ -12,24 +12,24 @@ const wx_version = "117";
 
 // 白名单页面（不需要登录即可访问）
 export const whiteList = [
-	"pages/shouye/index", // 首页
+	"pages/main/index", // 首页
 	"pages/index/index",
-	"pages/shouye/detail", // 详情页
-	"pages/shouye/huanxiang", // 换箱页面
-	"pages/mall/index", // 商城首页
-	"pages/shouye/detail_wuxian", // 无限详情页
+	"pages/main/detail", // 详情页
+	"pages/main/huanxiang", // 换箱页面
+	"pages/shangcheng/index", // 商城首页
+	"pages/main/detail_wuxian", // 无限详情页
 	"pages/kit/kit", // 盒柜页面
 	"pages/infinite/index", // 福利首页
-	"pages/user/index", // 用户中心
+	"pages/users/index", // 用户中心
 	"pages/infinite/daily_check_in", // 每日签到
 	"pages/infinite/bonus_house", // 福利屋
 	"pages/other/prize_draw", // 每日奖品抽取
-	"pages/shouye/danye", // 单页
+	"pages/main/danye", // 单页
 	"pages/guize/guize", // 规则页面
-	"pages/shouye/dada_ranking", // 达达排行榜
-	"pages/shouye/invite_ranking", // 邀请排行榜
-	"pages/user/login", // 登录页面
-	"pages/shouye/slots",
+	"pages/main/dada_ranking", // 达达排行榜
+	"pages/main/invite_ranking", // 邀请排行榜
+	"pages/users/login", // 登录页面
+	"pages/main/slots",
 	"pages/other/web-pay-order", // 网页支付订单
 	"pages/other/web-pay-success", // 网页支付成功
 	"pages/other/about"// 其它页面
@@ -259,7 +259,7 @@ class ConfigManager {
 									if (res.confirm) {
 										console.log('开始重启');
 										wx.restartMiniProgram({
-											path: "/pages/shouye/index"
+											path: "/pages/main/index"
 										});
 										// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
 										//updateManager.applyUpdate();
diff --git a/common/env.js b/common/env.js
index a1b2027..adaa76e 100644
--- a/common/env.js
+++ b/common/env.js
@@ -41,7 +41,7 @@ const testing = {
 
 
 // 根据环境变量选择对应配置
-let currentEnv = production;//production;//testing;//production_wz;
+let currentEnv = testing;//production;//testing;//production_wz;
 // 衍生配置
 const config = {
   ...currentEnv,
diff --git a/common/gotopage.js b/common/gotopage.js
index 6f83803..d460cab 100644
--- a/common/gotopage.js
+++ b/common/gotopage.js
@@ -7,7 +7,7 @@ const tabBarLinks = [
 	'/pages/index/index',
 	'/pages/product/category',
 	'/pages/cart/cart',
-	'/pages/user/index/index',
+	'/pages/users/index/index',
 	'/pages/shop/index'
 ];
 
@@ -15,7 +15,7 @@ const tabBarLinks = [
 const shareLinks = [
 	'/pages/plus/assemble/fight-group-detail/fight-group-detail',
 	'/pages/plus/bargain/haggle/haggle',
-	'/pages/user/invite/invite',
+	'/pages/users/invite/invite',
 	'/pages/product/detail/detail',
 	'/pages/plus/seckill/detail/detail',
 	'/pages/plus/assemble/detail/detail',
diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js
index c4a99da..3e52518 100644
--- a/common/platform/AppPlatform.js
+++ b/common/platform/AppPlatform.js
@@ -45,7 +45,7 @@ class AppPlatform extends BasePlatform {
                 });
                 // uni.showTabBar({})
                 uni.switchTab({
-                    url: '/pages/mall/index'
+                    url: '/pages/shangcheng/index'
                 });
                 // uni.tos
             } else {
@@ -58,7 +58,7 @@ class AppPlatform extends BasePlatform {
                     visible: true,
                 });
                 uni.switchTab({
-                    url: '/pages/shouye/index'
+                    url: '/pages/main/index'
                 });
             }
         })
@@ -219,7 +219,7 @@ class AppPlatform extends BasePlatform {
             show: true,
             title: '商品退换货',
             icon: 'my/huan.svg',
-            path: '/pages/shouye/danye?advert=29',
+            path: '/pages/main/danye?advert=29',
             handler: this.navigateToPath.bind(this)
         };
         for (let i = 0; i < baseMenuList.length; i++) {
@@ -227,10 +227,12 @@ class AppPlatform extends BasePlatform {
             if (menu.id == 3) {
                 if (!this.getIsCheck("user_menu_3")) {
                     menuList.push(menu);
+
                 }
-            } if (menu.id == 5) {
+            } else if (menu.id == 5) {
                 if (!this.getIsCheck("user_menu_5")) {
                     menuList.push(menu);
+                    continue;
                 }
             } else {
                 menuList.push(menu);
@@ -336,11 +338,11 @@ class AppPlatform extends BasePlatform {
                         console.log("AppLaunch", res);
                         if (!res.isCheck) {
                             uni.switchTab({
-                                url: '/pages/shouye/index'
+                                url: '/pages/main/index'
                             });
                         } else {
                             uni.switchTab({
-                                url: '/pages/mall/index'
+                                url: '/pages/shangcheng/index'
                             });
                         }
                     });
diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index bbc29f8..9ee41f1 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -31,7 +31,7 @@ class BasePlatform {
 	async appData() {
 		await this.loadCacheData();
 		uni.switchTab({
-			url: '/pages/shouye/index'
+			url: '/pages/main/index'
 		});
 	}
 
@@ -138,7 +138,7 @@ class BasePlatform {
 			show: true,
 			title: '我的收藏',
 			icon: 'my/s3.png',
-			path: '/package/mine/collect',
+			path: '/pages/users/collect',
 			handler: this.navigateToPath.bind(this)
 		},
 		{
@@ -146,7 +146,7 @@ class BasePlatform {
 			show: true,
 			title: '优惠券',
 			icon: 'my/s4.png',
-			path: '/pages/user/coupon',
+			path: '/pages/users/coupon',
 			handler: this.navigateToPath.bind(this)
 		},
 		{
@@ -154,7 +154,7 @@ class BasePlatform {
 			show: true,
 			title: '邀请好友',
 			icon: 'my/s5.png',
-			path: '/pages/user/tui-guang',
+			path: '/pages/users/tui-guang',
 			handler: this.navigateToPath.bind(this)
 		},
 		{
@@ -182,7 +182,7 @@ class BasePlatform {
 				show: true,
 				title: '注销账号',
 				icon: 'my/s10.png',
-				path: '/pages/user/cancel-account-page',
+				path: '/pages/users/cancel-account-page',
 				handler: this.navigateToPath.bind(this)
 			}),
 				m.push({
diff --git a/common/platform/H5Platform.js b/common/platform/H5Platform.js
index e0672b2..cfb9464 100644
--- a/common/platform/H5Platform.js
+++ b/common/platform/H5Platform.js
@@ -172,7 +172,7 @@ class H5Platform extends BasePlatform {
       
         // if (window.location.pathname == "/" || window.location.pathname == "/pages/index/index") {
         //     uni.switchTab({
-        //         url: '/pages/shouye/index'
+        //         url: '/pages/main/index'
         //     });
         // }
     }
diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js
index 4b122ce..a88ea75 100644
--- a/common/platform/MiniProgramPlatform.js
+++ b/common/platform/MiniProgramPlatform.js
@@ -219,7 +219,7 @@ class MiniProgramPlatform extends BasePlatform {
 
 		// if (options != null && options.path == "pages/index/index") {
 		// 	uni.switchTab({
-		// 		url: '/pages/shouye/index'
+		// 		url: '/pages/main/index'
 		// 	});
 		// }
 	}
@@ -228,7 +228,7 @@ class MiniProgramPlatform extends BasePlatform {
 		console.log("getAccountInfoSync",t);
 		await this.loadCacheData();
 		uni.switchTab({
-			url: '/pages/shouye/index'
+			url: '/pages/main/index'
 		});
 		// this.getConfig().then(res => {
 		// 	console.log(res, 'res');
@@ -296,7 +296,7 @@ class MiniProgramPlatform extends BasePlatform {
 					uni.removeStorageSync('token');
 					uni.removeStorageSync('userinfo');
 					uni.switchTab({
-						url: '/pages/shouye/index'
+						url: '/pages/main/index'
 					});
 				}
 			}
diff --git a/common/request.js b/common/request.js
index 0610331..290d385 100644
--- a/common/request.js
+++ b/common/request.js
@@ -266,12 +266,12 @@ class RequestManager {
                   setTimeout(() => {
                     // #ifdef H5
                     uni.navigateTo({
-                      url: '/pages/user/bangdingweb'
+                      url: '/pages/users/bangdingweb'
                     })
                     // #endif
                     // #ifdef MP-WEIXIN
                     uni.navigateTo({
-                      url: '/pages/user/bangding'
+                      url: '/pages/users/bangding'
                     })
                     // #endif
                   }, 1500)
@@ -305,7 +305,7 @@ class RequestManager {
               var currentParams = currentPage.options || {};
 
               // 只有非登录页面才保存重定向信息
-              if (currentRoute && currentRoute !== 'pages/user/login') {
+              if (currentRoute && currentRoute !== 'pages/users/login') {
                 // 构建完整的重定向URL
                 var redirectPath = '/' + currentRoute;
 
@@ -337,7 +337,7 @@ class RequestManager {
             uni.removeStorageSync('token');
             uni.removeStorageSync('userinfo');
             // 使用新的路由守卫方法进行跳转
-            RouterManager.navigateTo('/pages/user/login', {}, 'navigateTo')
+            RouterManager.navigateTo('/pages/users/login', {}, 'navigateTo')
               .catch(err => {
                 console.error('登录页面跳转失败:', err);
               });
diff --git a/common/router.js b/common/router.js
index 9b9778c..91d48eb 100644
--- a/common/router.js
+++ b/common/router.js
@@ -46,13 +46,13 @@ export function navigateBack(delta = 1) {
     
     // 如果页面栈不足，直接返回首页
     if (pages.length <= 1) {
-      return navigateTo('/pages/shouye/index', {}, 'reLaunch')
+      return navigateTo('/pages/main/index', {}, 'reLaunch')
         .then(resolve)
         .catch(reject);
     }
     
     // 查看前一个页面是否是登录页
-    if (pages.length > 1 && pages[pages.length - 2].route === 'pages/user/login') {
+    if (pages.length > 1 && pages[pages.length - 2].route === 'pages/users/login') {
       // 如果前一个页面是登录页，则返回两步
       uni.navigateBack({
         delta: 2,
@@ -108,7 +108,7 @@ export function routerTo(options) {
       
       // 使用navigateTo而非redirectTo，保留页面栈
       uni.navigateTo({
-        url: '/pages/user/login',
+        url: '/pages/users/login',
         success: () => {
           console.log('跳转到登录页面成功，保存的重定向地址：', url);
         },
diff --git a/components/coupon-pop/coupon-pop.vue b/components/coupon-pop/coupon-pop.vue
index 42803b8..d875366 100644
--- a/components/coupon-pop/coupon-pop.vue
+++ b/components/coupon-pop/coupon-pop.vue
@@ -91,7 +91,7 @@
 				var data = {
 					title: `快来领取${userInfo.nickname}分享的${this.ruleData.num}赏币的${this.ruleData.title}`,
 					imageUrl: this.ruleData.level_img,
-					path: '/pages/user/index' +
+					path: '/pages/users/index' +
 						this.$c.qs({
 							ou_coupon_id: this.ruleData.id
 						})
diff --git a/components/empty-state/empty-state.vue b/components/empty-state/empty-state.vue
index f73744c..bb61875 100644
--- a/components/empty-state/empty-state.vue
+++ b/components/empty-state/empty-state.vue
@@ -12,7 +12,7 @@ export default {
 		// 空状态显示的图片，默认使用kong.png
 		imageSrc: {
 			type: String,
-			default: '/static/common/kong.png'
+			default: '/static/app-plus/no-data.png'
 		},
 		// 空状态显示的文本
 		message: {
diff --git a/components/gbro-marquee/marquee.vue b/components/gbro-marquee/marquee.vue
deleted file mode 100644
index 55b650e..0000000
--- a/components/gbro-marquee/marquee.vue
+++ /dev/null
@@ -1,510 +0,0 @@
-<template>
-	<view class="marquee_box" @touchstart='touchstartFn' @touchend='touchendFn'>
-		<block v-show="isShow">
-			<view class="" v-if="direction=='right'||direction=='left'">
-				<view v-if="broadcastType=='text'" class="marquee_container"
-					:style="'background:'+broadcastStylees.back_color+';'">
-					<view v-if="broadcastIconIsDisplay" class="broadIcon"
-						:style="'background:'+broadcastStylees.back_color+';font-size:28rpx;'">
-						<text class="iconfont icon-guangbozheng-"></text>
-						<text style="margin-left:12rpx;">{{broadcast_tit}}:</text>
-					</view>
-					<view class="boradcast_text_left_rig"
-						:class='[direction=="left"?"marquee_text_left":direction=="right"?"marquee_text_right":"",animation_paused?"animation_pausedcss":""]'
-						:style="'--marqueeWidth--:'+(-broadcastStylees.width_mal)+'px;--speed--:'+broadcastStylees.time+'s;width:'+broadcastStylees.width_mal+'px;'">
-						<view v-for="(item,index) in broadcastDataes" @click.stop="click_event(index)" :key="index"
-							:style="'color:'+broadcastStylees.text_color+';margin-left:'+(index!=0?item.starspos:0)+'px;font-size:'+broadcastStylees.font_size+'rpx;'">
-							{{item.text}}
-						</view>
-					</view>
-				</view>
-
-				<view v-if="broadcastType=='mould'" class="mould">
-					<view class="" style="width: 100%;position: relative;overflow: hidden;"
-						:style="'height:'+viewHeight+'rpx;'">
-						<view class="broadcastTopBtm dsf"
-							:class="[direction=='left' && doamini?'broadcastDataTopBtmDatacss_let':direction=='right'?'broadcastDataTopBtmDatacss_rig':'',animation_paused?'animation_pausedcss':'']"
-							:style="'--scrollWidth--:'+(-(scrlloWidth/2))+'px;--scrollSpeed2--:'+(scrlloWidth/broadcastStyle.speed)+'s;width:'+(scrlloWidth*2)+'px;'">
-							<view ref="mouldRef" class="bml01" style="display: flex;justify-content: space-between;">
-								<slot />
-								<!-- <slot /> -->
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-
-			<view v-if="direction=='top'||direction=='bottom'" class="broadcastTopBtm"
-				:style="'font-size:'+broadcastStyle.font_size+'rpx;color:'+broadcastStyle.text_color+';background:'+broadcastStyle.back_color+';height:'+viewHeight+'rpx;--scrollHeight--:'+(-broadcastTopBtmHeight/2)+'px;--scrollSpeed--:'+((broadcastTopBtmHeight/2)/broadcastStyle.speed)+'s;'">
-				<view v-if="broadcastType=='text'"
-					:class="[direction=='top'?'broadcastDataTopBtmDatacss_top':direction=='bottom'?'broadcastDataTopBtmDatacss_bottom':'',animation_paused?'animation_pausedcss':'']">
-					<view v-for="(item,index) in broadcastDataTopBtmDataes" :key="index" @click.stop="click_event()"
-						class="bdbd_item">
-						{{item}}
-					</view>
-				</view>
-				<view v-if="broadcastType=='mould'"
-					:class="[direction=='top'?'broadcastDataTopBtmDatacss_top':direction=='bottom'?'broadcastDataTopBtmDatacss_bottom':'',animation_paused?'animation_pausedcss':'']">
-					<slot />
-					<!-- <slot /> -->
-				</view>
-			</view>
-
-		</block>
-
-
-	</view>
-</template>
-
-<script>
-	/**
-	 * author:G.bro
-	 * date:20200513
-	 * * **/
-	export default {
-		data() {
-			return {
-				broadcastDataes: [],
-				broadcastDataTopBtmDataes: [],
-				broadcastStylees: {},
-				broadcastTopBtmHeight: 0,
-				scrlloWidth: 0,
-				animation_paused: false,
-				qualifications: true,
-				isShow: false,
-				doamini:false
-			}
-		},
-		props: {
-			doamin:{
-				type: Boolean
-			},
-			broadcastType: {
-				type: String,
-				default: 'text' //mould
-			},
-			imgdata: {
-				type: Array
-			},
-			broadcastData: {
-				type: Array
-			},
-			broadcastStyle: {
-				type: Object,
-				default () {
-					return {
-						speed: 90, //滚动速度，每秒3个字
-						font_size: "28", //字体大小(rpx)
-						text_color: "#fff", //字体颜色
-						back_color: "#815CD4", //背景色
-
-					}
-				}
-			},
-			broadcastIconIsDisplay: { //图标是否显示
-				type: Boolean,
-				default: false
-			},
-			// broadcast_icon: {
-			// 	type: String,
-			// 	default: ''
-			// },
-			broadcast_tit: {
-				type: String,
-				default: '今日热点'
-			},
-			direction: {
-				type: String,
-				default: 'left'
-			},
-			viewHeight: {
-				type: Number,
-				default: 200
-			},
-			touchEvent: {
-				type: true,
-				default: false
-			}
-
-		},
-		watch: {
-			broadcastData(v) {
-				console.log(v, '---')
-				if (v.length) {
-					this.isShow = true;
-					this.initialization();
-				}
-			},
-			imgdata(v) {
-				console.log(v, '---')
-				this.isShow = true;
-				this.initialization();
-			},
-			doamin(v){
-				let that = this
-				console.log(v)
-				setTimeout(()=>{
-				   that.doamini = v
-				},1000)
-				
-			}
-		},
-		created() {
-			this.initialization();
-		},
-		mounted() {
-
-			// if(this.broadcastType=='text'){有偏差
-			// 	let assist = { ...this.broadcastStyle};
-			// 	const querys = uni.createSelectorQuery().in(this)
-			// 	querys.select('.boradcast_text_left_rig').boundingClientRect(rect => {
-			// 		assist.width_mal = rect.width;
-			// 			assist.time = rect.width/assist.speed;
-			// 			that.broadcastStylees=assist;
-			// 	}).exec()
-			// }
-		},
-		methods: {
-			initialization() {
-				let that = this;
-
-				if (that.broadcastType == "text") {
-					if (that.direction == "right" || that.direction == "left") {
-						that.initial_let_rig();
-					} else {
-						let arr = [...that.broadcastData];
-						arr = arr.concat(arr);
-						that.broadcastDataTopBtmDataes = arr;
-					}
-				}
-
-				if (that.direction == "top" || that.direction == "bottom") {
-					that.$nextTick(() => {
-						let dir = `.broadcastDataTopBtmDatacss_${that.direction}`
-						const query2 = uni.createSelectorQuery().in(that);
-						query2.select(dir).boundingClientRect(rect => {
-							that.broadcastTopBtmHeight = rect.height;
-							console.log(rect, '==rect.height')
-
-							if (that.viewHeight - rect.height > 10) {
-								that.qualifications = false;
-								that.animation_paused = true;
-								that.broadcastDataTopBtmDataes.splice(that.broadcastDataTopBtmDataes
-									.length / 2, that.broadcastDataTopBtmDataes
-									.length - 1);
-							}
-
-						}).exec();
-					})
-
-				}
-				if (that.direction == "left" || that.direction == "right") {
-					this.$nextTick(() => {
-						try {
-							if (that.broadcastType == 'mould') {
-								const query = uni.createSelectorQuery().in(that)
-								query.select('.bml01').boundingClientRect(rect => {
-									// console.log(rect)
-									that.scrlloWidth = rect.width;
-									// console.log(rect, '===================rect.width')
-								}).exec()
-							}
-						} catch (e) {
-							that.scrlloWidth = that.$refs.mouldRef.$el.clientWidth * 2
-						}
-					})
-				}
-
-
-
-			},
-			touchendFn(e) {
-				if (this.touchEvent && this.qualifications) {
-					this.animation_paused = false;
-				}
-			},
-			touchstartFn(e) {
-				if (this.touchEvent && this.qualifications) {
-					this.animation_paused = true;
-				}
-			},
-			initial_let_rig() {
-				let broadcastData = [...this.broadcastData];
-				console.log(this.direction, 'this.direction')
-				if (this.direction == "right") {
-					broadcastData.reverse();
-				}
-
-				let ititdata = broadcastData.map((item) => {
-						return {
-							"text": item,
-							"starspos": uni.getSystemInfoSync().windowWidth - 103
-						}
-					}),
-					assist = {
-						...this.broadcastStyle
-					},
-					this_width = 0,
-					spacing = 0,
-					speed = (assist.speed * assist.font_size); //m每秒行走的距离
-
-				for (let i in ititdata) {
-					this_width += ititdata[i].text.length * assist.font_size;
-					if (i != ititdata.length - 1) {
-						spacing += ititdata[i].starspos
-					}
-				}
-				let total_length = (this_width / 2) + spacing; //总长
-				assist.time = total_length / speed; /**滚动时间*/
-				assist.width_mal = total_length;
-				this.broadcastDataes = ititdata;
-				this.broadcastStylees = assist;
-			},
-			click_event(index) {
-				let i;
-				if (index > ((broadcastDataTopBtmDataes.length / 2) - 1)) {
-					i = index - (broadcastDataTopBtmDataes.length / 2);
-				} else {
-					i = index
-				}
-				this.$emit("changeEvent", {
-					i,
-					msg: `你点击了${i+1}条`
-				});
-			}
-
-		}
-	}
-</script>
-
-<style>
-	/* app端有可能要加上 */
-	/* page {
-		overflow: hidden;
-		width: 100%;
-	} */
-
-	.marquee_box {
-		width: 100%;
-		overflow: hidden;
-		position: inherit;
-		height: auto;
-	}
-
-	.mould {
-		width: 750rpx;
-		overflow: hidden;
-		position: inherit;
-	}
-
-	.dsf {
-		display: flex;
-		justify-content: space-between;
-	}
-
-	.broadIcon {
-		/* width: 60rpx; */
-		padding: 0 22rpx;
-		height: 60rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-		color: #fff;
-		z-index: 999;
-		line-height: 60rpx;
-
-	}
-
-
-
-
-
-	.marquee_container {
-		position: relative;
-		width: 100%;
-		height: 60rpx;
-
-	}
-
-	.marquee_text_left {
-		display: flex;
-		white-space: nowrap;
-		animation-name: around_left;
-		animation-duration: var(--speed--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		line-height: 60rpx;
-		position: absolute;
-
-	}
-
-	@keyframes around_left {
-		from {
-			left: 100%;
-		}
-
-		to {
-			left: var(--marqueeWidth--);
-		}
-	}
-
-	.marquee_text_right {
-		display: flex;
-		white-space: nowrap;
-		animation-name: around_right;
-		animation-duration: var(--speed--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		line-height: 60rpx;
-		position: absolute;
-
-	}
-
-	@keyframes around_right {
-		from {
-			right: 100%;
-		}
-
-		to {
-			right: var(--marqueeWidth--);
-		}
-	}
-
-	.marquee_tit {
-		height: 60rpx;
-		line-height: 60rpx;
-
-	}
-
-	.broadcastTopBtm {
-		padding: 12rx;
-		overflow: hidden;
-		position: relative;
-	}
-
-	.broadcastDataTopBtmDatacss_top {
-		width: 100%;
-		animation-name: around_top;
-		animation-duration: var(--scrollSpeed--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		position: absolute;
-		left: 0;
-	}
-
-	@keyframes around_top {
-		from {
-			top: 0%;
-		}
-
-		to {
-			top: var(--scrollHeight--);
-		}
-	}
-
-	.broadcastDataTopBtmDatacss_bottom {
-		width: 100%;
-		animation-name: around_Bottom;
-		animation-duration: var(--scrollSpeed--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		position: absolute;
-		left: 0;
-	}
-
-	@keyframes around_Bottom {
-		from {
-			bottom: 0%;
-		}
-
-		to {
-			bottom: var(--scrollHeight--);
-		}
-	}
-
-	.broadcastDataTopBtmDatacss_let {
-		width: 100%;
-		animation-name: around_let;
-		animation-duration: var(--scrollSpeed2--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		position: absolute;
-		left: 0;
-		top: 0;
-	}
-
-	.broadcastDataTopBtmDatacss_rig {
-
-		width: 100%;
-		animation-name: around_rig;
-		animation-duration: var(--scrollSpeed2--);
-		animation-iteration-count: infinite;
-		animation-timing-function: linear;
-		position: absolute;
-		right: 0%;
-		top: 0;
-		display: flex;
-		justify-content: flex-end;
-	}
-
-	.animation_pausedcss {
-		animation-play-state: paused;
-	}
-
-	@keyframes around_let {
-		from {
-			left: 0%;
-		}
-
-		to {
-			left: var(--scrollWidth--);
-		}
-	}
-
-	@keyframes around_rig {
-		from {
-			right: 0%;
-		}
-
-		to {
-			right: var(--scrollWidth--);
-		}
-	}
-
-	.bdbd_item {
-		padding: 0 12rpx;
-		line-height: 60rpx;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	@font-face {
-		font-family: "iconfont";
-		src: url('//at.alicdn.com/t/font_1686137_9el2ov99ag.eot?t=1589197045289');
-		/* IE9 */
-		src: url('//at.alicdn.com/t/font_1686137_9el2ov99ag.eot?t=1589197045289#iefix') format('embedded-opentype'),
-			/* IE6-IE8 */
-			url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAANIAAsAAAAAByAAAAL7AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCCcAqCJIIbATYCJAMICwYABCAFhG0HNxtIBhHVmxnIfiTYMS7bb8koPCedCeJJj2/e7iZfYqkjkZzk9lw0oCspm5uha1SEYUrOg//lO9IN4UL4FQBGHE6b4vPv8pzmojHnedQFGG8NaG9cCySQAgnMG8ZuIniA2yGAP8kUIg0ateiALwbQTwAZMXRwX3wLLgzGifoi2A1TDbIKC1+1WF0CVvLvy0fKxRcUlgYkthnUcAB13sA47XgOPSgBwXIGwJkFGigEDEiHRlMrtAwVovGPQoZ0OFa2wJs6nkf5h/3jgYDYgMxAABJ1/jMJsPBRMxUARq/vB7iTzgYmPjQ5vv+S6E4b/P2XXBBxLwYELI3pvDFm/XqMs27QknXgrK82yepoddiXOXTJhi3NTe/e7XznTqcNG7ZujLoN2Drexulwy99hXacl0UZCzNW77p1WfV52MOpyx+O3nVuFt1qs+xziN+DL8Q0BU2N17J84FTs1YMOXE/2dXf8DTwV62/5bne0/dmdranzv25uGonfvtepore/p0pXugqw9N2SpuKsuTSuYO7vtjzV1oka1azMqsm50/SYtYxvHNug6blqbRuGpQccDpjYpGzCwauyCmnETJpadjJjwO6teaETz1uHNQjPqfmhPHQC8q/q2Lvj3vyF17cvZvUOqvvkGGAAePO36jTu8q4ZhFvC9Q7PAnxYMzDOxCKjUI/MNs6JfzoECneta8QC2cJ5MVUe9VkzwJerlLD4kZdD4kkk01EJYBFAJG19q4U8BjWcHEME4NGL8gHzmaxBCOQlFMBehCeUy0VAfwyKaz7AJFQ1/OknEkgFki5dUfUYt6MD8IFnaPdKKEtk3DFfVnBdx2gv5TF4Yu6EcXXFHXmLE+Q6TiAfPtMGi7Ya1EhxMGa10UeSY+943XamztDWK+oxa0IH5QbK0e1pcVOXzNwxX1dyRM+J8IZ+pcRi7YQBxle+Dch5ln/MdJhEPnmmDRTNghSGCo7lTRitdnBA45t4o5IfKu+2V298tAfwBGiWwuSZo8KX3YOgfkRnbpgEA') format('woff2'),
-			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.woff?t=1589197045289') format('woff'),
-			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.ttf?t=1589197045289') format('truetype'),
-			/* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-			url('//at.alicdn.com/t/font_1686137_9el2ov99ag.svg?t=1589197045289#iconfont') format('svg');
-		/* iOS 4.1- */
-	}
-
-	.iconfont {
-		font-family: "iconfont" !important;
-		font-size: 16px;
-		font-style: normal;
-		-webkit-font-smoothing: antialiased;
-		-moz-osx-font-smoothing: grayscale;
-	}
-
-	.icon-guangbozheng-:before {
-		content: "\e640";
-	}
-</style>
diff --git a/components/lff-barrage/lff-barrage.vue b/components/lff-barrage/lff-barrage.vue
deleted file mode 100644
index 99e6640..0000000
--- a/components/lff-barrage/lff-barrage.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-	<view style="" class="zcq">
-		<view class="danmu-li" v-for="(item,index) in listData" :class="item.type" :style="[item.style]" :key="index">
-			<view class="danmu-inner">
-				<view class="user-box">
-					<view class="user-img">
-						<view class="img-box">
-							<image :src="item.headimg"></image>
-						</view>
-					</view>
-					<!-- <view class="user-text cl1">
-						人名
-					</view> -->
-					<view class="user-status cl1">
-						{{item.item}}
-						<!-- <span :style="'color:'+ item.color"> {{item.title}}</span> -->
-
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	export default {
-		props: {
-			//rightToLeft leftToRight leftBottom
-			type: {
-				type: String,
-				default: 'rightToLeft'
-			},
-			minTime: {
-				type: Number,
-				default: 5
-			},
-			maxTime: {
-				type: Number,
-				default: 10
-			},
-			minTop: {
-				type: Number,
-				default: 0
-			},
-			maxTop: {
-				type: Number,
-				default: 50
-			},
-			hrackH: { //轨道高度
-				type: Number,
-				default: 40
-			},
-			noStacked: { //不允许堆叠(暂不可用)
-				type: Array,
-				default () {
-					return []
-				}
-			}
-		},
-		data() {
-			return {
-				listData: []
-			}
-		},
-		mounted() {
-			this.hrackNum = Math.floor((this.maxTop - this.minTop) / this.hrackH);
-		},
-		methods: {
-			add(obj) {
-				let data = {
-					item: obj.item,
-					title: obj.title,
-					color: obj.color,
-					id: Date.parse(new Date()),
-					time: Math.ceil(Math.floor(Math.random() * (this.maxTime - this.minTime + 1) + this.minTime)),
-					type: this.type,
-					headimg: obj.headimg
-				}
-				if (this.type === 'leftBottom') {
-					let objData = {
-						item: data.item,
-						title: data.title,
-						color: data.color,
-						type: 'leftBottomEnter',
-						style: {
-							transition: `all 0.5s`,
-							animationDuration: `0.5s`,
-							transform: `translateX(0%)`,
-							bottom: `${this.minTop}px`
-						}
-					}
-					let listLen = this.listData.length;
-					let hrackNum = this.hrackNum;
-					for (let i in this.listData) {
-						if (this.listData[i].status === 'reuse') { //重用
-							this.$set(this.listData, i, objData);
-						} else if (this.listData[i].status === 'reset') { //重置
-							this.listData[i].style.transition = 'none';
-							this.listData[i].style.bottom = 0;
-							this.listData[i].status = 'reuse';
-						} else if (this.listData[i].status === 'recycle') { //回收
-							this.listData[i].type = 'leftBottomExit';
-							this.listData[i].status = 'reset';
-						} else {
-							this.listData[i].style.bottom = parseInt(this.listData[i].style.bottom) + this.hrackH + 'px';
-						}
-						if (parseInt(this.listData[i].style.bottom) >= (this.maxTop - this.hrackH) && this.listData[i]
-							.status !== 'reset') { //需要回收
-							this.listData[i].status = 'recycle';
-						}
-					}
-					if (listLen < hrackNum + 2) {
-						this.listData.push(objData);
-					}
-				} else if (this.type === 'rightToLeft' || this.type === 'leftToRight') {
-					let objData = this.horStacked(data);
-					for (let i in this.listData) {
-						if (this.listData[i].delTime <= Date.parse(new Date())) {
-							this.repaint(i, objData.type);
-							objData.type = '';
-							this.$set(this.listData, i, objData);
-							return
-						}
-					}
-					this.listData.push(objData);
-				}
-			},
-			horStacked(data) {
-				// console.log(data)
-				return {
-					item: data.item,
-					type: this.type,
-					title: data.title,
-					color: data.color,
-					style: {
-						animationDuration: `${data.time}s`,
-						top: `${Math.ceil(Math.random() * (this.maxTop - this.minTop + 1) + this.minTop)}px`,
-						opacity: 1
-					},
-					delTime: Date.parse(new Date()) + data.time * 1200,
-					headimg: data.headimg
-				}
-			},
-			repaint(index, type) {
-				setTimeout(() => {
-					this.listData[index].type = type;
-				}, 100)
-			}
-		}
-
-	}
-</script>
-<style>
-
-</style>
-<style lang="scss">
-	.zcq {
-
-		top: 0rpx;
-		z-index: 99;
-		left: 0rpx;
-		box-sizing: border-box;
-		// font-family: 'zcq';
-		// border: 1px solid red;
-		position: absolute;
-		width: 750rpx;
-		height: 300rpx;
-		pointer-events: none;
-
-	}
-
-	@keyframes leftBottomEnter {
-		0% {
-			transform: translateY(100%);
-			opacity: 0;
-		}
-
-		100% {
-			transform: translateY(0%);
-			opacity: 1;
-		}
-	}
-
-	@keyframes leftBottomExit {
-		0% {
-			transform: translateY(0%);
-			opacity: 1;
-		}
-
-		100% {
-			transform: translateY(-200%);
-			opacity: 0;
-		}
-	}
-
-	@keyframes leftToRight {
-		0% {
-			transform: translateX(-100%);
-			// opacity: 0;
-		}
-
-		100% {
-			transform: translateX(100%);
-			// opacity: 1;
-		}
-	}
-
-	@keyframes rightToLeft {
-		0% {
-			transform: translateX(100%);
-			opacity: 0.5;
-		}
-
-		100% {
-			transform: translateX(-100%);
-			opacity: 1;
-		}
-	}
-
-	.danmu-li {
-		position: absolute;
-		width: 100%;
-		opacity: 0;
-		transform: translateX(100%);
-		animation-timing-function: linear;
-
-		&.leftBottomEnter {
-			animation-name: leftBottomEnter;
-		}
-
-		&.leftBottomExit {
-			animation-name: leftBottomExit;
-			animation-fill-mode: forwards;
-		}
-
-		&.rightToLeft {
-			animation-name: rightToLeft;
-		}
-
-		&.leftToRight {
-			animation-name: leftToRight;
-		}
-
-		.danmu-inner {
-			display: inline-block;
-
-			.user-box {
-				display: flex;
-				padding: 3rpx 40rpx 3rpx 10rpx;
-				background: linear-gradient(90deg, #5CEFE3 0%, rgba(92,239,227,0) 100%);
-				border-radius: 32rpx;
-				align-items: center;
-				// border: 1px solid rgba(204, 204, 204, 1);
-
-				.user-img {
-					.img-box {
-						display: flex;
-
-						image {
-							width: 58rpx;
-							height: 58rpx;
-							background: rgba(55, 55, 55, 1);
-							border-radius: 50%;
-						}
-					}
-				}
-
-				.user-status {
-					margin-left: 10rpx;
-					white-space: nowrap;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: rgba(255, 255, 255, 1);
-				}
-
-				.user-text {
-					margin-left: 10rpx;
-					// white-space: nowrap;
-					font-size: 28rpx;
-					font-weight: 400;
-					width: 80rpx;
-					color: rgba(255, 255, 255, 1);
-				}
-			}
-		}
-	}
-</style>
diff --git a/components/lff-barrage/markdown.md b/components/lff-barrage/markdown.md
deleted file mode 100644
index e709651..0000000
--- a/components/lff-barrage/markdown.md
+++ /dev/null
@@ -1,15 +0,0 @@
-#如何使用
-###js
-```javascript
-import lffBarrage from '@/components/lff-barrage/lff-barrage.vue'
-components:{lffBarrage},
-methods:{
-	colrdo(){ //插入一条弹幕
-		this.$refs.lffBarrage.add({item:'你好呀小伙子'});
-	}
-}
-```
-###HTML
-```html
-<lff-barrage ref="lffBarrage"></lff-barrage>
-```
\ No newline at end of file
diff --git a/components/nav-header/nav-header.vue b/components/nav-header/nav-header.vue
index a2af64b..b229716 100644
--- a/components/nav-header/nav-header.vue
+++ b/components/nav-header/nav-header.vue
@@ -219,7 +219,7 @@ export default {
 						}
 					});
 				} else {
-					this.$customRouter.navigateTo('/pages/shouye/index', {}, 'switchTab');
+					this.$customRouter.navigateTo('/pages/main/index', {}, 'switchTab');
 				}
 			}
 		},
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index a6de0d1..56f615a 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -57,7 +57,7 @@
 								icon: '/static/tabbar/chousang.png',
 								actIcon: '/static/tabbar/chousang_sel.png',
 								title: '首页',
-								path: '/pages/shouye/index'
+								path: '/pages/main/index'
 							},
 							{
 								id: 2,
@@ -85,7 +85,7 @@
 								icon: '/static/tabbar/mine.png',
 								actIcon: '/static/tabbar/mine_sel.png',
 								title: '我的',
-								path: '/pages/user/index'
+								path: '/pages/users/index'
 							}
 
 						]
@@ -95,7 +95,7 @@
 								icon: '/static/tabbar/chousang.png',
 								actIcon: '/static/tabbar/chousang_sel.png',
 								title: '首页',
-								path: '/pages/shouye/index'
+								path: '/pages/main/index'
 							},
 							{
 								id: 2,
@@ -123,7 +123,7 @@
 								icon: '/static/tabbar/mine.png',
 								actIcon: '/static/tabbar/mine_sel.png',
 								title: '我的',
-								path: '/pages/user/index'
+								path: '/pages/users/index'
 							}
 
 						]
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
deleted file mode 100644
index f8540ef..0000000
--- a/custom-tab-bar/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-Component({
-	data: {
-		selected: 0,
-		color: "#C6C6C6",
-		selectedColor: "#333333",
-		list: [{
-				"index": 0,
-				"pagePath": "/pages/shouye/index",
-				"iconPath": "/static/tab/n1.png",
-				"selectedIconPath": "/static/tab/s1.png",
-				"text": "首页"
-			},
-			{
-				"index": 2,
-				"pagePath": "/pages/mall/index",
-				"iconPath": "/static/tab/n5.png",
-				"selectedIconPath": "/static/tab/s5.png",
-				"text": "商城"
-			},
-			{
-				"index": 3,
-				"pagePath": "/pages/kit/kit",
-				"iconPath": "/static/tab/n3.png",
-				"selectedIconPath": "/static/tab/s3.png",
-				"text": "盒柜"
-			},
-			{
-				"index": 1,
-				"pagePath": "/pages/infinite/index",
-				"iconPath": "/static/tab/n2.png",
-				"selectedIconPath": "/static/tab/s2.png",
-				"text": "福利"
-			},
-			{
-				"index": 4,
-				"pagePath": "/pages/user/index",
-				"iconPath": "/static/tab/n4.png",
-				"selectedIconPath": "/static/tab/s4.png",
-				"text": "我的"
-			}
-		]
-	},
-	attached() {},
-	methods: {
-		switchTab(e) {
-			const data = e.currentTarget.dataset
-			const url = data.path
-			console.log(e, data, url, data.index)
-			wx.switchTab({
-				url
-			})
-			// console.log('aaaaaaaa', this.selected, data.index);
-			this.setData({
-				selected: data.index
-			})
-		}
-	}
-})
\ No newline at end of file
diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json
deleted file mode 100644
index 32640e0..0000000
--- a/custom-tab-bar/index.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "component": true
-}
\ No newline at end of file
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
deleted file mode 100644
index 384bc45..0000000
--- a/custom-tab-bar/index.wxml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--miniprogram/custom-tab-bar/index.wxml-->
-<view class="tab-bar">
-  <view class="tab-bar-border"></view>
-  <view wx:for="{{list}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{item.index}}" bindtap="switchTab"
-  style="display: {{item.index === -1 ? 'none' : 'flex'}}">
-    <image src="{{selected === item.index  ? item.selectedIconPath : item.iconPath}}"></image>
-    <view style="color: {{selected === item.index  ? selectedColor : color}}">{{item.text}}
-	</view>
-  </view>
-</view>
diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss
deleted file mode 100644
index f460837..0000000
--- a/custom-tab-bar/index.wxss
+++ /dev/null
@@ -1,42 +0,0 @@
-.tab-bar {
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	box-sizing: content-box;
-	height: 44px;
-	background: #FFFFFF;
-	display: flex;
-	padding-top: 10px;
-	box-shadow: 10px 10px 5px rgba(0, 0, 0, 0.5);
-	padding-bottom: env(safe-area-inset-bottom);
-}
-
-.tab-bar-border {
-	background-color: #404241;
-	position: absolute;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 1px;
-	transform: scaleY(0.5);
-}
-
-.tab-bar-item {
-	flex: 1;
-	text-align: center;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	position: relative;
-}
-
-.tab-bar-item image {
-	width: 48rpx;
-	height: 48rpx;
-}
-
-.tab-bar-item view {
-	font-size: 10px;
-}
\ No newline at end of file
diff --git a/package/index/coupon-center.vue b/package/index/coupon-center.vue
deleted file mode 100644
index f30d92c..0000000
--- a/package/index/coupon-center.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<!--
- * @Date: 2024-01-17 11:00:11
- * @LastEditTime: 2024-01-17 17:28:11
- * @Description: content
--->
-<template>
-  <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      title="领券中心"
-      color="#fff"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="$c.back"
-    ></uni-nav-bar>
-
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      @down="downCallback"
-      @up="getList"
-      :down="downOption"
-      :up="upOption"
-    >
-      <view
-        class="list-item common_bg"
-        v-for="(item, i) in listData"
-        :key="i"
-        :style="{
-         backgroundImage: ``
-        }"
-        :class="{
-          dis: item.is_find == 1
-        }"
-      >
-        <view class="money">
-          ¥
-          <text>{{ item.price }}</text>
-        </view>
-
-        <view class="info">
-          <view class="title">{{ item.title }}</view>
-
-          <view class="time">领取后有效期{{ item.effective_day }}天</view>
-        </view>
-
-        <view
-          v-if="item.is_find != 1"
-          class="btn"
-          @click="$c.noDouble(getCoupon, item)"
-        >
-          立即领取
-        </view>
-
-        <view v-else class="btn">已领取</view>
-      </view>
-    </mescroll-body>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      // 下拉刷新的配置(可选, 绝大部分情况无需配置)
-      downOption: {
-        auto: false
-      },
-      // 上拉加载的配置(可选, 绝大部分情况无需配置)
-      upOption: {
-        auto: true,
-        page: {
-          size: 10 // 每页数据的数量,默认10
-        }
-      },
-      listData: [],
-      optData: ''
-    }
-  },
-
-  onLoad(options) {
-    this.optData = options
-  },
-
-  methods: {
-    getCoupon(item) {
-      this.req({
-        url: 't_coupon_ling',
-        data: {
-          coupon_id: item.id
-        },
-        success: res => {
-          if (res.status == 1) {
-            this.$c.toast({
-              title: res.msg,
-              duration: 500,
-              success: () => {
-                this.mescroll.resetUpScroll()
-                this.mescroll.scrollTo(0, 0)
-              }
-            })
-          }
-        }
-      })
-    },
-
-    /**
-     * @description: 获取列表
-     * @param {*} num
-     * @param {*} size
-     * @return {*}
-     */
-    getList({ num, size }) {
-      this.req({
-        url: 't_coupon_list',
-        data: {
-          page: num,
-          coupon_id: this.optData.coupon_id
-        },
-        Loading: true,
-        success: res => {
-          if (res.status == 1) {
-            if (num == 1) {
-              this.listData = []
-            }
-
-            this.listData = this.listData.concat(res.data.list)
-            this.mescroll.endByPage(res.data.list.length, res.data.last_page)
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.content {
-  padding: 0 0 30rpx;
-
-  .list-item {
-    width: 710rpx;
-    box-sizing: border-box;
-    padding: 40rpx 30rpx 40rpx 10rpx;
-    display: flex;
-    align-items: center;
-    margin: 0 auto 20rpx;
-
-    .money {
-      width: 160rpx;
-      text-align: center;
-      // background: #f00;
-
-      font-size: 26rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #ffffff;
-
-      text {
-        font-size: 42rpx;
-      }
-    }
-
-    .info {
-      flex: 1;
-      padding-left: 20rpx;
-
-      .title {
-        font-size: 32rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #ffffff;
-      }
-
-      .time {
-        margin-top: 20rpx;
-
-        font-size: 24rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #dddddd;
-      }
-    }
-
-    .btn {
-      width: 130rpx;
-      height: 50rpx;
-      background: linear-gradient(90deg, #2dcbff 0%, #ff95fb 100%);
-      border-radius: 25rpx;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #222222;
-    }
-
-    &.dis {
-      filter: grayscale(1);
-
-      .btn {
-        color: #ccc;
-        background: none;
-        border: 1px solid #ccc;
-      }
-    }
-  }
-}
-</style>
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
deleted file mode 100644
index 1e88538..0000000
--- a/package/index/leitai.vue
+++ /dev/null
@@ -1,1941 +0,0 @@
-<!--
- * @Date: 2023-11-13 15:46:52
- * @LastEditTime: 2024-03-05 15:54:07
- * @Description: content
--->
-<template>
-	<view class="content">
-		<view class="navLeft align-center" :style="{ top: $sys().statusBarHeight + 'px' }" @tap="$c.back(1)">
-			<uni-icons type="left" color="#000000"></uni-icons>
-		</view>
-
-		<view class="header" v-if="pageData.goods">
-			<view class="header-title center relative">
-				<!-- <image :src="$img1('index/ljLeft.png')"></image> -->
-				<text class="" style="padding-top: 20rpx;">擂台赏</text>
-				<!-- <image :src="$img1('index/ljRight.png')"></image> -->
-			</view>
-
-			<view class="header-main">
-
-				<view class="header-main-title hidden">{{ pageData.goods.title }}</view>
-
-				<view class="header-main-wuzhe flex" v-if="pageData.goods.is_shou_zhe == 1">
-					<image class="img100" :src="$img1('common/chouBanjia.png')" mode="aspectFit"></image>
-				</view>
-
-				<view class="header-main-swiper relative">
-					<view class="header-main-swiper-item flex">
-						<image class="img100" :src="pageData.goods.imgurl_detail" mode="aspectFill"></image>
-					</view>
-					<view class="header-main-swiper-num center">第{{ pageData.goods.num }}/{{ pageData.goods.stock }}箱
-					</view>
-					<view class="header-main-swiper-huanxiang center" @click="changeBox">换箱</view>
-				</view>
-
-				<view class="header-main-price center">
-					<text>￥{{ pageData.goods.price }}</text>
-					<text>/含明信片</text>
-				</view>
-
-				<view class="header-main-huanxiang flex justify-between mt30">
-					<view class="column align-center" @click="prev">
-						<view class="center">
-							<uni-icons type="left" color="#D8D8D8"></uni-icons>
-						</view>
-						<!-- <view class="">上一箱</view> -->
-					</view>
-
-					<view class="column align-center" @click="next">
-						<view class="center">
-							<uni-icons type="right" color="#D8D8D8"></uni-icons>
-						</view>
-						<!-- <view class="">下一箱</view> -->
-					</view>
-				</view>
-				<view class="header-main-jidu column align-center">
-					<view class="flex">
-						<text :style="{ width: '80%' }"></text>
-					</view>
-					<view class="">剩余库存{{ pageData.goods.goodslist_surplus_stock }}/{{
-						pageData.goods.goodslist_stock
-					}}
-					</view>
-				</view>
-
-				<view
-					style="width: 100%; height: 232rpx; position: absolute; bottom: 0; background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));">
-				</view>
-
-			</view>
-
-		</view>
-
-		<view class="tab pd30">
-			<view class="tab-item1 center" :class="[tabCur == 1 ? 'act' : 'unact']" @click="tabChange(1)">
-				<text>赏品预览</text>
-			</view>
-			<view class="tab-item2 center" :class="[tabCur == 2 ? 'act' : 'unact']" @click="tabChange(2)">
-				<text>概率</text>
-			</view>
-			<view class="tab-item3 center" :class="[tabCur == 3 ? 'act' : 'unact']" @click="tabChange(3)">
-				<text>记录</text>
-			</view>
-		</view>
-
-		<view class="spylView" v-if="tabCur == 1 && pageData">
-			<view class="list">
-				<view class="list-item" v-for="(item, i) in pageData.goodslist" :key="i" @click="previewDetail(item)">
-					<view class="pic center relative">
-						<image class="pic-img" :src="item.imgurl" mode="aspectFit"></image>
-						<view class="type-tag center" :style="{ background: item.shang_info.color }">
-							{{ item.shang_info.title }}
-						</view>
-						<view class="num center bgfff">{{ item.surplus_stock }}/{{ item.stock }}</view>
-						<view v-if="item.goods_type == 2" class="yu-tag ziti">预售</view>
-
-						<view v-if="item.surplus_stock <= 0" class="shadow center">
-							<image :src="$img1('common/sold_out.png')"></image>
-						</view>
-					</view>
-
-					<view class="title hang1">
-						{{ item.title }}
-					</view>
-					<view class="desc">{{ item.pro }}</view>
-					<view class="price">
-						<text>售价:￥{{ item.sc_money }}</text>
-					</view>
-
-				</view>
-			</view>
-		</view>
-
-
-		<template v-if="tabCur == 2">
-			<view class="gailvList">
-				<view class="gailvList-item br10 align-center" v-for="(i, index) in pageData.goodslist" :key="index">
-					<view class="center">{{ i.shang_info.title }}</view> <!-- :style="{ color: i.shang_info.color }" -->
-					<view class="flex-1">
-						<text>{{ i.surplus_stock }}/{{ i.stock }}</text>
-						<text class="ml10">{{ i.title }}</text>
-					</view>
-					<view class="ml40">{{ i.pro }}</view>
-				</view>
-			</view>
-		</template>
-
-
-		<template v-if="tabCur == 3">
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getLog" :down="downOption"
-				:up="upOption">
-				<scroll-view class="sub-tab" scroll-x>
-					<view class="sub-tab-item" v-for="(item, i) in subTab" :key="i"
-						:class="subTabCur == i ? 'act' : 'unact'" @click="subTabChange(i)">
-						{{ item.shang_title }}
-					</view>
-				</scroll-view>
-
-				<view class="log-list">
-					<view class="log-item br20" v-for="(item, i) in logList" :key="i">
-						<view class="avatar">
-							<image :src="item.user_info.headimg" lazy-load></image>
-						</view>
-
-						<view class="info">
-							<view class="name hang1">
-								{{ item.user_info.nickname }}
-							</view>
-							<view class="time">{{ item.addtime }}</view>
-						</view>
-
-						<view class="prize">
-							<view class="pic flex">
-								<image class="img100" style="border-radius: 16rpx;" :src="item.goodslist_imgurl"
-									lazy-load></image>
-							</view>
-							<view class="column align-end" style="margin-left: 20rpx;">
-								<view class="prize-shang center">{{ item.shang_title }}</view>
-								<view class="flex mt10">
-									<view class="title hang1">
-										{{ item.goodslist_title }}
-									</view>
-									<view class="num">×1</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</mescroll-body>
-		</template>
-
-		<view v-if="pageData" class="ft-fixed">
-			<view class="lt-btn center" @click="confirmSubmit([0, 1])">
-				<text>抽1发</text>
-			</view>
-		</view>
-
-		<uni-popup ref="dPop" type="center" maskBackgroundColor="rgba(0,0,0,0.9)">
-			<view v-if="previewData" class="d-pop">
-				<view class="pic center relative">
-					<image :src="previewData.imgurl" lazy-load></image>
-					<view class="justify-center">{{ previewData.shang_info.title }}</view>
-				</view>
-
-				<view class="title">
-					<text class="hang1">
-						{{ previewData.title }}
-					</text>
-				</view>
-
-				<view class="d-list">
-					<view class="d-item">
-						{{ previewData.shang_info.title }} {{ previewData.pro }}
-					</view>
-
-					<view class="d-item">产品类型:{{ optData.type_text }}</view>
-				</view>
-
-				<view class="close icon" @click="close('dPop')">
-					<image :src="$img1('common/close.png')"></image>
-				</view>
-			</view>
-		</uni-popup>
-
-		<uni-popup ref="buyPop" type="bottom">
-			<view v-if="orderData" class="buy-pop relative">
-				<view class="buy-pop-hd">
-					<view class="close icon">
-					</view>
-					<text class="">确认订单</text>
-					<view class="close icon" @click="close('buyPop')">
-						<image :src="$img1('index/close.png')"></image>
-					</view>
-				</view>
-
-				<view class="buy-card">
-					<view class="buy-info">
-						<view class="pic flex">
-							<image class="img100" style="border-radius: 16rpx;" :src="orderData.goods.imgurl_detail">
-							</image>
-						</view>
-
-						<view class="info-r">
-							<view class="title hang1">
-								{{ orderData.goods.title }}
-							</view>
-
-							<view class="type">类型:明信片</view>
-
-							<template
-								v-if="orderData.goods.is_shou_zhe == 1 && orderData.goods.shou_zhe_price * 1 > 0">
-								<view class="price-num">
-									<view class="price">
-										<template v-if="pageData.goods.type != 5">¥</template>
-										<text>{{ orderData.goods.shou_zhe_price }}</text>
-										<template v-if="pageData.goods.type == 5">积分</template>
-										(首抽5折)
-									</view>
-
-									<view class="num">×{{ 1 }}</view>
-								</view>
-
-								<view v-if="orderData.goods.prize_num > 1" class="price-num">
-									<view class="price">
-										<template v-if="pageData.goods.type != 5">¥</template>
-										<text>{{ orderData.goods.price }}</text>
-										<template v-if="pageData.goods.type == 5">积分</template>
-									</view>
-
-									<view class="num">
-										×{{ orderData.goods.prize_num * 1 - 1 }}
-									</view>
-								</view>
-							</template>
-
-							<view v-else class="price-num">
-								<view class="price">
-									<template v-if="pageData.goods.type != 5">¥</template>
-									<text>{{ orderData.goods.price }}</text>
-									<template v-if="pageData.goods.type == 5">积分</template>
-								</view>
-
-								<view class="num">×{{ orderData.goods.prize_num }}</view>
-							</view>
-						</view>
-					</view>
-
-					<!-- <view class="line"></view> -->
-
-
-				</view>
-
-				<template v-if="pageData.goods.type != 5">
-					<view class="card-row" @click="toCoupon">
-						<view class="title">优惠券</view>
-
-						<view class="row-r">
-							{{ couponData && orderData.coupon_price > 0 ? `-${couponData.price}` : "未选择" }}
-							<view class="icon">
-								<image :src="$img1('common/right1.png')" lazy-load></image>
-							</view>
-						</view>
-
-					</view>
-					<!-- <view class="card-row" @click="$c.to({ url: '/pages/user/vip' })">
-						<view class="title">
-							{{
-				  orderData.zhe
-				    ? `会员折扣 (${orderData.zhe}折)`
-				    : "暂无会员抵扣"
-				}}
-						</view>
-						<view class="row-r">
-							详情
-							<view class="icon">
-								<image :src="$img1('common/right1.png')" lazy-load></image>
-							</view>
-						</view>
-					</view> -->
-				</template>
-
-				<!-- <view class="pay-title ziti">请选择抵扣方式</view> -->
-
-				<view v-if="pageData.goods.type == 5" class="pay-type">
-					<view class="title">
-						使用积分抵扣
-						{{ orderData.use_score }} (剩余:{{ orderData.score }})
-					</view>
-
-					<view class="icon">
-						<image v-if="true" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-				</view>
-
-				<template v-else>
-					<!-- <view class="pay-type" @click="changePay('useIntegral')">
-						<view class="title">
-							使用友达币抵扣¥ {{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个)
-						</view>
-						<view class="icon">
-							<image style="width: 20px;height: 20px;" v-if="useIntegral" :src="$img1('common/check_act.png')" lazy-load></image>
-							<image style="width: 20px;height: 20px;" v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view> -->
-
-					<view class="pay-type" @click="changePay('useMoney')">
-						<view class="title align-center">
-							使用星钻抵扣¥{{ orderData.use_money }} <text
-								style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.money
-								}})</text>
-						</view>
-						<view class="icon">
-							<image style="width: 20px; height: 20px" v-if="useMoney"
-								:src="$img1('common/check_act.png')" lazy-load></image>
-							<image style="width: 20px; height: 20px" v-else :src="$img1('common/check.png')" lazy-load>
-							</image>
-						</view>
-					</view>
-				</template>
-				<view class="rule">
-					<scroll-view class="rule-inner" scroll-y>
-						<view v-html="sendRuleData"></view>
-					</scroll-view>
-				</view>
-				<view class="agree" @click="isAgree = !isAgree">
-					<view class="icon">
-						<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-
-					我已满18岁,阅读并同意
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=4' })">
-						《用户协议》
-					</text>
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=5' })">
-						《隐私政策》
-					</text>
-				</view>
-
-				<view class="pay-btn" @click="$c.noDouble(confirmSubmit, [1, buyNum])">
-					<text>确认支付</text>
-					<text>{{
-						pageData.goods.type == 5
-							? ` ${orderData.use_score}积分`
-							: ` ¥${orderData.price}`
-					}}</text>
-				</view>
-			</view>
-		</uni-popup>
-
-		<buy-notice ref="buyNotice" @confirm="$c.noDouble(confirmSubmit, [1, buyNum, true])"></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">
-								{{ item.goodslist_title }}
-							</view>
-							<view class="exchange">
-								{{
-									item.goodslist_money * 1 > 0
-										? `可兑换:${item.goodslist_money}`
-										: `不可兑换`
-								}}
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-
-				<view class="res-pop-ft mt20">
-					<view class="ft-btn common_bg justify-center" :style="{
-						backgroundImage: `url(${$img1('common/quhegui.png')})`,
-					}" @click="toBag">
-						<text>去发货</text>
-					</view>
-
-					<view class="ft-btn common_bg justify-center" :style="{
-						backgroundImage: `url(${$img1('common/jixuchou.png')})`,
-					}" @click="close('resPop')">
-						<text>继续抽</text>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-
-		<view v-if="aniShow" class="ani-pop">
-			<image :src="aniSrc" lazy-load></image>
-		</view>
-
-		<rule-pop ref="rulePop"></rule-pop>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			optData: "",
-			boxNum: "",
-			buyNum: 0,
-			useMoney: true,
-			useIntegral: false,
-			// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-			downOption: {
-				auto: false,
-			},
-			// 上拉加载的配置(可选, 绝大部分情况无需配置)
-			upOption: {
-				auto: true,
-				page: {
-					size: 15, // 每页数据的数量,默认10
-				},
-			},
-			tabList: {
-				1: {
-					title: "商品预览",
-				},
-				2: {
-					title: "概率",
-				},
-				3: {
-					title: "记录",
-				},
-			},
-			tabCur: 1,
-			subTab: [],
-			subTabCur: 0,
-			payType: {
-				1: {
-					title: "友达币",
-					icon: "/static/img/pay_type1.png",
-				},
-				2: {
-					title: "星钻",
-					icon: "/static/img/pay_type2.png",
-				},
-			},
-			payTypeCur: 1,
-			isAgree: true,
-			pageData: "",
-			couponData: "",
-			orderData: "",
-			prizeData: "",
-			secTimer: null,
-			secNum: 0,
-			aniSrc: "",
-			aniShow: false,
-			logList: [],
-			sendRuleData: "",
-			previewData: "",
-			current: 0,
-		};
-	},
-
-	onShareAppMessage() {
-		return {
-			title: this.$config.getAppSetting("app_name") +
-				`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
-			imageUrl: this.pageData.goods.imgurl_detail,
-			path: "/pages/shouye/detail" +
-				this.$c.qs({
-					goods_id: this.pageData.goods.id,
-					goods_num: this.pageData.goods.num,
-					pid: uni.getStorageSync("userinfo").ID,
-				}),
-		};
-	},
-
-	onLoad(options) {
-		console.log(options);
-		this.optData = options;
-
-		this.tabChange(this.tabCur);
-
-		uni.$on("chooseCoupon", (data) => {
-			// console.log('data', data)
-
-			this.couponData = data;
-			this.confirmSubmit([0, this.buyNum]);
-		});
-
-		this.$c.getRule(10).then((res) => {
-			if (res.status == 1) {
-				this.sendRuleData = res.data;
-			}
-		});
-	},
-
-	onReady() {
-		// this.open('dPop')
-		// this.open('buyPop')
-		// this.open('buyNotice')
-		// this.open('resPop')
-	},
-
-	onUnload() {
-		uni.$off("chooseCoupon");
-	},
-
-	methods: {
-		previewDetail(item) {
-			console.log(item);
-			this.previewData = item;
-
-			this.open("dPop");
-		},
-
-		resetSec() {
-			clearInterval(this.secTimer);
-			this.secTimer = null;
-			this.secNum = 0;
-		},
-
-		runSec(time) {
-			const nowTime = Math.floor(Date.now() / 1000);
-
-			if (time < nowTime) {
-				this.resetSec();
-				return;
-			}
-
-			this.secTimer && clearInterval(this.secTimer);
-
-			this.secNum = time - nowTime;
-			this.secTimer = setInterval(() => {
-				if (this.secNum <= 0) {
-					this.resetSec();
-
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					});
-					setTimeout(() => {
-						// uni.hideLoading()
-						this.doRefresh();
-					}, 1000);
-					return;
-				}
-
-				this.secNum -= 1;
-			}, 1000);
-		},
-
-		toCoupon() {
-			this.$c.to({
-				url: "/pages/user/coupon",
-				query: {
-					type: 2,
-					total_price: this.orderData.order_total,
-				},
-			});
-		},
-
-		getPrize(order_num) {
-			if (!order_num) {
-				return;
-			}
-
-			setTimeout(() => {
-				this.req({
-					url: "prizeorderlog",
-					data: {
-						order_num,
-					},
-					success: (res) => {
-						if (res.status == 1) {
-							this.prizeData = res.data;
-
-							if (res.data.data.length <= 0) {
-								this.getPrize(order_num);
-								return;
-							}
-
-							// this.aniShow = true
-							// setTimeout(() => {
-							//   this.aniShow = false
-							this.bgmCtx.openBgm.stop();
-							this.bgmCtx.openBgm.play();
-							this.open("resPop");
-							// }, 1300)
-						}
-					},
-				});
-			}, 500);
-		},
-
-		changePay(e) {
-			this[e] = !this[e];
-
-			this.confirmSubmit([0, this.buyNum]);
-		},
-
-		confirmSubmit([type, num, fromNotice = false]) {
-			let url = "ordermoney";
-
-			if (type == 1) {
-				url = "orderbuy";
-
-				if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
-					this.$refs.buyNotice.getRule(6);
-					return;
-				}
-			}
-
-			this.buyNum = num;
-
-			let data = {
-				goods_id: this.pageData.goods.id,
-				prize_num: this.buyNum,
-				goods_num: this.pageData.goods.num,
-				use_money_is: this.useMoney ? 1 : 2,
-				use_integral_is: this.useIntegral ? 1 : 2,
-				coupon_id: (this.couponData && this.couponData.id) || "",
-				// ad_id: uni.getStorageSync('_ad_id')
-			};
-
-			if (this.pageData.goods.type == 5) {
-				data.coupon_id = "";
-			}
-
-			this.req({
-				url,
-				data,
-				success: async (res) => {
-					if (res.status == 1) {
-						if (type == 0) {
-							if (res.data.coupon_id) {
-								this.couponData = {
-									id: res.data.coupon_id,
-									price: res.data.coupon_price,
-								};
-							}
-
-							this.orderData = res.data;
-
-							this.open("buyPop");
-						}
-
-						if (type == 1) {
-							this.close("buyPop");
-
-							if (res.data.status == 1) {
-								const status = await this.$platform.pay({
-									data: res.data.res
-								},this)
-								if (status == "success") {
-									this.getPrize(res.data.order_num);
-									this.doRefresh();
-								}
-							} else {
-								this.$c.toast({
-									title: res.msg,
-									duration: 500,
-									success: () => {
-										this.getPrize(res.data.order_num);
-										this.doRefresh();
-									},
-								});
-							}
-						}
-					}
-				},
-			});
-		},
-
-		toggleCollect() {
-			this.req({
-				url: "addCollect",
-				data: {
-					goods_id: this.pageData.goods.id,
-					goods_num: this.pageData.goods.num,
-				},
-				success: (res) => {
-					if (res.status == 1) {
-						this.doRefresh();
-					}
-				},
-			});
-		},
-
-		toBag() {
-			this.close("resPop");
-
-			this.$c.to({
-				type: 3,
-				url: "/pages/kit/kit",
-			});
-		},
-
-		changeBox() {
-			this.$c.to({
-				url: "/pages/shouye/huanxiang",
-				query: {
-					id: this.pageData.goods.id,
-					type_text: this.optData.type_text,
-					type: 3,
-				},
-			});
-		},
-
-		doRefresh() {
-			this.getData();
-
-			if (this.tabCur == 2) {
-				this.tabChange(this.tabCur);
-			}
-		},
-
-		subTabChange(i) {
-			this.subTabCur = i;
-			this.logList = [];
-
-			this.$nextTick(() => {
-				setTimeout(() => {
-					this.mescroll.resetUpScroll();
-					this.mescroll.scrollTo(0, 0);
-				}, 100);
-			});
-		},
-
-		tabChange(i) {
-			this.tabCur = i;
-
-			switch (Number(i)) {
-				case 1:
-					this.getData();
-					break;
-				case 2:
-					this.getData();
-					break;
-				case 3:
-					this.subTabChange(this.subTabCur);
-					break;
-				case 4:
-					break;
-			}
-		},
-
-		next() {
-			if (this.optData.goods_num >= this.pageData.goods.stock) {
-				this.optData.goods_num = this.pageData.goods.stock;
-
-				this.$c.toast({
-					title: "已经是最后一箱了",
-				});
-				return;
-			}
-
-			this.optData.goods_num += 1;
-			this.getData();
-		},
-
-		prev() {
-			if (this.optData.goods_num <= 1) {
-				this.optData.goods_num = 1;
-
-				this.$c.toast({
-					title: "已经是第一箱了",
-				});
-				return;
-			}
-
-			this.optData.goods_num -= 1;
-			this.getData();
-		},
-
-		getLog({
-			num,
-			size
-		}) {
-			if (num > 1) return this.mescroll.endByPage(this.logList.length, 1);
-			this.req({
-				url: "shang_log",
-				data: {
-					page: num,
-					goods_id: this.optData.goods_id,
-					goods_num: this.optData.goods_num,
-					shang_id: this.subTab.length > 0 ? this.subTab[this.subTabCur].shang_id : "",
-				},
-				Loading: true,
-				success: (res) => {
-					if (res.status == 1) {
-						this.subTab = res.data.category;
-
-						if (num == 1) {
-							this.logList = [];
-						}
-
-						this.logList = this.logList.concat(res.data.data);
-						this.mescroll.endByPage(res.data.data.length, res.data.last_page);
-					}
-				},
-			});
-		},
-
-		getData() {
-			this.req({
-				url: "goodsdetail",
-				data: {
-					goods_id: this.optData.goods_id,
-					goods_num: this.optData.goods_num,
-				},
-				success: (res) => {
-					if (res.status == 1) {
-						this.optData.goods_num = Number(res.data.goods.num);
-
-						if (
-							res.data.goods.lock_is == 1 &&
-							res.data.lock_info.goods_lock_surplus_time > 0
-						) {
-							this.runSec(res.data.lock_info.goods_lock_surplus_time);
-						}
-
-						this.pageData = res.data;
-					}
-				},
-			});
-		},
-
-		close(e) {
-			this.$refs[e].close();
-		},
-
-		open(e) {
-			this.$refs[e].open();
-		},
-	},
-};
-</script>
-
-<style lang="scss">
-.navLeft {
-	position: fixed;
-	left: 30rpx;
-	z-index: 100;
-	height: 44px;
-
-	>view {
-		font-family: YouSheBiaoTiHei;
-		font-weight: 400;
-		font-size: 50rpx;
-		color: #ffffff;
-	}
-}
-
-.content {
-	background-color: #FFFFFF;
-	padding: 0 0 300rpx;
-
-	.gailvList {
-		width: 686rpx;
-		margin: 0 auto 0;
-
-		&-item {
-			margin: 28rpx 0 0;
-			box-sizing: border-box;
-			padding: 28rpx 32rpx;
-			border-radius: 16rpx;
-			background-color: #F8F8F8;
-
-			>view:nth-child(1) {
-				width: 68rpx;
-				height: 32rpx;
-				background-color: #9A8EF6;
-				border-radius: 18rpx;
-				font-weight: 500;
-				font-size: 14rpx;
-				color: #FFFFFF;
-			}
-
-			>view:nth-child(2) {
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #333333;
-				margin-left: 48rpx;
-
-				>text:nth-child(1) {
-					flex: 1;
-				}
-
-				>text:nth-child(2) {
-					flex: 3;
-				}
-			}
-
-			>view:nth-child(3) {
-				font-weight: 500;
-				font-size: 16rpx;
-				color: #F39205;
-			}
-		}
-	}
-
-	.sub-tab {
-		white-space: nowrap;
-		padding: 30rpx 0 10rpx;
-
-		.sub-tab-item {
-			display: inline-flex;
-			align-items: center;
-			padding: 0 20rpx;
-			height: 50rpx;
-			margin-left: 30rpx;
-			font-size: 20rpx;
-			font-weight: 400;
-			color: #333333;
-			font-weight: 400;
-			border-radius: 8rpx;
-
-			&.act {
-				background: #E6F791;
-				border-radius: 8rpx;
-			}
-
-			&.unact {
-				background: #F5F5F5;
-				border-radius: 8rpx;
-			}
-
-			&:last-child {
-				margin-right: 30rpx;
-			}
-		}
-	}
-
-	.log-list {
-		padding: 1rpx 30rpx 30rpx;
-
-		.log-item {
-			height: 144rpx;
-			padding: 0 20rpx;
-			display: flex;
-			align-items: center;
-			margin-top: 20rpx;
-			background: #F8F8F8;
-			border-radius: 16rpx;
-
-			.avatar {
-				width: 76rpx;
-				height: 76rpx;
-				background: #D8D8D8;
-				border-radius: 50%;
-				overflow: hidden;
-			}
-
-			.info {
-				width: 230rpx;
-				margin-left: 20rpx;
-
-				.name {
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-
-				.time {
-					margin-top: 12rpx;
-					white-space: nowrap;
-
-					font-size: 16rpx;
-					font-weight: 500;
-					color: #999999;
-				}
-			}
-
-			.prize {
-				flex: 1;
-				padding-left: 60rpx;
-				display: flex;
-				align-items: center;
-
-				.prize-shang {
-					height: 32rpx;
-					padding: 0 20rpx;
-					background: #9A8EF6;
-					border-radius: 18rpx;
-					font-weight: 500;
-					font-size: 14rpx;
-					color: #ffffff;
-				}
-
-				.pic {
-					width: 76rpx;
-					height: 76rpx;
-				}
-
-				.title {
-					width: 100rpx;
-					margin-left: 20rpx;
-					font-size: 16rpx;
-					font-weight: 500;
-					color: #333333;
-					text-align: right;
-					margin-top: 10rpx;
-				}
-
-				.num {
-					font-size: 16rpx;
-					font-weight: 500;
-					color: #333333;
-					margin-top: 10rpx;
-				}
-			}
-		}
-	}
-
-	.header {
-		padding: 80rpx 0 0;
-
-		&-title {
-			z-index: 10;
-
-			>text {
-				color: #000000;
-				margin: 10rpx 0;
-				font-weight: 600;
-				font-size: 34rpx;
-
-			}
-
-			>image {
-				width: 24rpx;
-				height: 32rpx;
-			}
-		}
-
-		&-main {
-			width: 100%;
-			height: 750rpx;
-			position: relative;
-			background-color: #3bfff9;
-			// margin: -28rpx auto 0;
-			// background: url($imgurl + "index/lianji.png") no-repeat 0 0 / 100% 100%;
-
-			&-title {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #ffffff;
-				text-align: center;
-				position: absolute;
-				z-index: 1;
-				left: 50%;
-				bottom: 24rpx;
-				transform: translateX(-50%);
-
-			}
-
-			&-wuzhe {
-				width: 160rpx;
-				height: 60rpx;
-				position: absolute;
-				top: 300rpx;
-				left: 0;
-				z-index: 20;
-			}
-
-			&-swiper {
-				margin-top: 14rpx;
-				width: 100%;
-				height: 100%;
-				z-index: 0;
-
-				&-item {
-					width: 100%;
-					height: 100%;
-					overflow: hidden;
-				}
-
-				&-num {
-					height: 38rpx;
-					background: rgba(0, 0, 0, 0.3);
-					padding: 0 20rpx;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #ffffff;
-					position: absolute;
-					bottom: 196rpx;
-					left: 50%;
-					transform: translateX(-50%);
-					z-index: 10;
-				}
-
-				&-huanxiang {
-					width: 64rpx;
-					height: 64rpx;
-					background: #F5F5F5;
-					border-radius: 50%;
-					font-weight: 400;
-					font-size: 18rpx;
-					color: #333333;
-					position: absolute;
-					bottom: 136rpx;
-					right: 32rpx;
-					z-index: 10;
-				}
-			}
-
-			&-price {
-				min-width: 280rpx;
-				height: 44rpx;
-				z-index: 20;
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 78rpx;
-				background: url($imgurl + "index/leitai.png") no-repeat 0 0 / 100% 100%;
-
-				>text:nth-child(1) {
-					font-weight: bold;
-					font-size: 24rpx;
-					color: #000000;
-				}
-
-				>text:nth-child(2) {
-					font-weight: 400;
-					font-size: 18rpx;
-					color: #000000;
-				}
-			}
-
-			&-huanxiang {
-				width: 646rpx;
-				position: absolute;
-				top: 346rpx;
-				left: 50%;
-				transform: translateX(-50%);
-
-
-				>view {
-					>view:nth-child(1) {
-						width: 56rpx;
-						height: 56rpx;
-						background: rgba(51, 51, 51, 0.5);
-						border-radius: 50%;
-					}
-
-				}
-			}
-
-			&-jidu {
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 142rpx;
-				z-index: 10;
-
-				>view:nth-child(1) {
-					width: 116rpx;
-					height: 8rpx;
-					background: rgba(255, 255, 255, 0.40);
-					border-radius: 40rpx;
-
-					>text {
-						height: 8rpx;
-						background: #D8FD24;
-						border-radius: 40rpx;
-					}
-				}
-
-				>view:nth-child(2) {
-					font-weight: 400;
-					font-size: 18rpx;
-					color: #ffffff;
-					margin-top: 4rpx;
-				}
-			}
-		}
-	}
-
-	.tab {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.tab-item1 {
-			width: 160rpx;
-			height: 92rpx;
-			font-weight: 400;
-			margin-right: 30rpx;
-
-			&.act {
-				background: url($imgurl + "index/checkTab1.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&.unact {
-				background: url($imgurl + "index/uncheckTab1.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-		}
-
-		.tab-item2 {
-			width: 160rpx;
-			height: 92rpx;
-			font-weight: 400;
-			margin-right: 30rpx;
-
-			&.act {
-				background: url($imgurl + "index/checkTab2.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&.unact {
-				background: url($imgurl + "index/uncheckTab2.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-
-			}
-		}
-
-		.tab-item3 {
-			width: 160rpx;
-			height: 92rpx;
-			font-weight: 400;
-			margin-right: 30rpx;
-
-			&.act {
-				background: url($imgurl + "index/checkTab3.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&.unact {
-				background: url($imgurl + "index/uncheckTab3.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-
-			}
-		}
-	}
-
-	.guizeSc {
-		>view {
-			>image {
-				width: 28rpx;
-				height: 28rpx;
-			}
-
-			>text {
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #ffffff;
-				margin-left: 6rpx;
-			}
-		}
-	}
-
-	.spylView {
-
-		&-head {
-			box-sizing: border-box;
-			padding: 24rpx 30rpx;
-			width: 750rpx;
-
-			>view:nth-child(2n + 1) {
-				>view:nth-child(1) {
-					width: 74rpx;
-					height: 56rpx;
-					background: #ffffff;
-					border-radius: 12rpx;
-					border: 2rpx solid #000000;
-				}
-
-				>view:nth-child(2) {
-					margin-top: 8rpx;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #ffffff;
-					text-align: center;
-				}
-			}
-
-			>view:nth-child(2) {
-				width: 420rpx;
-
-				>view:nth-child(1) {
-					width: 420rpx;
-					height: 14rpx;
-					border-radius: 40rpx;
-
-					>text {
-						height: 14rpx;
-						border-radius: 40rpx;
-						background: #b07af3;
-					}
-				}
-
-				>view:nth-child(2) {
-					padding: 14rpx 30rpx 0;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #ffffff;
-
-					>view {
-						>text {
-							font-family: YouSheBiaoTiHei;
-							font-weight: 400;
-							font-size: 36rpx;
-							color: #b07af3;
-						}
-					}
-				}
-			}
-		}
-
-		.list {
-			padding: 30rpx;
-			display: grid;
-			grid-template-columns: repeat(3, 202rpx);
-			gap: 40rpx 40rpx;
-
-			.list-item {
-				width: 202rpx;
-				box-sizing: border-box;
-				background-color: #F8F8F8;
-				border-radius: 16rpx;
-
-				.pic {
-					width: 202rpx;
-					height: 202rpx;
-					box-sizing: border-box;
-					position: relative;
-					background: #D8D8D8;
-					border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-					.pic-img {
-						width: 100%;
-						height: 100%;
-						border-radius: 16rpx 16rpx 0rpx 0rpx;
-					}
-
-					.type-tag {
-						position: absolute;
-						top: 12rpx;
-						left: 12rpx;
-						border-radius: 18rpx;
-						font-weight: 400;
-						font-size: 14rpx;
-						color: #ffffff;
-						min-width: 68rpx;
-						height: 32rpx;
-						box-sizing: border-box;
-					}
-
-					.num {
-						position: absolute;
-						left: 50%;
-						bottom: 8rpx;
-						transform: translateX(-50%);
-						border-radius: 18rpx;
-						min-width: 66rpx;
-						height: 38rpx;
-						font-weight: 400;
-						background-color: rgba(51, 51, 51, 0.50);
-						font-size: 20rpx;
-						color: #FFFFFF;
-					}
-
-					.yu-tag {
-						position: absolute;
-						right: 10rpx;
-						top: 10rpx;
-						z-index: 1;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						font-weight: 400;
-						font-size: 32rpx;
-						color: #894dd3;
-						text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0,
-							#fff 0 -1px 0;
-					}
-
-					.shadow {
-						position: absolute;
-						z-index: 1;
-						left: 0;
-						top: 0;
-						width: 100%;
-						height: 100%;
-						background: rgba(0, 0, 0, 0.6);
-
-						>image {
-							width: 86rpx;
-							height: 156rpx;
-						}
-					}
-				}
-
-				.title {
-					padding: 28rpx 18rpx 0;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #333333;
-				}
-
-				.desc {
-					padding: 24rpx 18rpx 0;
-					font-size: 18rpx;
-					font-weight: 500;
-					color: #F39205;
-				}
-
-				.price {
-					padding: 24rpx 18rpx 20rpx;
-					font-weight: 400;
-					font-size: 16rpx;
-					color: #333333;
-				}
-			}
-		}
-	}
-
-	.ft-fixed {
-		position: fixed;
-		z-index: 10;
-		left: 0;
-		bottom: 0;
-		width: 100%;
-		display: flex;
-		flex-flow: row wrap;
-		justify-content: center;
-		padding-bottom: 40rpx;
-		background: #FFFFFF;
-		padding-top: 40rpx;
-
-		.lt-btn {
-			width: 342rpx;
-			height: 92rpx;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #D8FD24;
-			background: url($imgurl + "index/chouleitai.png") no-repeat 0 0 / 100% 100%;
-
-
-		}
-
-		.btn {
-			width: 122rpx;
-			height: 111rpx;
-			position: relative;
-
-			>view {
-				white-space: nowrap;
-				font-family: YouSheBiaoTiHei;
-				font-weight: 400;
-				font-size: 52rpx;
-				color: #ffffff;
-				position: relative;
-				text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
-
-				&::before {
-					content: "";
-					position: absolute;
-					bottom: 10rpx;
-					left: -8rpx;
-					width: 22rpx;
-					height: 22rpx;
-					background: url($imgurl + "common/jiantou1.png") no-repeat 0 0 / 100% 100%;
-				}
-
-				&::after {
-					content: "";
-					position: absolute;
-					top: 0rpx;
-					right: -10rpx;
-					width: 22rpx;
-					height: 22rpx;
-					background: url($imgurl + "common/jiantou2.png") no-repeat 0 0 / 100% 100%;
-				}
-			}
-		}
-	}
-
-	.d-pop {
-		position: relative;
-		width: 570rpx;
-		box-sizing: border-box;
-
-		.pic {
-			width: 570rpx;
-			height: 598rpx;
-			background: #8953dc;
-			border: 2rpx solid #ffffff;
-
-			>image {
-				width: 548rpx;
-				height: 549rpx;
-			}
-
-			>view {
-				width: 130rpx;
-				height: 46rpx;
-				position: absolute;
-				top: -12rpx;
-				left: 0;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #ffdf46;
-				box-sizing: border-box;
-				background: url($imgurl + "common/chouLabel.png") no-repeat 0 0 / 100% 100%;
-			}
-		}
-
-		.title {
-			margin: 40rpx auto 0;
-			width: 574rpx;
-			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: #313133;
-
-			>text {
-				font-weight: 400;
-				font-size: 32rpx;
-				color: #ffffff;
-			}
-		}
-
-		.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%);
-		}
-	}
-
-	.buy-pop {
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		background: #F7F7F7;
-		padding-bottom: 30rpx;
-		border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-
-		.buy-pop-hd {
-			padding: 40rpx 0;
-			padding-left: 10rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			font-size: 28rpx;
-			font-weight: 500;
-			color: #333333;
-
-			.close {
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-
-		.buy-card {
-			border-radius: 20rpx;
-			padding: 30rpx 30rpx 30rpx;
-			background: #FFFFFF;
-
-			.buy-info {
-				display: flex;
-
-				.pic {
-					width: 180rpx;
-					height: 180rpx;
-					border-radius: 16rpx;
-				}
-
-				.info-r {
-					width: calc(100% - 190rpx);
-					box-sizing: border-box;
-					display: flex;
-					flex-flow: column nowrap;
-					justify-content: space-between;
-					padding: 10rpx 0 10rpx 30rpx;
-
-					.title {
-						font-size: 24rpx;
-						font-weight: 500;
-						color: #333333;
-					}
-
-					.hang1 {}
-
-					.type {
-						font-size: 20rpx;
-						font-weight: 500;
-						color: #999999;
-					}
-
-					.price-num {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-
-						.price {
-							font-weight: 500;
-							font-size: 16rpx;
-							color: #333333;
-
-							text {
-								font-size: 28rpx;
-							}
-						}
-
-						.num {
-							font-size: 20rpx;
-							font-weight: 500;
-							color: #999999;
-						}
-					}
-				}
-			}
-
-			.line {
-				height: 1px;
-				background: #222222;
-				margin: 30rpx 0 10rpx;
-			}
-
-
-		}
-
-		.card-row {
-			padding: 16rpx 24rpx;
-			display: flex;
-			height: 82rpx;
-			margin-top: 24rpx;
-			justify-content: space-between;
-			align-items: center;
-			border-radius: 16rpx;
-			background-color: #FFFFFF;
-
-			.title {
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.row-r {
-				display: flex;
-				align-items: center;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #999999;
-
-				.icon {
-					margin-left: 10rpx;
-					width: 10rpx;
-					height: 17.14rpx;
-				}
-			}
-		}
-
-		.pay-title {
-			margin-top: 30rpx;
-			font-size: 32rpx;
-			font-weight: 400;
-			color: #ffffff;
-		}
-
-		.pay-type {
-			padding: 30rpx 24rpx;
-			border-radius: 20rpx;
-			margin-top: 24rpx;
-			display: flex;
-			align-items: center;
-			background: #FFFFFF;
-
-			.title {
-				flex: 1;
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #333333;
-			}
-		}
-
-		.agree {
-			display: flex;
-			margin-top: 30rpx;
-			font-size: 20rpx;
-			font-weight: 400;
-			color: #999999;
-			line-height: 32rpx;
-
-			.icon {
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-			}
-		}
-
-		.rule {
-			padding: 20rpx;
-			border-radius: 20rpx;
-			box-sizing: border-box;
-			margin: 20rpx 0 0;
-			height: 160rpx;
-			background: #F9F8E1;
-			border-radius: 20rpx;
-
-			.rule-inner {
-				max-height: 120rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #333333;
-			}
-		}
-
-		.pay-btn {
-			margin: 30rpx auto 0;
-			width: 686rpx;
-			height: 84rpx;
-			background: url($imgurl + "common/payBtn.png") no-repeat 0 0 / 100% 100%;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-weight: 500;
-			color: #CDEF27;
-
-			>text:nth-child(1) {
-				font-size: 24rpx;
-			}
-
-			>text:nth-child(2) {
-				font-size: 24rpx;
-			}
-		}
-	}
-
-	.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: 750rpx;
-			height: 40vh;
-
-			.res-list {
-				padding: 30rpx 30rpx;
-				display: grid;
-				grid-template-columns: repeat(3, 210rpx);
-				gap: 30rpx 30rpx;
-
-				.res-item {
-					width: 100%;
-					box-sizing: border-box;
-
-					.pic {
-						width: 100%;
-						height: 210rpx;
-						position: relative;
-						background: #8953dc;
-						border: 2rpx solid #ffffff;
-
-						>image {
-							width: 202rpx;
-							height: 202rpx;
-						}
-
-						.type-tag {
-							position: absolute;
-							left: 14rpx;
-							top: -14rpx;
-							z-index: 2;
-							width: 134rpx;
-							height: 42rpx;
-							background: url($imgurl + "common/chouLabel.png") no-repeat 0 0 / 100% 100%;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #ffdf46;
-						}
-
-						.num {
-							position: absolute;
-							z-index: 2;
-							top: -20rpx;
-							right: -22rpx;
-							min-width: 42rpx;
-							height: 48rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #ffdf46;
-							background: url($imgurl + "common/chouNum.png") no-repeat 0 0 / 100% 100%;
-							text-shadow: #000 1rpx 0 0, #000 0 1rpx 0, #000 -1rpx 0 0,
-								#000 0 -1rpx 0;
-						}
-					}
-
-					.title {
-						padding: 10rpx 10rpx 0;
-						font-weight: 400;
-						font-size: 28rpx;
-						color: #ffffff;
-					}
-
-					.exchange {
-						padding: 10rpx 10rpx;
-						font-weight: 400;
-						font-size: 20rpx;
-						color: #ffffff;
-					}
-				}
-			}
-		}
-
-		.res-pop-ft {
-			width: 750rpx;
-			display: flex;
-			justify-content: space-evenly;
-
-			.ft-btn {
-				width: 244rpx;
-				height: 116rpx;
-				font-weight: 400;
-				font-size: 28rpx;
-
-				>text {
-					margin-top: 36rpx;
-				}
-			}
-
-			>view:nth-child(1) {
-				color: #de6025;
-			}
-
-			>view:nth-child(2) {
-				color: #7825de;
-			}
-		}
-	}
-
-	.ani-pop {
-		width: 100vw;
-		height: 100vh;
-		position: fixed;
-		left: 0;
-		top: 0;
-		z-index: 88;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		background: #000;
-
-		image {
-			width: 100%;
-			height: 1624rpx;
-		}
-	}
-}
-</style>
\ No newline at end of file
diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue
deleted file mode 100644
index e92ca1e..0000000
--- a/package/index/lian-ji.vue
+++ /dev/null
@@ -1,2186 +0,0 @@
-<!--
- * @Date: 2023-11-13 15:46:52
- * @LastEditTime: 2024-03-09 14:09:26
- * @Description: content
--->
-<template>
-	<view class="content">
-		<view class="navLeft align-center" :style="{top:$sys().statusBarHeight+'px'}" @tap="$c.back(1)">
-			<uni-icons type="left" color="#000000"></uni-icons>
-			<!-- <view class="">{{$c.detailPageTitle((pageData && pageData.goods) || '')}}</view> -->
-		</view>
-
-		<view class="center relative" style="z-index: 10;" :style="{top:$sys().statusBarHeight+'px'}">
-			<!-- <image :src="$img1('index/ljLeft.png')"></image> -->
-			<text class="" style="padding-top: 20rpx;">连击赏</text>
-			<!-- <image :src="$img1('index/ljRight.png')"></image> -->
-		</view>
-
-
-		<view v-if="pageData" class="page-hd common_bg relative">
-
-			<view v-if="pageData" class="user-btns">
-				<view class="user-num">
-					<view class="user-list">
-						<view class="avatar" v-for="(item, i) in pageData.goods.join_user.slice(0, 3)" :key="i"
-							:style="{'z-index': i}">
-							<image :src="item" lazy-load></image>
-						</view>
-					</view>
-					{{ pageData.goods.join_count }}次参与
-				</view>
-			</view>
-
-			<!-- 首抽半价 -->
-			<view v-if="pageData.goods.is_shou_zhe == 1" class="half-tag flex">
-				<image class="img100" :src="$img1('common/chouBanjia.png')" mode="aspectFit"></image>
-			</view>
-
-			<view v-if="pageTabCur == 0" class="link-num center">
-				连击×{{ pageData.goods.user_lian_ji_number }}
-			</view>
-
-
-			<view class="swiper_view1 center" @click="swCur&&swCur--">
-				<uni-icons type="left" color="#D8D8D8"></uni-icons>
-			</view>
-			<view class="swiper_view2 center" @click="(pageData.goods_list.data.length-1) != swCur&&swCur++">
-				<uni-icons type="right" color="#D8D8D8"></uni-icons>
-			</view>
-
-
-			<view class="align-center swiperAll" style="width: 100%; height: 100%; position: absolute;">
-
-				<swiper class="swiper" :indicator-dots="false" :current="swCur" @change="swChange" :autoplay="autoplay"
-					:interval="5000" :duration="500">
-					<swiper-item class="center" v-for="(item, i) in pageData.goods_list.data" :key="i">
-						<view class="swiper-item flex">
-							<image class="img100" :src="item.imgurl" mode="widthFix"></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-
-			<text class="goods-name hidden" style="">{{pageData.goods_list.data[swCur].title}}</text>
-
-			<view class="center swiperItemInfo" v-if="pageData&&pageData.goods_list.data[swCur]">
-				<text>￥{{pageData.goods_list.data[swCur].price}}/ <text style="font-size: 18rpx;">抽</text></text>
-			</view>
-
-			<view
-				style="width: 100%; height: 232rpx; position: absolute; bottom: 0; background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 1));">
-			</view>
-
-			<view class="align-center ml30 column" style="position: absolute; top: 56rpx; right: 32rpx;"
-				@tap="toggleCollect">
-				<image style="width: 64rpx; height: 64rpx;"
-					:src="pageData.goods&&pageData.goods.collection_is?$img1('index/sc1.png'):$img1('index/sc2.png')">
-				</image>
-				<text style="color: #FFFFFF; font-size: 20rpx;">收藏</text>
-			</view>
-
-		</view>
-
-
-		<view class="page-tab justify-center relative">
-			<view class="page-tab-item center" v-for="(item, i) in pageTab" :key="i" :class="{ act: pageTabCur == i }"
-				@click="pageTabChange(i)">
-				<!-- <image v-if="i==0" :src="$img1('index/ljLeft.png')"></image> -->
-				<text>{{ item.title }}</text>
-				<!-- <image v-if="i==1" :src="$img1('index/ljRight.png')"></image> -->
-			</view>
-		</view>
-
-
-		<view class="center" style="width: 100%; margin-top: 30rpx;">
-			<view class="tab">
-				<view class="tab-item1 center" @click="$refs.rulePop.getRule(15, '规则说明')">
-					<text>规则说明</text>
-				</view>
-				<view class="tab-item2 center" :class="[tabCur == 1 ? 'act' : 'unact']" @click="tabChange(1)">
-					<text>概率</text>
-				</view>
-				<view class="tab-item3 center" :class="[tabCur == 2 ? 'act' : 'unact']" @click="tabChange(2)">
-					<text>记录</text>
-				</view>
-
-
-			</view>
-
-			<!-- 	<view class="align-center guizeSc">
-				<view class="align-center">
-					<image :src="$img1('index/guize.png')"></image>
-					<text>规则</text>
-				</view>
-			</view> -->
-
-
-		</view>
-
-		<view v-if="tabCur == 1 && pageData" class="list">
-			<view class="list-item common_bg mb30" v-for="(item, i) in pageData.goodslist" :key="i">
-				<view class="list-title common_bg align-center">
-					<view class="flex-1 align-center">
-						<image :src="item.shang_imgurl"></image>
-						<text class="ml20">{{ item.pro }}</text>
-					</view>
-				</view>
-				<!-- <scroll-view scroll-x></scroll-view> -->
-				<view class="goods-list">
-					<template v-for="(a, b) in item.goods_list">
-						<view class="goods-item column" :key="b" @click="previewDetail(item, a)">
-							<view class="pic">
-								<image :src="a.imgurl" lazy-load></image>
-								<view v-if="a.goods_type == 2" class="yu-tag ziti">预售</view>
-							</view>
-							<view class="title hang1">
-								{{ a.title }}
-							</view>
-							<view class="price">售价:{{ a.price }}</view>
-						</view>
-					</template>
-				</view>
-			</view>
-		</view>
-
-		<template v-if="tabCur == 2">
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getLog" :down="downOption"
-				:up="upOption">
-				<scroll-view class="sub-tab" scroll-x>
-					<view class="sub-tab-item common_bg" v-for="(item, i) in subTab" :key="i"
-						:class="{ act: subTabCur == i }" @click="subTabChange(i)">
-						{{ item.shang_title }}
-					</view>
-				</scroll-view>
-
-				<view class="log-list">
-					<view class="log-item br10" v-for="(item, i) in logList" :key="i">
-						<view class="avatar">
-							<image :src="item.user_info.headimg" lazy-load></image>
-						</view>
-
-						<view class="info">
-							<view class="name hang1">
-								{{ item.user_info.nickname }}
-							</view>
-
-							<view class="time">{{ item.addtime }}</view>
-						</view>
-
-						<view class="prize">
-							<view class="pic flex">
-								<image class="img100" :src="item.goodslist_imgurl"></image>
-							</view>
-							<view class="align-end column">
-								<view class="center" :style="{background: item.shang_color}">{{item.shang_title}}</view>
-								<view class="align-center mt10">
-									<view class="title hang1">
-										{{ item.goodslist_title }}
-									</view>
-									<view class="num">×1</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</mescroll-body>
-		</template>
-
-		<view class="btFixed column align-center" v-if="false">
-			<template v-if="pageTabCur == 0">
-				<view class="btFixed-top center">
-					<image @click="jian" :src="$img('/static/img/jian1.png')"></image>
-					<view class="center" @click="$c.noDouble(confirmSubmit, [0])">
-						购买
-					</view>
-					<image @click="jia" :src="$img('/static/img/jia1.png')"></image>
-				</view>
-				<view class="btFixed-footer mt20 align-center justify-around">
-					<view class="btFixed-footer-one center" @click="doMax">连击MAX</view>
-					<view class="btFixed-footer-two center">连击 {{buyNum}} 次</view>
-					<view class="btFixed-footer-three center">{{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝
-					</view>
-				</view>
-			</template>
-			<template v-if="pageTabCur == 1">
-				<view class="btFixed-top center">
-					<image @click="jian" :src="$img('/static/img/jian1.png')"></image>
-					<view class="center" @click="$c.noDouble(confirmSubmit, [0])">
-						使用密保{{buyNum}}次
-					</view>
-					<image @click="jia" :src="$img('/static/img/jia1.png')"></image>
-				</view>
-				<view class="btFixed-footer2 mt20 align-center justify-around">
-					<view class="btFixed-footer2-one center" @click="doMax">连击MAX</view>
-					<view class="btFixed-footer2-two center">连击 1 次</view>
-					<view class="btFixed-footer2-three center">{{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝
-					</view>
-				</view>
-			</template>
-		</view>
-		<view class="btnFixed column align-center">
-			<view style="width: 100%; height: 75rpx; display: flex; align-items: center; position: relative;">
-
-				<view class="btnFixed-numBox align-center justify-between">
-					<image @click="jian" :src="$img1('index/jian.png')"></image>
-					<text class="flex-1 center" style="margin-bottom: 10rpx;">{{buyNum}}</text>
-					<image @click="jia" :src="$img1('index/jia.png')"></image>
-				</view>
-
-				<!-- 进度条-->
-				<view class="center" v-if="pageTabCur!=1"
-					style="min-width: 112rpx; height: 40rpx; background-color: #F5F5F5; border-radius: 20rpx; position: absolute; left: 38rpx;">
-					<view class="center row" style="color: #999999; font-size: 20rpx;">
-						<text style="font-size: 16rpx; margin-right: 8rpx;">cp:</text>
-						<text>{{pageData.goods?pageData.goods.user_lian_ji_number:0}}/{{pageData.goods?pageData.goods.lian_ji_num:0}}</text>
-					</view>
-				</view>
-
-			</view>
-
-			<view class="btnFixed-btns relative center">
-				<view :class="pageTabCur==0?'btnFixed-btns-one':'btnFixed-btns-one2 filter'"
-					@click="pageTabCur==0 && $c.noDouble(confirmSubmit, [0])">连击{{ pageTabCur==0?buyNum:0}}次</view>
-				<view :class="pageTabCur==0?'':'filter'" class="btnFixed-btns-lianji column center" @click="doMax">
-					<!-- <text>连击</text>
-					<text>MAX</text> -->
-				</view>
-				<view :class="pageTabCur==1?'btnFixed-btns-two':'btnFixed-btns-two2 filter'"
-					@click="pageTabCur==1 && $c.noDouble(confirmSubmit, [0])">
-					{{ pageData.goods?pageData.goods.user_mb_number:0 }}次夺取秘宝
-				</view>
-			</view>
-		</view>
-
-		<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
-			<view 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"
-							@click="item.isChoose = !item.isChoose">
-							<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">×1</view>
-							</view>
-							<view class="title hang1">
-								{{ item.goodslist_title }}
-							</view>
-							<view class="exchange">
-								{{
-									item.goodslist_money * 1 > 0
-									  ? `可兑换:${item.goodslist_money}`
-									  : `不可兑换`
-								  }}
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-
-				<view class="res-pop-ft mt20">
-					<view class="ft-btn common_bg justify-center" :style="{
-					   backgroundImage: `url(${$img1('common/quhegui.png')})`
-					}" @click="toBag">
-						<text>去发货</text>
-					</view>
-
-					<view class="ft-btn common_bg justify-center" :style="{
-					   backgroundImage: `url(${$img1('common/jixuchou.png')})`
-					}" @click="close('resPop')">
-						<text>继续抽</text>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="dPop" type="center" maskBackgroundColor="rgba(0,0,0,0.9)">
-			<view v-if="previewData" class="d-pop">
-				<view class="pic center relative">
-					<image :src="previewData.imgurl" lazy-load></image>
-					<view class="justify-center">{{ previewData.shang_title }}</view>
-				</view>
-
-				<view class="title">
-					<text class="hang1">
-						{{ previewData.title }}
-					</text>
-				</view>
-
-				<view class="d-list">
-					<view class="d-item">
-						{{ previewData.shang_title }} {{ previewData.pro }}
-					</view>
-
-					<view class="d-item">产品类型:{{ optData.type_text }}</view>
-				</view>
-
-				<view class="close icon" @click="close('dPop')">
-					<image :src="$img('/static/img/close.png')" lazy-load></image>
-				</view>
-			</view>
-		</uni-popup>
-
-		<uni-popup ref="buyPop" type="bottom">
-			<view v-if="orderData" class="buy-pop relative">
-				<view class="buy-pop-hd">
-					<view class="close"></view>
-					<text>确认订单</text>
-					<view class="close icon" @click="close('buyPop')">
-						<image :src="$img('/static/img/close2.png')" lazy-load></image>
-					</view>
-				</view>
-				<view class="buy-card">
-					<view class="buy-info">
-						<view class="pic">
-							<image :src="orderData.goods.imgurl_detail" lazy-load></image>
-						</view>
-						<view class="info-r">
-							<view class="title hang1">
-								{{ orderData.goods.title }}
-							</view>
-							<view class="type">类型:明信片</view>
-							<template v-if="
-								  orderData.goods.is_shou_zhe == 1 &&
-								  orderData.goods.shou_zhe_price * 1 > 0
-								">
-								<view class="price-num">
-									<view class="price">
-										¥
-										<text>{{ orderData.goods.shou_zhe_price }}</text>
-									</view>
-									<view class="num">×{{ 1 }}</view>
-								</view>
-								<view v-if="orderData.goods.prize_num > 1" class="price-num">
-									<view class="price">
-										¥
-										<text>{{ orderData.goods.price }}</text>
-									</view>
-									<view class="num">
-										×{{ orderData.goods.prize_num * 1 - 1 }}
-									</view>
-								</view>
-							</template>
-							<view v-else class="price-num">
-								<view class="price">
-									¥<text>{{ orderData.goods.price }}</text>
-								</view>
-								<view class="num">×{{ orderData.goods.prize_num }}</view>
-							</view>
-						</view>
-					</view>
-
-
-					<!-- 	<view class="card-row" @click="$c.to({ url: '/pages/user/vip' })">
-						<view class="title align-center">
-							<text class="ml20">{{ orderData.zhe ? `会员折扣 (${orderData.zhe}折)` : '暂无会员抵扣'}}</text>
-						</view>
-						<view class="row-r">
-							详情
-							<view class="icon">
-								<image :src="$img1('common/right1.png')" lazy-load></image>
-							</view>
-						</view>
-					</view> -->
-				</view>
-
-
-				<view class="card-row" @click="toCoupon">
-					<view class="title align-center">
-						<text class="ml20">优惠券</text>
-					</view>
-					<view class="row-r">
-						{{
-							couponData && orderData.coupon_price > 0
-							  ? `-${couponData.price}`
-							  : '未选择'
-						  }}
-						<view class="icon">
-							<image :src="$img1('common/right1.png')" lazy-load></image>
-						</view>
-					</view>
-				</view>
-
-
-				<view class="mt20" style="background: #FFFFFF; border-radius: 16rpx;">
-					<view class="pay-type" @click="changePay('useIntegral')">
-						<view class="title align-center">
-							使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }} <text
-								style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.integral }}个)</text>
-						</view>
-						<view class="icon">
-							<image v-if="useIntegral" :src="$img1('common/check_act.png')" lazy-load></image>
-
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view>
-					<view class="pay-type" @click="changePay('useMoney')">
-						<view class="title align-center">
-							{{$config.getAppSetting('balance_name')}}支付¥{{ orderData.use_money }} <text
-								style="color: #676767; font-size: 16rpx; margin-left: 10rpx;">(剩余:{{ orderData.money }})</text>
-						</view>
-
-						<view class="icon">
-							<image v-if="useMoney" :src="$img1('common/check_act.png')" lazy-load></image>
-
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-					</view>
-				</view>
-
-				<view class="rule">
-					<scroll-view class="rule-inner" scroll-y>
-						<view v-html="sendRuleData"></view>
-					</scroll-view>
-				</view>
-				<view class="agree" @click="isAgree = !isAgree">
-					<view class="icon">
-						<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-
-					我已满18岁,阅读并同意
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=4' })">
-						《用户协议》
-					</text>
-
-					<text @click.stop="$c.to({ url: '/pages/guize/guize?type=5' })">
-						《隐私政策》
-					</text>
-				</view>
-
-
-
-				<view class="pay-btn" @click="$c.noDouble(confirmSubmit, [1])">
-					<text>立即支付</text>
-					<text>
-						{{
-						  pageData.goods.type == 5
-						    ? ` ${orderData.price}积分`
-						    : ` ¥${orderData.price}`
-						}}
-					</text>
-				</view>
-			</view>
-		</uni-popup>
-
-		<view v-if="aniShow" class="ani-pop">
-			<image :src="aniSrc" lazy-load></image>
-		</view>
-
-		<buy-notice ref="buyNotice" @confirm="$c.noDouble(confirmSubmit, [1, true])"></buy-notice>
-
-		<rule-pop ref="rulePop"></rule-pop>
-		<coupon-pop ref="couponPop"></coupon-pop>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				optData: '',
-				buyNum: 0,
-				useMoney: true,
-				useIntegral: true,
-				// 下拉刷新的配置(可选, 绝大部分情况无需配置)
-				downOption: {
-					auto: false
-				},
-				// 上拉加载的配置(可选, 绝大部分情况无需配置)
-				upOption: {
-					auto: true,
-					page: {
-						size: 15 // 每页数据的数量,默认10
-					}
-				},
-				pageTab: {
-					0: {
-						title: '连击赏'
-					},
-					1: {
-						title: '秘宝池'
-					}
-				},
-				pageTabCur: 0,
-				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: []
-			}
-		},
-
-		computed: {
-			reChooseNum() {
-				if (!this.prizeData || this.prizeData.data.length <= 0) {
-					return 0
-				}
-
-				const arr = this.prizeData.data.filter(item => item.isChoose)
-
-				return arr.length
-			}
-		},
-
-		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: '/package/index/lian-ji' +
-					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
-
-			this.tabChange(this.tabCur)
-
-			uni.$on('chooseCoupon', data => {
-				// console.log('data', data)
-				this.couponData = data
-				this.confirmSubmit([0])
-			})
-			this.$c.getRule(10).then(res => {
-				if (res.status == 1) {
-					this.sendRuleData = res.data
-				}
-			})
-		},
-
-		onShow() {
-			this.autoplay = true
-		},
-
-		onReady() {
-			// this.open('resPop')
-			// this.open('bossPop')
-			// this.open('playPop')
-		},
-
-		onHide() {
-			this.autoplay = false
-		},
-
-		onUnload() {
-			uni.$off('chooseCoupon')
-		},
-
-		methods: {
-			openZhankai(item) {
-				item.open = !item.open
-			},
-			doMax() {
-				if (this.pageTabCur != 0) return false
-				let max =
-					Number(this.pageData.goods.max_fa) -
-					Number(this.pageData.goods.user_lian_ji_number)
-
-				this.buyNum = max
-			},
-			jia() {
-				if (this.pageTabCur == 0) {
-					let max =
-						Number(this.pageData.goods.max_fa) -
-						Number(this.pageData.goods.user_lian_ji_number)
-
-					if (this.buyNum >= max) {
-						this.buyNum = max
-						this.$c.toast({
-							title: '已达到最大值'
-						})
-						return
-					}
-
-					this.buyNum += 1
-				}
-
-				if (this.pageTabCur == 1) {
-					if (this.buyNum >= this.pageData.goods.user_mb_number) {
-						this.buyNum = this.pageData.goods.user_mb_number
-						this.$c.toast({
-							title: '已达到最大值'
-						})
-						return
-					}
-
-					this.buyNum += 1
-				}
-			},
-
-			jian() {
-				if (this.buyNum <= 0) {
-					this.buyNum = 0
-					return
-				}
-
-				this.buyNum -= 1
-			},
-
-			previewDetail(item, a) {
-				const obj = {
-					imgurl: a.imgurl,
-					title: a.title,
-					shang_title: item.shang_title,
-					pro: item.pro
-				}
-
-				console.log(obj)
-				this.previewData = obj
-
-				this.open('dPop')
-			},
-
-			doReDraw() {
-				if (this.orderData.item_card_count < this.reChooseNum) {
-					this.$c.toast({
-						title: '重置卡不足'
-					})
-
-					return
-				}
-			},
-
-			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.$c.to({
-					type: 3,
-					url: '/pages/kit/kit'
-				})
-			},
-
-			toCoupon() {
-				this.$c.to({
-					url: '/pages/user/coupon',
-					query: {
-						type: 2,
-						total_price: this.orderData.order_total
-					}
-				})
-			},
-
-			getPrize(order_num) {
-				if (!order_num) {
-					return
-				}
-
-				setTimeout(() => {
-					this.req({
-						url: 'infinite_prizeorderlog',
-						data: {
-							order_num
-						},
-						success: res => {
-							if (res.status == 1) {
-								res.data.data.map(item => {
-									item.isChoose = false
-								})
-
-								this.prizeData = res.data
-
-								if (res.data.data.length <= 0) {
-									this.getPrize(order_num)
-									return
-								}
-
-								// this.aniShow = true
-								// setTimeout(() => {
-								//   this.aniShow = false
-								this.bgmCtx.openBgm.stop()
-								this.bgmCtx.openBgm.play()
-								this.open('resPop')
-								// }, 1300)
-							}
-						}
-					})
-				}, 500)
-			},
-
-			changePay(e) {
-				this[e] = !this[e]
-
-				this.confirmSubmit([0])
-			},
-
-			confirmSubmit([type, fromNotice = false]) {
-				if (this.buyNum <= 0) {
-					this.$c.toast({
-						title: '次数不能为零'
-					})
-					return
-				}
-
-				let url = 'infinite_ordermoney'
-				let data = {
-					goods_id: this.pageData.goods.id,
-					prize_num: this.buyNum,
-					use_money_is: this.useMoney ? 1 : 2,
-					use_integral_is: this.useIntegral ? 1 : 2,
-					coupon_id: (this.couponData && this.couponData.id) || '',
-					is_mibao: this.pageTabCur
-					// ad_id: uni.getStorageSync('_ad_id')
-				}
-
-				if (type == 1) {
-					url = 'infinite_orderbuy'
-
-					if (this.pageTabCur == 1) {
-						url = 'infinite_mibao_orderbuy'
-						data = {
-							goods_id: this.pageData.goods.id,
-							prize_num: this.buyNum,
-							is_mibao: this.pageTabCur
-						}
-					}
-
-					if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
-						this.$refs.buyNotice.getRule(6)
-						return
-					}
-				}
-
-				this.req({
-					url,
-					data,
-					success: async res => {
-						if (res.status == 1) {
-							if (type == 0) {
-								if (res.data.coupon_id) {
-									this.couponData = {
-										id: res.data.coupon_id,
-										price: res.data.coupon_price
-									}
-								}
-
-								this.orderData = res.data
-
-								this.open('buyPop')
-							}
-
-							if (type == 1) {
-								this.close('buyPop')
-
-								if (res.data.status == 1) {
-									const status = await this.$platform.pay({
-									data: res.data.res
-								},this);
-
-									if (status == 'success') {
-										this.getPrize(res.data.order_num)
-										this.doRefresh()
-									}
-								} else {
-									this.$c.toast({
-										title: res.msg,
-										duration: 500,
-										success: () => {
-											this.getPrize(res.data.order_num)
-											this.doRefresh()
-										}
-									})
-								}
-							}
-						}
-					}
-				})
-			},
-			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) {
-				this.tabCur = i
-				switch (Number(i)) {
-					case 1:
-						this.getData()
-						break
-					case 2:
-						this.getData()
-						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 : '',
-						is_mibao: this.pageTabCur
-					},
-					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)
-						}
-					}
-				})
-			},
-			pageTabChange(i) {
-				this.pageTabCur = i
-				this.buyNum = 0
-				this.tabChange(this.tabCur)
-			},
-			getData() {
-				this.req({
-					url: 'infinite_goodsdetail2',
-					data: {
-						goods_id: this.optData.goods_id,
-						type: this.pageTabCur
-					},
-					success: res => {
-						if (res.status == 1) {
-							res.data.goodslist.forEach(item => {
-								this.$set(item, 'open', false)
-							})
-							this.pageData = res.data
-
-							if (this.pageTabCur == 0) {
-								let max =
-									Number(this.pageData.goods.max_fa) -
-									Number(this.pageData.goods.user_lian_ji_number)
-
-								if (this.buyNum > max) {
-									this.buyNum = max
-								}
-							}
-
-							if (this.pageTabCur == 1) {
-								if (this.buyNum >= this.pageData.goods.user_mb_number) {
-									this.buyNum = this.pageData.goods.user_mb_number
-								}
-							}
-						}
-					}
-				})
-			},
-
-			close(e) {
-				this.$refs[e].close()
-				if (e == "resPop") {
-					if (this.prizeData['user_coupon'] != null) {
-						this.$refs["couponPop"].open(this.prizeData['user_coupon']);
-					}
-				}
-			},
-
-			open(e) {
-				this.$refs[e].open()
-			},
-
-
-			computedPercentage(numerator, denominator) {
-				// 确保分母不为0，以避免除以零的错误
-				if (this.denominator === 0) return 0;
-				// 计算百分比并乘以100（如果需要百分比形式的输出）
-				return (numerator / denominator) * 100;
-			}
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.navLeft {
-		position: fixed;
-		left: 30rpx;
-		height: 44px;
-		z-index: 100;
-
-		>view {
-			font-weight: 400;
-			font-size: 50rpx;
-			color: #FFFFFF;
-		}
-	}
-
-	.content {
-		padding: 0 0 300rpx;
-		background-color: #FFFFFF;
-
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: inherit;
-		}
-
-		.page-tab {
-			margin: 36rpx auto 0;
-			width: 532rpx;
-			height: 72rpx;
-			z-index: 10;
-			border: 2rpx solid #F5F5F5;
-			border-radius: 16rpx;
-
-			.page-tab-item {
-				width: 266rpx;
-				height: 72rpx;
-				position: relative;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #333333;
-
-				>image {
-					width: 40rpx;
-					height: 42rpx;
-				}
-
-				>text {
-					width: 532rpx;
-					height: 72rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					border-radius: 16rpx;
-					background-color: #FFFFFF;
-					padding: 0 20rpx;
-				}
-
-				&.act {
-					text {
-						color: #D8FD24;
-						background-color: #333333;
-					}
-				}
-			}
-		}
-
-		.page-hd {
-			width: 100%;
-			height: 750rpx;
-			box-sizing: border-box;
-			position: relative;
-			margin-top: 130rpx;
-			background-color: #FFFFFF;
-
-			.half-tag {
-				width: 160rpx;
-				height: 60rpx;
-				position: absolute;
-				left: 0;
-				top: 200rpx;
-				z-index: 1;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.link-num {
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 168rpx;
-				min-width: 128rpx;
-				height: 40rpx;
-				background-color: rgba(51, 51, 51, 0.50);
-				z-index: 10;
-				box-sizing: border-box;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #FECF97;
-			}
-
-			.swiper_view1 {
-				position: absolute;
-				width: 56rpx;
-				height: 56rpx;
-				top: 346rpx;
-				left: 32rpx;
-				background: rgba(51, 51, 51, 0.5);
-				border-radius: 50%;
-				z-index: 10;
-			}
-
-			.swiper_view2 {
-				position: absolute;
-				width: 56rpx;
-				height: 56rpx;
-				top: 346rpx;
-				right: 32rpx;
-				background: rgba(51, 51, 51, 0.5);
-				border-radius: 50%;
-				z-index: 10;
-			}
-
-			.swiperAll {
-				height: 100%;
-
-				>view {
-					width: 74rpx;
-					height: 56rpx;
-					background: #FFFFFF;
-					border-radius: 12rpx;
-					border: 2rpx solid #000000;
-				}
-
-				>image {
-					width: 126rpx;
-					height: 126rpx;
-				}
-			}
-
-			.swiper {
-				width: 100%;
-				height: 100%;
-
-				.swiper-item {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.goods-name {
-				z-index: 10;
-				position: absolute;
-				bottom: 24rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-
-			.swiperItemInfo {
-				min-width: 280rpx;
-				height: 44rpx;
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				bottom: 78rpx;
-				font-weight: 500;
-				z-index: 10;
-				font-size: 24rpx;
-				background: url($imgurl + "index/leitai.png") no-repeat 0 0 / 100% 100%;
-
-				>text:nth-child(1) {
-					color: #333333;
-				}
-
-			}
-
-			.goods-title {
-				margin: 30rpx auto 0;
-				width: 630rpx;
-				height: 70rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				box-sizing: border-box;
-				padding: 0 20rpx;
-
-				.hang1 {}
-
-				text {
-					font-size: 36rpx;
-					font-weight: 400;
-					color: #ffffff;
-				}
-			}
-
-			.user-btns {
-				display: flex;
-				position: absolute;
-				bottom: 136rpx;
-				left: 50%;
-				transform: translateX(-50%);
-				justify-content: space-between;
-				align-items: center;
-				z-index: 1;
-
-				.user-num {
-					display: flex;
-					align-items: center;
-
-					font-size: 18rpx;
-					font-weight: 500;
-					color: #FFFFFF;
-
-					.user-list {
-						display: flex;
-						padding-left: 26rpx;
-						padding-right: 10rpx;
-
-						.avatar {
-							width: 24rpx;
-							height: 24rpx;
-							background: #7f7f7f;
-							border-radius: 50%;
-							box-sizing: border-box;
-							position: relative;
-							margin-left: -16rpx;
-						}
-					}
-				}
-
-				.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);
-						}
-					}
-				}
-			}
-
-		}
-
-		.tab {
-			display: flex;
-			align-items: center;
-
-			.tab-item1 {
-				width: 160rpx;
-				height: 92rpx;
-				font-weight: 400;
-				margin-right: 30rpx;
-				background: url($imgurl + "index/uncheckTab1.png") no-repeat 0 0 / 100% 100%;
-
-				>text {
-					font-weight: 600;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			.tab-item2 {
-				width: 160rpx;
-				height: 92rpx;
-				font-weight: 400;
-				margin-right: 30rpx;
-
-				&.act {
-					background: url($imgurl + "index/checkTab2.png") no-repeat 0 0 / 100% 100%;
-
-					>text {
-						font-weight: 600;
-						font-size: 24rpx;
-						color: #333333;
-					}
-				}
-
-				&.unact {
-					background: url($imgurl + "index/uncheckTab2.png") no-repeat 0 0 / 100% 100%;
-
-					>text {
-						font-weight: 600;
-						font-size: 24rpx;
-						color: #333333;
-					}
-
-				}
-			}
-
-			.tab-item3 {
-				width: 160rpx;
-				height: 92rpx;
-				font-weight: 400;
-
-				&.act {
-					background: url($imgurl + "index/checkTab3.png") no-repeat 0 0 / 100% 100%;
-
-					>text {
-						font-weight: 600;
-						font-size: 24rpx;
-						color: #333333;
-					}
-				}
-
-				&.unact {
-					background: url($imgurl + "index/uncheckTab3.png") no-repeat 0 0 / 100% 100%;
-
-					>text {
-						font-weight: 600;
-						font-size: 24rpx;
-						color: #333333;
-					}
-
-				}
-			}
-		}
-
-		.guizeSc {
-			>view {
-				>image {
-					width: 28rpx;
-					height: 28rpx;
-				}
-
-				>text {
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					margin-left: 6rpx;
-				}
-			}
-		}
-
-		.list {
-			padding: 40rpx 20rpx 0;
-
-			.list-item {
-				box-sizing: border-box;
-
-				.list-title {
-					height: 52rpx;
-
-					>view:nth-child(1) {
-						>image {
-							width: 56rpx;
-							height: 56rpx;
-						}
-
-						>text {
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #999999;
-						}
-					}
-				}
-
-				.goods-list {
-					padding: 30rpx 10rpx 10rpx 10rpx;
-					display: grid;
-					grid-template-columns: repeat(3, 220rpx);
-					grid-gap: 20rpx;
-
-					.goods-item {
-						display: inline-flex;
-						width: 220rpx;
-						background-color: #F8F8F8;
-						border-radius: 16rpx;
-
-						.pic {
-							width: 220rpx;
-							height: 220rpx;
-							border-radius: 16rpx 16rpx 0rpx 0rpx;
-							position: relative;
-							margin: 0 auto;
-
-							.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 {
-							width: 200rpx;
-							margin: 28rpx auto 0;
-							font-size: 20rpx;
-							font-weight: 500;
-							color: #333333;
-						}
-
-						.price {
-							width: 200rpx;
-							margin: 24rpx auto 28rpx;
-							font-weight: 500;
-							font-size: 16rpx;
-							color: #333333;
-						}
-					}
-				}
-			}
-		}
-
-		.sub-tab {
-			white-space: nowrap;
-			padding: 40rpx 0 10rpx;
-
-			.sub-tab-item {
-				display: inline-flex;
-				align-items: center;
-				justify-content: center;
-				min-width: 88rpx;
-				height: 44rpx;
-				margin-left: 30rpx;
-				font-weight: 500;
-				font-size: 20rpx;
-				color: #333333;
-				background: #F5F5F5;
-				border-radius: 8rpx;
-
-				&.act {
-					background: #E6F791;
-				}
-
-				&: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;
-
-				.avatar {
-					width: 76rpx;
-					height: 76rpx;
-					border-radius: 50%;
-					overflow: hidden;
-				}
-
-				.info {
-					width: 230rpx;
-					margin-left: 20rpx;
-
-					.name {
-						font-size: 20rpx;
-						font-weight: 500;
-						color: #333333;
-					}
-
-					.hang1 {}
-
-					.time {
-						margin-top: 12rpx;
-						white-space: nowrap;
-						font-size: 16rpx;
-						font-weight: 500;
-						color: #999999;
-					}
-				}
-
-				.prize {
-					flex: 1;
-					padding-left: 80rpx;
-					display: flex;
-					align-items: center;
-
-					.pic {
-						width: 76rpx;
-						height: 76rpx;
-						border-radius: 16rpx;
-					}
-
-					>view:nth-child(2) {
-						>view:nth-child(1) {
-							min-width: 68rpx;
-							height: 32rpx;
-							box-sizing: border-box;
-							line-height: 40rpx;
-							border-radius: 18rpx;
-							font-weight: 500;
-							font-size: 14rpx;
-							color: #FFFFFF;
-						}
-
-					}
-
-					.title {
-						width: 120rpx;
-						margin-left: 10rpx;
-						font-weight: 500;
-						font-size: 16rpx;
-						color: #333333;
-						text-align: right;
-					}
-
-					.num {
-						font-size: 16rpx;
-						font-weight: 500;
-						color: #333333;
-					}
-				}
-			}
-		}
-
-		.btFixed {
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			z-index: 10;
-			box-sizing: border-box;
-			width: 100%;
-			padding-bottom: 30rpx;
-
-			&-top {
-				>image {
-					width: 90rpx;
-					height: 66rpx;
-				}
-
-				>view {
-					min-width: 210rpx;
-					height: 66rpx;
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #FFFFFF;
-					background: url($imgurl+'img/goumai.png') no-repeat 0 0 / 100% 100%;
-				}
-			}
-
-			&-footer {
-				width: 750rpx;
-
-				>view {
-					width: 210rpx;
-					height: 80rpx;
-				}
-
-				&-one {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: #00FFBC;
-					background: url($imgurl+'img/lainmax.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-two {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: #00FFBC;
-					background: url($imgurl+'img/liannum.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-three {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: rgba(0, 255, 188, 0);
-					line-height: 113rpx;
-					text-stroke: 1px #00FFBB;
-					-webkit-text-stroke: 1px #00FFBB;
-					background: url($imgurl+'img/lianzero.png') no-repeat 0 0 / 100% 100%;
-				}
-			}
-
-			&-footer2 {
-				width: 750rpx;
-
-				>view {
-					width: 210rpx;
-					height: 80rpx;
-				}
-
-				&-one {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: rgba(0, 255, 188, 0);
-					line-height: 113rpx;
-					text-stroke: 1px #00FFBB;
-					-webkit-text-stroke: 1px #00FFBB;
-					background: url($imgurl+'img/lainmax.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-two {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: rgba(0, 255, 188, 0);
-					line-height: 113rpx;
-					text-stroke: 1px #00FFBB;
-					-webkit-text-stroke: 1px #00FFBB;
-					background: url($imgurl+'img/liannum.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-three {
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					font-size: 34rpx;
-					color: #00FFBC;
-					background: url($imgurl+'img/lianzero.png') no-repeat 0 0 / 100% 100%;
-				}
-			}
-		}
-
-		.btnFixed {
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			z-index: 10;
-			box-sizing: border-box;
-			width: 100%;
-			padding: 30rpx 30rpx 80rpx;
-			background: #FFFFFF;
-
-			&-numBox {
-				width: 224rpx;
-				height: 92rpx;
-				position: absolute;
-				left: 50%;
-				transform: translateX(-50%);
-				// background: url($imgurl+'index/numBox.png') no-repeat 0 0 / 100% 100%;
-
-				>image {
-					width: 52rpx;
-					height: 52rpx;
-				}
-
-				>text {
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #333333;
-				}
-			}
-
-			&-btns {
-				margin: 30rpx 0 0;
-				border: 2rpx solid #F5F5F5;
-				border-radius: 16rpx;
-
-				&-one {
-					width: 342rpx;
-					height: 92rpx;
-					font-weight: 500;
-					font-size: 24rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: #D8FD24;
-					box-sizing: border-box;
-					background: url($imgurl+'index/lianjiBtn1.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-one2 {
-					width: 342rpx;
-					height: 92rpx;
-					font-weight: 500;
-					font-size: 24rpx;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					color: #333333;
-					box-sizing: border-box;
-				}
-
-				&-lianji {
-					position: absolute;
-					// bottom: -25rpx;
-					left: 50%;
-					transform: translateX(-50%);
-					width: 118.79rpx;
-					height: 118.79rpx;
-					z-index: 4;
-					line-height: 1;
-					background: url($imgurl+'index/lianjiMax.png') no-repeat 0 0 / 100% 100%;
-
-					>text {
-						color: #FFFFFF;
-						font-family: YouSheBiaoTiHei;
-						text-shadow: #894DD3 1px 0 0, #894DD3 0 1px 0, #894DD3 -1px 0 0, #894DD3 0 -1px 0;
-					}
-
-					>text:nth-child(1) {
-						font-size: 60rpx;
-					}
-
-					>text:nth-child(2) {
-						font-size: 36rpx;
-					}
-
-				}
-
-				&-two {
-					width: 342rpx;
-					height: 92rpx;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #D8FD24;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					box-sizing: border-box;
-					text-align: right;
-					background: url($imgurl+'index/duoquBtn1.png') no-repeat 0 0 / 100% 100%;
-				}
-
-				&-two2 {
-					width: 342rpx;
-					height: 92rpx;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #333333;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					box-sizing: border-box;
-					text-align: right;
-				}
-			}
-		}
-
-		.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: 750rpx;
-				height: 40vh;
-
-				.res-list {
-					padding: 30rpx 30rpx;
-					display: grid;
-					grid-template-columns: repeat(3, 210rpx);
-					gap: 30rpx 30rpx;
-
-					.res-item {
-						width: 100%;
-						box-sizing: border-box;
-
-						.pic {
-							width: 100%;
-							height: 210rpx;
-							position: relative;
-							background: #8953DC;
-							border: 2rpx solid #FFFFFF;
-
-							>image {
-								width: 202rpx;
-								height: 202rpx;
-							}
-
-							.type-tag {
-								position: absolute;
-								left: 14rpx;
-								top: -14rpx;
-								z-index: 2;
-								width: 134rpx;
-								height: 42rpx;
-								background: url($imgurl+ 'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
-								font-weight: 400;
-								font-size: 20rpx;
-								color: #FFDF46;
-							}
-
-							.num {
-								position: absolute;
-								z-index: 2;
-								top: -20rpx;
-								right: -22rpx;
-								min-width: 42rpx;
-								height: 48rpx;
-								font-weight: 400;
-								font-size: 20rpx;
-								color: #FFDF46;
-								background: url($imgurl+ 'common/chouNum.png') no-repeat 0 0 / 100% 100%;
-								text-shadow: #000 1rpx 0 0, #000 0 1rpx 0, #000 -1rpx 0 0, #000 0 -1rpx 0;
-							}
-						}
-
-						.title {
-							padding: 10rpx 10rpx 0;
-							font-weight: 400;
-							font-size: 28rpx;
-							color: #FFFFFF;
-						}
-
-						.exchange {
-							padding: 10rpx 10rpx;
-							font-weight: 400;
-							font-size: 20rpx;
-							color: #FFFFFF;
-						}
-					}
-				}
-			}
-
-			.res-pop-ft {
-				width: 750rpx;
-				display: flex;
-				justify-content: space-evenly;
-
-				.ft-btn {
-					width: 244rpx;
-					height: 116rpx;
-					font-weight: 400;
-					font-size: 28rpx;
-
-					>text {
-						margin-top: 36rpx;
-					}
-				}
-
-				>view:nth-child(1) {
-					color: #DE6025;
-				}
-
-				>view:nth-child(2) {
-					color: #7825DE;
-				}
-			}
-		}
-
-		.d-pop {
-			position: relative;
-			width: 570rpx;
-			box-sizing: border-box;
-
-			.pic {
-				width: 570rpx;
-				height: 598rpx;
-				// background: #8953DC;
-				background: #FFFFFF;
-				border: 2rpx solid #FFFFFF;
-
-				>image {
-					width: 548rpx;
-					height: 549rpx;
-				}
-
-				>view {
-					width: 130rpx;
-					height: 46rpx;
-					position: absolute;
-					top: -12rpx;
-					left: 0;
-					font-weight: 400;
-					font-size: 20rpx;
-					color: #FFDF46;
-					box-sizing: border-box;
-					background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
-				}
-			}
-
-			.title {
-				margin: 40rpx auto 0;
-				width: 574rpx;
-				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: #313133;
-
-				>text {
-					font-weight: 400;
-					font-size: 32rpx;
-					color: #FFFFFF;
-				}
-			}
-
-			.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%);
-			}
-		}
-
-		.buy-pop {
-			padding: 0 30rpx;
-			box-sizing: border-box;
-			background: #F7F7F7;
-			padding-bottom: 30rpx;
-			border-radius: 16rpx 16rpx 0rpx 0rpx;
-
-
-			.buy-pop-hd {
-				padding: 40rpx 0;
-				padding-left: 10rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-
-				>text {
-					font-size: 28rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-
-				.close {
-					width: 24rpx;
-					height: 24rpx;
-				}
-			}
-
-			.buy-card {
-				border-radius: 20rpx;
-				padding: 30rpx;
-				background: #FFFFFF;
-
-				.buy-info {
-					display: flex;
-
-					.pic {
-						width: 180rpx;
-						height: 180rpx;
-						border-radius: 10rpx;
-					}
-
-					.info-r {
-						width: calc(100% - 190rpx);
-						box-sizing: border-box;
-						display: flex;
-						flex-flow: column nowrap;
-						justify-content: space-between;
-						padding: 32rpx 0 10rpx 30rpx;
-
-						.title {
-							font-size: 24rpx;
-							font-weight: 500;
-							color: #333333;
-						}
-
-						.hang1 {}
-
-						.type {
-							font-size: 20rpx;
-							font-weight: 500;
-							color: #999999;
-						}
-
-						.price-num {
-							display: flex;
-							justify-content: space-between;
-							align-items: center;
-
-							.price {
-								ffont-weight: 500;
-								font-size: 16rpx;
-								color: #333333;
-
-								>text {
-									font-size: 28rpx;
-								}
-
-							}
-
-							.num {
-								font-size: 20rpx;
-								font-weight: 500;
-								color: #999999;
-							}
-						}
-					}
-				}
-
-				.line {
-					height: 1px;
-					background: #222222;
-					margin: 30rpx 0 10rpx;
-				}
-
-				.yhfs {
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.card-row {
-					padding: 16rpx 0;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					.title {
-						>image {
-							width: 32rpx;
-							height: 32rpx;
-						}
-
-						>text {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #FFFFFF;
-						}
-					}
-
-					.row-r {
-						display: flex;
-						align-items: center;
-
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #FFFFFF;
-
-						.icon {
-							width: 32rpx;
-							height: 32rpx;
-						}
-					}
-				}
-
-				.card-row {
-					.title {}
-
-					.row-r {
-						.icon {}
-					}
-				}
-			}
-
-			.card-row {
-				padding: 24rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				background-color: #FFFFFF;
-				margin-top: 24rpx;
-				border-radius: 16rpx;
-
-				.title {
-					>image {
-						width: 32rpx;
-						height: 32rpx;
-					}
-
-					>text {
-						font-weight: 500;
-						font-size: 24rpx;
-						color: #333333;
-					}
-				}
-
-				.row-r {
-					display: flex;
-					align-items: center;
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #999999;
-
-					.icon {
-						width: 10rpx;
-						height: 17.14rpx;
-						margin-left: 10rpx;
-					}
-				}
-			}
-
-			.pay-title {
-				margin-top: 30rpx;
-				font-size: 38rpx;
-				font-weight: 400;
-				color: #ffffff;
-			}
-
-			.pay-type {
-				padding: 24rpx;
-				border-radius: 20rpx;
-				display: flex;
-				align-items: center;
-
-
-				.icon {
-					width: 32rpx;
-					height: 32rpx;
-				}
-
-				.title {
-					flex: 1;
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-			}
-
-			.agree {
-				display: flex;
-				margin-top: 30rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: #999999;
-				line-height: 32rpx;
-
-				.icon {
-					width: 32rpx;
-					height: 32rpx;
-					margin-right: 10rpx;
-				}
-			}
-
-			.rule {
-				padding: 20rpx;
-				background: #F9F8E1;
-				border-radius: 20rpx;
-				box-sizing: border-box;
-				margin: 20rpx 0 0;
-
-				.rule-inner {
-					max-height: 160rpx;
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #333333;
-				}
-			}
-
-			.pay-btn {
-				margin: 30rpx auto;
-				width: 686rpx;
-				height: 84rpx;
-				background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				font-weight: 500;
-				color: #CDEF27;
-
-				>text:nth-child(1) {
-					font-size: 24rpx;
-				}
-
-				>text:nth-child(2) {
-					font-size: 24rpx;
-				}
-			}
-		}
-
-		.ani-pop {
-			width: 100vw;
-			height: 100vh;
-			position: fixed;
-			left: 0;
-			top: 0;
-			z-index: 88;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background: #000;
-
-			image {
-				width: 100%;
-				height: 1624rpx;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/package/index/sign.vue b/package/index/sign.vue
deleted file mode 100644
index 2f207f8..0000000
--- a/package/index/sign.vue
+++ /dev/null
@@ -1,312 +0,0 @@
-<!--
- * @Date: 2023-11-14 10:09:45
- * @LastEditTime: 2023-12-08 16:50:43
- * @Description: content
--->
-<template>
-	<view class="content">
-		<uni-nav-bar title="签到任务" color="#000000" left-icon="left" backgroundColor="transparent" :border="false"
-			:statusBar="true" :fixed="true" @clickLeft="$c.back()"></uni-nav-bar>
-
-		<view class="" style="width: 686rpx; height: 328rpx; background-color: #D8D8D8; border-radius: 16rpx; margin: 56rpx auto 0;">
-
-		</view>
-
-		<view class="page-hd">
-			<view class="title">签到任务</view>
-
-			<view class="icon" @click="$refs.rulePop.getRule(16, '签到规则')">
-				<image :src="$img('/static/img/info.png')" lazy-load></image>
-			</view>
-		</view>
-
-		<view v-if="signData" class="sign-box common_bg" :style="{
-			backgroundImage: `url(${$img('/static/img/1_sign_bg.png')})`
-		}">
-			<template v-for="(item, i) in signData.sign_info">
-				<view v-if="i < 6" class="sign-item" :key="i" :class="{
-					act: i + 1 <= signData.days
-				}">
-					<view class="day">{{ i + 1 }}天</view>
-
-					<view class="icon">
-						<!-- <image
-              v-if="i + 1 <= signData.days"
-              :src="$img('/static/img/1_coin.png')"
-              lazy-load
-            ></image> -->
-
-						<image src="/static/common/signImg.png" lazy-load></image>
-					</view>
-
-					<view class="num">{{ item }}{{$config.getAppSetting('currency1_name')}}</view>
-				</view>
-
-				<view v-else class="sign-item large" :key="i" :class="{
-					act: i + 1 <= signData.days
-				}">
-					<view class="item-l column justify-center">
-						<view class="day">第七天</view>
-
-						<view class="num">{{ item }}{{$config.getAppSetting('currency1_name')}}</view>
-					</view>
-					<view class="icon relative">
-						<image src="/static/common/signImg.png" lazy-load></image>
-						<image src="/static/common/signImg.png" lazy-load></image>
-					</view>
-				</view>
-			</template>
-		</view>
-
-		<view class="sign-btn" :class="!is_sign ? 'signYes' : 'signNo'" @click="doSign">
-			<template v-if="!is_sign">立即签到</template>
-			<template v-else>已签到</template>
-		</view>
-
-		<uni-popup ref="sucPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
-			<view v-if="sucData" class="suc-pop common_bg center" :style="{
-				backgroundImage: `url(${$img('/static/img/signBg.png')})`
-
-			}">
-				<image class="coin-img" :src="$img('/static/img/signJinbi.png')" mode=""></image>
-				<view class="coin-num">恭喜获得 {{ sucData.num }} {{$config.getAppSetting('currency1_name')}}</view>
-				<view class="close icon" @click="$refs.sucPop.close()">
-					<image :src="$img('/static/img/zdl.png')" lazy-load></image>
-				</view>
-			</view>
-		</uni-popup>
-
-		<rule-pop ref="rulePop"></rule-pop>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				signData: [],
-				sucData: '',
-				is_sign: 0
-			}
-		},
-
-		onLoad(options) {
-			this.getData()
-		},
-		methods: {
-			doSign() {
-				this.req({
-					url: 'sign_add',
-					data: {},
-					success: res => {
-						if (res.status == 1) {
-							this.sucData = res.data
-
-							this.$refs.sucPop.open()
-
-							this.getData()
-						}
-					}
-				})
-			},
-
-			getData() {
-				this.req({
-					url: 'sign',
-					data: {},
-					success: res => {
-						if (res.status == 1) {
-							this.signData = res.data.sign
-							this.is_sign = res.data.sign.is_sign
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		min-height: 100vh;
-		box-sizing: border-box;
-		padding: 1rpx 0 40rpx;
-
-		.page-hd {
-			padding: 20rpx 30rpx 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.title {
-				font-size: 60rpx;
-				font-family: YouSheBiaoTiHei;
-				font-weight: 400;
-				color: #ffffff;
-				text-shadow: 0rpx 0rpx 12rpx rgba(255, 135, 58, 0.8);
-			}
-
-			.icon {
-				width: 40rpx;
-				height: 40rpx;
-			}
-		}
-
-		.sign-box {
-			width: 710rpx;
-			box-sizing: border-box;
-			padding: 30rpx 40rpx 40rpx;
-			margin: 30rpx auto 0;
-			display: flex;
-			flex-flow: row wrap;
-			justify-content: space-between;
-
-			.sign-item {
-				width: 150rpx;
-				height: 165rpx;
-				background: #ff873a;
-				border-radius: 20rpx;
-				display: flex;
-				flex-flow: column nowrap;
-				justify-content: space-evenly;
-				align-items: center;
-				margin-top: 10rpx;
-				border: 2rpx solid #FFFFFF;
-
-				.day {
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #dddddd;
-				}
-
-				.icon {
-					width: 50rpx;
-					height: 50rpx;
-				}
-
-				.num {
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #FFFFFF;
-				}
-
-				&.act {
-					position: relative;
-
-					&::after {
-						content: '已签';
-						position: absolute;
-						width: 100%;
-						height: 100%;
-						font-family: Alimama ShuHeiTi;
-						font-weight: 700;
-						font-size: 28rpx;
-						color: #FFFFFF;
-						background: rgba(0, 0, 0, 0.4);
-						display: flex;
-						align-items: center;
-						justify-content: center;
-					}
-				}
-
-				&.large {
-					width: 310rpx;
-					height: 165rpx;
-					flex-flow: row nowrap;
-					justify-content: space-around;
-					align-items: center;
-
-					.item-l {
-						height: 120rpx;
-						display: flex;
-						flex-flow: column nowrap;
-						align-items: center;
-
-						.num {
-							margin-top: 20rpx;
-						}
-					}
-
-					.icon {
-						width: 120rpx;
-						height: 100rpx;
-
-						>image:nth-child(1) {
-							width: 34rpx;
-							height: 34rpx;
-							position: absolute;
-							left: 10rpx;
-							bottom: 10rpx;
-							transform: rotate(-28deg);
-						}
-
-						>image:nth-child(2) {
-							width: 72rpx;
-							height: 72rpx;
-							position: absolute;
-							top: 10rpx;
-							right: 10rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.sign-btn {
-			margin: 40rpx auto 0;
-			width: 400rpx;
-			height: 122rpx;
-			border-radius: 40rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 32rpx;
-			font-family: Source Han Sans CN;
-			font-weight: 400;
-			background: url($imgurl+'common/jixuchou.png') no-repeat 0 0 / 100% 100%;
-		}
-
-		.signYes {
-			color: #FFFFFF;
-		}
-
-		.signNo {
-			color: #FFFFFF;
-			filter: grayscale(100%);
-		}
-
-		.suc-pop {
-			width: 100vw;
-			height: 642rpx;
-			position: relative;
-			display: flex;
-			flex-flow: column nowrap;
-			justify-content: space-between;
-			align-items: center;
-
-
-			.coin-img {
-				width: 345rpx;
-				height: 345rpx;
-			}
-
-			.coin-num {
-				font-size: 32rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 400;
-				color: #ffffff;
-			}
-
-			.close {
-				width: 378rpx;
-				height: 80rpx;
-				position: absolute;
-				left: 50%;
-				bottom: 40rpx;
-				transform: translate(-50%, 200%);
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/package/mine/collect.vue b/package/mine/collect.vue
deleted file mode 100644
index 0479772..0000000
--- a/package/mine/collect.vue
+++ /dev/null
@@ -1,399 +0,0 @@
-<template>
-  <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      title="我的收藏"
-      color="#000000"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="$c.back"
-    ></uni-nav-bar>
-
-    <!-- 顶部标签栏 -->
-    <scroll-view class="tab" scroll-x>
-      <view
-        class="tab-item"
-        v-for="(item, i) in tabList"
-        :key="i"
-        :class="{ active: tabCur === i }"
-        @click="tabChange(i)"
-      >
-        {{ item.title }}
-      </view>
-    </scroll-view>
-
-    <!-- 列表区域 -->
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      @down="downCallback"
-      @up="getList"
-      :down="downOption"
-      :up="upOption"
-    >
-      <view class="list" v-if="listData.length > 0">
-        <view
-          class="list-item"
-          v-for="(item, i) in listData"
-          :key="i"
-          @click="toDetail(item)"
-        >
-          <view class="pic">
-            <image
-              class="pic-img"
-              :src="item.imgurl"
-              mode="aspectFill"
-              lazy-load
-            ></image>
-          </view>
-          <view
-            class="tag"
-            :style="{ backgroundImage: `url(${$img1('common/label1.png')})` }"
-          >
-            <text>{{ tabList[tabCur].title }}</text>
-          </view>
-          <view class="title ellipsis">{{ item.goods_title }}</view>
-
-          <view class="price-box">
-            <view class="price">
-              ¥<text>{{ item.goods_price }}</text>
-            </view>
-            <view v-if="item.stock" class="stock">
-              <view class="stock-num"
-                >{{ item.surplus_stock }}/{{ item.stock }}</view
-              >
-              <image
-                class="stock-icon"
-                :src="$img1('index/box.png')"
-                lazy-load
-              ></image>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!-- 空状态 -->
-      <view class="empty-state" v-if="listData.length === 0 && !isLoading">
-        <image
-          class="empty-image"
-          :src="$img1('common/empty.png')"
-          mode="aspectFit"
-        ></image>
-        <text class="empty-text">暂无收藏内容</text>
-      </view>
-    </mescroll-body>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      // 下拉刷新配置
-      downOption: {
-        auto: false,
-      },
-      // 上拉加载配置
-      upOption: {
-        auto: true,
-        page: {
-          size: 10, // 每页数据数量
-        },
-        noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据
-        empty: {
-          use: false, // 使用自定义的空状态
-        },
-      },
-      tabList: [], // 标签列表
-      tabCur: 0, // 当前选中标签索引
-      listData: [], // 列表数据
-      isLoading: true, // 是否正在加载
-    };
-  },
-
-  created() {
-    // 获取商品类型列表
-    this.initTabList();
-  },
-
-  methods: {
-    /**
-     * 初始化标签列表
-     */
-    initTabList() {
-      const tabList = this.$config.getGoodType();
-      // 过滤掉id为0的选项
-      this.tabList = tabList.filter((item) => item.id !== 0);
-    },
-
-    /**
-     * 初始化mescroll对象
-     * @param {Object} mescroll mescroll实例
-     */
-    mescrollInit(mescroll) {
-      this.mescroll = mescroll;
-    },
-
-    /**
-     * 下拉刷新回调
-     */
-    downCallback() {
-      this.mescroll.resetUpScroll();
-    },
-
-    /**
-     * 跳转到详情页
-     * @param {Object} item 商品项
-     */
-    toDetail(item) {
-      let url = "/pages/shouye/detail";
-
-      // 根据商品类型跳转到不同详情页
-      if (item.type === 2 || item.type === 8) {
-        url = "/pages/shouye/detail_wuxian";
-      } else if (item.type === 9) {
-        url = "/package/index/lian-ji";
-      }
-
-      this.$c.to({
-        url,
-        query: {
-          goods_id: item.goods_id,
-          type_text: this.tabList[this.tabCur].title,
-        },
-      });
-    },
-
-    /**
-     * 切换标签
-     * @param {Number} index 标签索引
-     */
-    tabChange(index) {
-      if (this.tabCur === index) return;
-
-      this.tabCur = index;
-      this.listData = [];
-      this.isLoading = true;
-
-      // 重置列表并滚动到顶部
-      this.mescroll.resetUpScroll();
-      this.mescroll.scrollTo(0, 0);
-    },
-
-    /**
-     * 获取收藏列表数据
-     * @param {Object} params 分页参数
-     */
-    getList({ num, size }) {
-      this.isLoading = true;
-
-      // 使用Promise方式调用API
-      this.$request
-        .post("listCollect", {
-          page: num,
-          type: this.tabList[this.tabCur].id,
-        })
-        .then((res) => {
-          this.isLoading = false;
-
-          if (res.status === 1) {
-            // 第一页时清空数据
-            if (num === 1) {
-              this.listData = [];
-            }
-
-            // 追加数据
-            this.listData = this.listData.concat(res.data.data || []);
-
-            // 更新分页状态
-            this.mescroll.endByPage(
-              res.data.data ? res.data.data.length : 0,
-              res.data.last_page || 1
-            );
-          } else {
-            this.mescroll.endErr();
-            uni.showToast({
-              title: res.msg || "加载失败",
-              icon: "none",
-            });
-          }
-        })
-        .catch((err) => {
-          this.isLoading = false;
-          this.mescroll.endErr();
-          uni.showToast({
-            title: "网络请求失败",
-            icon: "none",
-          });
-          console.error(err);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.content {
-  background-color: #f7f7f7;
-  min-height: 100vh;
-
-  // 顶部标签栏
-  .tab {
-    white-space: nowrap;
-    padding: 15rpx 0;
-
-    .tab-item {
-      width: 88rpx;
-      height: 40rpx;
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      margin-left: 30rpx;
-      background-color: #ffffff;
-      font-size: 20rpx;
-      border-radius: 8rpx;
-      color: #333333;
-      transition: all 0.2s;
-
-      &:last-child {
-        margin-right: 30rpx;
-      }
-
-      &.active {
-        background-color: #e6f791;
-        font-weight: 500;
-      }
-    }
-  }
-
-  // 商品列表
-  .list {
-    padding: 15rpx 30rpx 30rpx;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between;
-
-    .list-item {
-      width: 330rpx;
-      height: 487rpx;
-      margin-top: 30rpx;
-      position: relative;
-      background-color: #ffffff;
-      border-radius: 16rpx;
-      overflow: hidden;
-      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
-
-      .pic {
-        width: 100%;
-        height: 332rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-color: #f5f5f5;
-        border-radius: 16rpx 16rpx 0 0;
-        overflow: hidden;
-
-        .pic-img {
-          width: 100%;
-          height: 100%;
-          border-radius: 16rpx 16rpx 0 0;
-        }
-      }
-
-      .tag {
-        position: absolute;
-        z-index: 1;
-        top: 12rpx;
-        left: 12rpx;
-        width: 68rpx;
-        height: 32rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        background-size: 100% 100%;
-
-        text {
-          font-size: 14rpx;
-          color: #ffffff;
-        }
-      }
-
-      .title {
-        padding: 20rpx 20rpx 0;
-        font-size: 20rpx;
-        color: #333333;
-        line-height: 1.4;
-        height: 56rpx;
-      }
-
-      .price-box {
-        padding: 20rpx 20rpx 10rpx;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        position: absolute;
-        bottom: 0;
-        left: 0;
-        right: 0;
-
-        .price {
-          font-size: 16rpx;
-          color: #333333;
-
-          text {
-            font-size: 24rpx;
-            font-weight: 500;
-          }
-        }
-
-        .stock {
-          display: flex;
-          align-items: center;
-
-          .stock-num {
-            font-size: 24rpx;
-            color: #cccccc;
-          }
-
-          .stock-icon {
-            width: 26rpx;
-            height: 26rpx;
-            margin-left: 6rpx;
-          }
-        }
-      }
-    }
-  }
-
-  // 空状态
-  .empty-state {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 100rpx 0;
-
-    .empty-image {
-      width: 200rpx;
-      height: 200rpx;
-      margin-bottom: 20rpx;
-    }
-
-    .empty-text {
-      font-size: 28rpx;
-      color: #999;
-    }
-  }
-
-  // 公共类
-  .ellipsis {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/package/mine/skill-card.vue b/package/mine/skill-card.vue
deleted file mode 100644
index 25e4ed7..0000000
--- a/package/mine/skill-card.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<!--
- * @Date: 2023-11-17 11:44:58
- * @LastEditTime: 2023-11-30 18:08:33
- * @Description: content
--->
-<template>
-  <view class="content">
-    <uni-nav-bar
-      left-icon="left"
-      title="道具卡"
-      color="#fff"
-      backgroundColor="transparent"
-      :fixed="true"
-      :statusBar="true"
-      :border="false"
-      @clickLeft="$c.back"
-    ></uni-nav-bar>
-
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      @down="downCallback"
-      @up="getList"
-      :down="downOption"
-      :up="upOption"
-    >
-      <view
-        class="card-item"
-        v-for="(item, i) in listData"
-        :key="i">
-        <view class="icon">
-          <image src="/static/common/cardIcon.png"></image>
-        </view>
-        <view class="card-r">
-          <view class="title">{{item.title}}</view>
-          <view class="desc">抽赏时可选择重新抽赏</view>
-        </view>
-        <view class="card-num">×1</view>
-      </view>
-    </mescroll-body>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      // 下拉刷新的配置(可选, 绝大部分情况无需配置)
-      downOption: {
-        auto: false
-      },
-      // 上拉加载的配置(可选, 绝大部分情况无需配置)
-      upOption: {
-        auto: true,
-        page: {
-          size: 10 // 每页数据的数量,默认10
-        }
-      },
-      listData: []
-    }
-  },
-
-  methods: {
-    /**
-     * @description: 获取列表
-     * @param {*} num
-     * @param {*} size
-     * @return {*}
-     */
-    getList({ num, size }) {
-      this.req({
-        url: 'item_card_list',
-        data: {
-          page: num
-        },
-
-        success: res => {
-          if (res.status == 1) {
-            if (num == 1) {
-              this.listData = []
-            }
-
-            this.listData = this.listData.concat(res.data.list)
-            this.mescroll.endByPage(res.data.list.length, res.data.last_page)
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.content {
-  padding: 0 0 30rpx;
-
-  .card-item {
-    width: 710rpx;
-    margin: 20rpx auto 0;
-    box-sizing: border-box;
-    padding: 30rpx 40rpx;
-    display: flex;
-    align-items: center;
-	background: #3B3941;
-
-    .icon {
-      width: 100rpx;
-      height: 58rpx;
-    }
-
-    .card-r {
-      width: 300rpx;
-      box-sizing: border-box;
-      margin-left: 30rpx;
-
-      .title {
-        font-weight: bold;
-        font-size: 40rpx;
-        color: #B07AF3; 
-      }
-
-      .desc {
-        margin-top: 10rpx;
-        word-wrap: break-word;
-        word-break: break-all;
-
-        font-size: 26rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #dddddd;
-      }
-    }
-
-    .card-num {
-      flex: 1;
-      text-align: right;
-      font-size: 36rpx;
-      font-family: YouSheBiaoTiHei;
-      font-weight: 400;
-      color: #ffffff;
-    }
-  }
-  .common_bg {
-  }
-}
-</style>
diff --git a/package/mine/ti-qu.vue b/package/mine/ti-qu.vue
deleted file mode 100644
index 4c72a63..0000000
--- a/package/mine/ti-qu.vue
+++ /dev/null
@@ -1,622 +0,0 @@
-<!--
- * @Date: 2023-12-20 17:33:04
- * @LastEditTime: 2024-01-17 11:30:11
- * @Description: content
--->
-<template>
-  <view class="content">
-    <uni-nav-bar
-      title="提取记录"
-      color="#fff"
-      leftIcon="left"
-      backgroundColor="transparent"
-      :border="false"
-      :statusBar="true"
-      :fixed="true"
-      @clickLeft="$c.back()"
-    ></uni-nav-bar>
-
-    <mescroll-body
-      ref="mescrollRef"
-      @init="mescrollInit"
-      @down="downCallback"
-      @up="getList"
-      :down="downOption"
-      :up="upOption"
-    >
-      <!-- <view class="row">
-        <view class="left">
-          <view class="title-color">提取金额</view>
-        </view>
-      </view>
-
-      <view class="input-box">
-        <input v-model.number="money" placeholder="输入提取金额" />
-      </view>
-
-      <view class="tip">
-        荷包金额剩余: {{ userInfo.money2 }}元
-        <text @click="doAll">全部提出</text>
-      </view>
-
-      <view class="row">
-        <view class="left">
-          <view class="title-color">提取方式</view>
-        </view>
-
-        <view class="right">
-          <view
-            class="type"
-            v-for="(item, i) in tiType"
-            :key="i"
-            @click="changeTiType(i)"
-          >
-            <view class="check icon">
-              <image
-                v-if="tiTypeCur == i"
-                :src="$img('/static/img/check1_act.png')"
-                lazy-load
-              ></image>
-
-              <image
-                v-else
-                :src="$img('/static/img/check1.png')"
-                lazy-load
-              ></image>
-            </view>
-
-            {{ item.title }}
-          </view>
-        </view>
-      </view>
-
-      <template v-if="tiType[tiTypeCur].id == 2">
-        <view class="input-box">
-          <view class="label">姓名:</view>
-
-          <input v-model="name" placeholder="请输入姓名" />
-        </view>
-
-        <view class="input-box">
-          <view class="label">账号:</view>
-
-          <input v-model="account" placeholder="请输入账号" />
-        </view>
-      </template>
-
-      <template v-if="tiType[tiTypeCur].id == 3">
-        <view class="input-box">
-          <view class="label">开户行:</view>
-
-          <input v-model="bank" placeholder="请输入开户行" />
-        </view>
-
-        <view class="input-box">
-          <view class="label">姓名:</view>
-
-          <input v-model="name" placeholder="请输入姓名" />
-        </view>
-
-        <view class="input-box">
-          <view class="label">账号:</view>
-
-          <input v-model="account" placeholder="请输入账号" />
-        </view>
-      </template>
-
-      <view v-if="pageData" class="tip">
-        <text>{{ pageData.withdraw_money }}</text>
-        起提,每笔手续费需付
-        <text>{{ pageData.withdraw_money_sxf }}</text>
-        荷包金额,当日最高可提取
-        <text>{{ pageData.max_money }}</text>
-      </view>
-
-      <view @click="isAgree = !isAgree" class="agree">
-        <view class="icon">
-          <image
-            v-if="isAgree"
-            :src="$img1('common/check_act.png')"
-            lazy-load
-          ></image>
-
-          <image v-else :src="$img1('common/check.png')" lazy-load></image>
-        </view>
-
-        <view class="agree-r">
-          我已阅读并同意
-          <text @click.stop="$c.to({ url: '/pages/guize/guize?type=4' })">
-            《用户协议》
-          </text>
-          和
-          <text @click.stop="$c.to({ url: '/pages/guize/guize?type=5' })">
-            《隐私政策》
-          </text>
-        </view>
-      </view>
-
-      <view class="submit" @click="$c.noDouble(doSubmit)">立即提取</view>
-
-      <view class="row">
-        <view class="left">
-          <view class="title-color">提取记录</view>
-        </view>
-      </view> -->
-
-      <view class="log">
-        <view class="log-item" v-for="(item, i) in listData" :key="i">
-          <view class="item-l">
-            <view class="title">
-              {{ item.status_text }}
-
-              <text v-if="item.reason">({{ item.reason }})</text>
-            </view>
-
-            <view class="time">{{ item.addtime }}</view>
-          </view>
-
-          <view class="item-money">{{ item.tal_money }}元</view>
-        </view>
-      </view>
-    </mescroll-body>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      // 下拉刷新的配置(可选, 绝大部分情况无需配置)
-      downOption: {
-        auto: false
-      },
-      // 上拉加载的配置(可选, 绝大部分情况无需配置)
-      upOption: {
-        auto: true,
-        page: {
-          size: 15 // 每页数据的数量,默认10
-        }
-      },
-
-      money: '',
-      qrCode: '',
-      name: '',
-      account: '',
-      bank: '',
-
-      listData: [],
-      userInfo: uni.getStorageSync('userinfo'),
-      qrCodePath: '',
-      tiType: [
-        {
-          id: 2,
-          title: '支付宝'
-        },
-        {
-          id: 3,
-          title: '银行卡'
-        }
-      ],
-      tiTypeCur: 0,
-      pageData: '',
-      lastTi: {},
-      isAgree: false
-    }
-  },
-
-  onShow() {
-    this.getUserInfo()
-  },
-
-  methods: {
-    changeTiType(i) {
-      this.tiTypeCur = i
-
-      const curId = this.tiType[i].id
-      const target = this.lastTi[curId]
-
-      if (target) {
-        this.name = target.name
-        this.account = target.number
-        this.bank = target.bank
-      } else {
-        this.name = ''
-        this.account = ''
-      }
-    },
-
-    downCallback() {
-      this.money = ''
-
-      this.mescroll.resetUpScroll()
-      this.mescroll.scrollTo(0, 0)
-      this.getUserInfo()
-    },
-
-    /**
-     * @description: 获取列表
-     * @param {*} num
-     * @param {*} size
-     * @return {*}
-     */
-    getList({ num, size }) {
-      this.req({
-        url: 'withdraw_log',
-        data: {
-          page: num
-        },
-        Loading: true,
-        success: res => {
-          if (res.status == 1) {
-            if (num == 1) {
-              this.listData = []
-            }
-
-            this.pageData = res.data
-            this.listData = this.listData.concat(res.data.list)
-            this.mescroll.endByPage(res.data.list.length, res.data.last_page)
-
-            let lastTi = {}
-            if (res.data.zhifubao)
-              lastTi[res.data.zhifubao.type] = res.data.zhifubao
-            if (res.data.yinhangka)
-              lastTi[res.data.yinhangka.type] = res.data.yinhangka
-
-            this.lastTi = lastTi
-
-            this.changeTiType(this.tiTypeCur)
-          }
-        }
-      })
-    },
-
-    doSubmit() {
-      if (!this.money) {
-        this.$c.toast({
-          title: '请输入金额'
-        })
-        return
-      }
-
-      if (!this.name) {
-        this.$c.toast({
-          title: '姓名不能为空'
-        })
-        return
-      }
-
-      if (!this.account) {
-        this.$c.toast({
-          title: '账号不能为空'
-        })
-        return
-      }
-
-      if (this.tiType[this.tiTypeCur].id == 3) {
-        if (!this.bank) {
-          this.$c.toast({
-            title: '开户行不能为空'
-          })
-          return
-        }
-      }
-
-      if (!this.isAgree) {
-        return this.$c.toast({
-          title: '请阅读并同意《用户协议》和《隐私政策》'
-        })
-      }
-
-      this.req({
-        url: 'withdraw',
-        data: {
-          money: this.money,
-          type: this.tiType[this.tiTypeCur].id,
-          name: this.name,
-          number: this.account,
-          bank: this.bank
-        },
-        success: res => {
-          if (res.status == 1) {
-            this.$c.toast({
-              title: res.msg,
-              duration: 1500,
-              success: () => {
-                this.getUserInfo()
-
-                this.downCallback()
-              }
-            })
-          }
-        }
-      })
-    },
-
-    upImg() {
-      let that = this
-
-      uni.chooseImage({
-        sizeType: ['original', 'compressed'],
-        sourceType: ['album', 'camera'],
-        count: 1,
-        success: ({ tempFilePaths, tempFiles }) => {
-          uni.uploadFile({
-            url: that.siteBaseUrl + 'picture',
-            filePath: tempFilePaths[0],
-            name: 'file',
-            success: e => {
-              let res = JSON.parse(e.data)
-              if (res.status == 1) {
-                this.qrCode = res.data.imgurl
-                this.qrCodePath = res.data.path
-              }
-            }
-          })
-        },
-        fail: error => {}
-      })
-    },
-
-    doAll() {
-      this.money = this.userInfo.money2 * 1
-    },
-
-    getUserInfo() {
-      this.req({
-        url: 'user',
-        data: {},
-        success: res => {
-          if (res.status == 1) {
-            this.userInfo = res.data.userinfo
-
-            uni.setStorageSync('userinfo', res.data.userinfo)
-          }
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.content {
-  padding: 0 30rpx 30rpx;
-
-  .row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 30rpx;
-
-    .left {
-      display: flex;
-      align-items: center;
-
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #ffffff;
-
-      .title-color {
-        font-size: 32rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #FFFFFF;
-      }
-
-      .desc {
-        font-size: 26rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #dddddd;
-      }
-    }
-
-    .right {
-      display: flex;
-      align-items: center;
-
-      font-size: 24rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #ffffff;
-
-      .to-rule {
-        font-size: 24rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #d0d1ff;
-      }
-
-      .right-icon {
-        width: 32rpx;
-        height: 32rpx;
-      }
-
-      .type {
-        display: flex;
-        align-items: center;
-
-        .check {
-          width: 40rpx;
-          height: 32rpx;
-          margin-right: 10rpx;
-        }
-
-        font-size: 28rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #ffffff;
-      }
-
-      .type + .type {
-        margin-left: 40rpx;
-      }
-    }
-  }
-
-  .input-box {
-    margin-top: 30rpx;
-    height: 80rpx;
-    border: 1px solid #d0d1ff;
-    box-sizing: border-box;
-    padding: 0 20rpx;
-    display: flex;
-    align-items: center;
-
-    .label {
-      padding: 0 20rpx;
-      // border-right: 1rpx solid #ccc;
-
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #fff;
-    }
-
-    input {
-      flex: 1;
-
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #fff;
-    }
-  }
-
-  .tip {
-    margin-top: 10rpx;
-
-    font-size: 24rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #dddddd;
-
-    text {
-      padding: 0 10rpx;
-
-      color: #d0d1ff;
-    }
-  }
-
-  .pic {
-    margin-top: 30rpx;
-    width: 200rpx;
-    height: 200rpx;
-    border-radius: 20rpx;
-    border: 1rpx solid #d0d1ff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-
-    .up {
-      width: 100%;
-      height: 100%;
-      position: relative;
-
-      &::before,
-      &::after {
-        content: '';
-        width: 4rpx;
-        height: 40rpx;
-        background: #d0d1ff;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-      }
-
-      &::after {
-        transform: translate(-50%, -50%) rotate(90deg);
-      }
-    }
-  }
-
-  .agree {
-    display: flex;
-    padding: 40rpx 0 0;
-
-    .icon {
-      width: 32rpx;
-      height: 32rpx;
-    }
-
-    .agree-r {
-      flex: 1;
-      word-wrap: break-word;
-      word-break: break-all;
-      padding-left: 20rpx;
-      line-height: 32rpx;
-
-      font-size: 26rpx;
-      color: #9d9d9d;
-
-      text {
-        color: #d0d1ff;
-      }
-    }
-  }
-
-  .submit {
-    margin: 30rpx 0 0;
-
-    width: 100%;
-    height: 80rpx;
-    background: linear-gradient(90deg, #2dcbff 0%, #ff95fb 100%);
-    border-radius: 40rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    font-size: 32rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #222222;
-  }
-
-  .log {
-    padding: 1rpx 10rpx 0;
-
-    .log-item {
-      padding: 30rpx 0;
-      display: flex;
-      align-items: center;
-      border-bottom: 1rpx solid #333;
-
-      .item-l {
-        flex: 1;
-        padding-right: 30rpx;
-
-        .title {
-          font-size: 28rpx;
-          font-family: Source Han Sans CN;
-          font-weight: 400;
-          color: #ffffff;
-
-          text {
-            font-size: 24rpx;
-            padding-left: 20rpx;
-          }
-        }
-
-        .time {
-          margin-top: 6rpx;
-
-          font-size: 25rpx;
-          font-family: Source Han Sans CN;
-          font-weight: 400;
-          color: #cccccc;
-        }
-      }
-
-      .item-money {
-        font-size: 32rpx;
-        font-family: Source Han Sans CN;
-        font-weight: 400;
-        color: #ffffff;
-      }
-    }
-  }
-}
-</style>
diff --git a/pages.json b/pages.json
index 0f662bc..8743861 100644
--- a/pages.json
+++ b/pages.json
@@ -7,27 +7,29 @@
 		"^detail-preview-popup$": "@/components/detail-preview-popup/detail-preview-popup.vue",
 		"^banner$": "@/components/banner/banner.vue"
 	},
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
-		}, {
-			"path": "pages/shouye/index",
+		},
+		{
+			"path": "pages/main/index",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
 		},
 		{
-			"path": "pages/shouye/detail",
+			"path": "pages/main/detail",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
 		},
 		{
-			"path": "pages/shouye/detail_wuxian",
+			"path": "pages/main/detail_wuxian",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#222222",
@@ -35,7 +37,7 @@
 			}
 		},
 		{
-			"path": "pages/shouye/rili",
+			"path": "pages/main/rili",
 			"style": {
 				"navigationBarTitleText": "预售日历",
 				"navigationBarBackgroundColor": "#161616",
@@ -43,16 +45,15 @@
 			}
 		},
 		{
-			"path": "pages/shouye/bangdan",
+			"path": "pages/main/bangdan",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#161616",
 				"navigationBarTextStyle": "black"
 			}
 		},
-
 		{
-			"path": "pages/shouye/huanxiang",
+			"path": "pages/main/huanxiang",
 			"style": {
 				"navigationBarTitleText": "换箱",
 				"navigationBarBackgroundColor": "#222222",
@@ -61,7 +62,7 @@
 			}
 		},
 		{
-			"path": "pages/user/login",
+			"path": "pages/users/login",
 			"style": {
 				"navigationBarTitleText": "登录",
 				"navigationBarBackgroundColor": "#FFFFFF",
@@ -69,7 +70,7 @@
 			}
 		},
 		{
-			"path": "pages/user/bangding",
+			"path": "pages/users/bangding",
 			"style": {
 				"navigationBarTitleText": "绑定手机号",
 				"navigationBarBackgroundColor": "#FFFFFF",
@@ -77,14 +78,14 @@
 			}
 		},
 		{
-			"path": "pages/user/index",
+			"path": "pages/users/index",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
 		},
 		{
-			"path": "pages/user/xfjl",
+			"path": "pages/users/xfjl",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "消费记录",
@@ -92,7 +93,7 @@
 			}
 		},
 		{
-			"path": "pages/user/hsjl",
+			"path": "pages/users/hsjl",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "打包记录",
@@ -100,7 +101,7 @@
 			}
 		},
 		{
-			"path": "pages/user/fhjl",
+			"path": "pages/users/fhjl",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "发货记录",
@@ -108,7 +109,7 @@
 			}
 		},
 		{
-			"path": "pages/user/order",
+			"path": "pages/users/order",
 			"style": {
 				"navigationBarBackgroundColor": "#222222",
 				"navigationBarTitleText": "订单详情",
@@ -117,7 +118,7 @@
 			}
 		},
 		{
-			"path": "pages/user/jf_jl",
+			"path": "pages/users/jf_jl",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "积分记录",
@@ -125,14 +126,13 @@
 			}
 		},
 		{
-			"path": "pages/user/vip",
+			"path": "pages/users/vip",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "会员中心",
 				"navigationBarTextStyle": "black"
 			}
 		},
-
 		{
 			"path": "pages/guize/guize",
 			"style": {
@@ -142,7 +142,7 @@
 			}
 		},
 		{
-			"path": "pages/user/my_coupon",
+			"path": "pages/users/my_coupon",
 			"style": {
 				"navigationBarTitleText": "欧气券",
 				"navigationBarBackgroundColor": "#222222",
@@ -151,13 +151,13 @@
 			}
 		},
 		{
-			"path": "pages/user/bi_jl",
+			"path": "pages/users/bi_jl",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/user/wuliu_detail",
+			"path": "pages/users/wuliu_detail",
 			"style": {
 				"navigationBarTitleText": "查看物流",
 				"navigationBarBackgroundColor": "#222222",
@@ -166,16 +166,15 @@
 			}
 		},
 		{
-			"path": "pages/user/tui-guang",
+			"path": "pages/users/tui-guang",
 			"style": {
 				"navigationBarTitleText": "邀请好友",
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black"
 			}
 		},
-
 		{
-			"path": "pages/user/change",
+			"path": "pages/users/change",
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarBackgroundColor": "#222222",
@@ -191,7 +190,7 @@
 			}
 		},
 		{
-			"path": "pages/mall/index",
+			"path": "pages/shangcheng/index",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
@@ -199,7 +198,7 @@
 			}
 		},
 		{
-			"path": "pages/user/coupon",
+			"path": "pages/users/coupon",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
@@ -207,7 +206,7 @@
 			}
 		},
 		{
-			"path": "pages/shouye/ranking",
+			"path": "pages/main/ranking",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
@@ -215,14 +214,13 @@
 			}
 		},
 		{
-			"path": "pages/user/bangdingweb",
+			"path": "pages/users/bangdingweb",
 			"style": {
 				"navigationBarTitleText": "绑定手机号"
 			}
 		},
-
 		{
-			"path": "pages/shouye/invite_ranking",
+			"path": "pages/main/invite_ranking",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
@@ -252,8 +250,9 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		}, {
-			"path": "pages/shouye/dada_ranking",
+		},
+		{
+			"path": "pages/main/dada_ranking",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -265,7 +264,7 @@
 			}
 		},
 		{
-			"path": "pages/shouye/danye",
+			"path": "pages/main/danye",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -289,7 +288,7 @@
 			}
 		},
 		{
-			"path": "pages/shouye/slots",
+			"path": "pages/main/slots",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -307,7 +306,7 @@
 			}
 		},
 		{
-			"path": "pages/user/recharge-page",
+			"path": "pages/users/recharge-page",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -319,13 +318,13 @@
 			}
 		},
 		{
-			"path": "pages/shouye/prize-wheel-demo",
+			"path": "pages/main/prize-wheel-demo",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/shouye/canvas-prize-demo",
+			"path": "pages/main/canvas-prize-demo",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -349,7 +348,7 @@
 			}
 		},
 		{
-			"path": "pages/user/cancel-account-page",
+			"path": "pages/users/cancel-account-page",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -361,82 +360,31 @@
 			}
 		},
 		{
-			"path": "pages/user/yetx",
+			"path": "pages/users/yetx",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/users/collect",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/users/equity",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/other/qy-rule",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		}
 	],
-	"subPackages": [{
-			"root": "package/index",
-			"pages": [{
-					"path": "sign",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "lian-ji",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "coupon-center",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "leitai",
-					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		},
-		{
-			"root": "package/mine",
-			"pages": [{
-					"path": "collect",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "skill-card",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "equity",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "qy-rule",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "coupon-detail",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "ti-qu",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		}
-	],
+	"subPackages": [],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "友达赏",
@@ -456,13 +404,13 @@
 		"iconHeight": "24px",
 		"list": [
 			{
-				"pagePath": "pages/shouye/index",
+				"pagePath": "pages/main/index",
 				"iconPath": "static/tab/n1.png",
 				"selectedIconPath": "static/tab/c1.png",
 				"text": "首页"
 			},
 			{
-				"pagePath": "pages/mall/index",
+				"pagePath": "pages/shangcheng/index",
 				"iconPath": "static/tab/n5.png",
 				"selectedIconPath": "static/tab/c5.png",
 				"text": "商城"
@@ -480,7 +428,7 @@
 				"text": "福利"
 			},
 			{
-				"pagePath": "pages/user/index",
+				"pagePath": "pages/users/index",
 				"iconPath": "static/tab/n4.png",
 				"selectedIconPath": "static/tab/c4.png",
 				"text": "我的"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 602bbdc..0891a7d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,7 +39,7 @@ export default {
 		toHome() {
 			// #ifdef H5 || MP
 			uni.switchTab({
-				url: '/pages/shouye/index'
+				url: '/pages/main/index'
 			});
 			// #endif
 		},
diff --git a/pages/infinite/benefit.vue b/pages/infinite/benefit.vue
index 02c9e2e..9c77f9b 100644
--- a/pages/infinite/benefit.vue
+++ b/pages/infinite/benefit.vue
@@ -52,13 +52,13 @@ export default {
 		return {
 			imageUrl: imageUrl,
 			title: "友达上线,来就送！",
-			path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
+			path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID
 		}
 	},
 	methods: {
 		items(item) {
 			this.$c.to({
-				url: '/pages/shouye/detail',
+				url: '/pages/main/detail',
 				query: {
 					goods_id: item.id,
 					type_text: '积分赏'
diff --git a/pages/infinite/bonus_house_details.vue b/pages/infinite/bonus_house_details.vue
index ab902c0..56bcd6d 100644
--- a/pages/infinite/bonus_house_details.vue
+++ b/pages/infinite/bonus_house_details.vue
@@ -693,7 +693,7 @@ export default {
 		},
 
 		toHome() {
-			this.$customRouter.navigateTo('/pages/shouye/index', {}, 'reLaunch');
+			this.$customRouter.navigateTo('/pages/main/index', {}, 'reLaunch');
 		},
 
 		applyPageTransitions() {
diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue
index 535fa39..c79db65 100644
--- a/pages/infinite/index.vue
+++ b/pages/infinite/index.vue
@@ -31,7 +31,7 @@ export default {
 		return {
 			imageUrl: imageUrl,
 			title: "友达上线,来就送！",
-			path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
+			path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID
 		}
 	},
 	methods: {
diff --git a/pages/kit/kit.vue b/pages/kit/kit.vue
index b51d3f9..79a0138 100644
--- a/pages/kit/kit.vue
+++ b/pages/kit/kit.vue
@@ -525,7 +525,7 @@ export default {
 
 		toExpress(item) {
 			this.$c.to({
-				url: '/pages/user/wuliu_detail',
+				url: '/pages/users/wuliu_detail',
 				query: {
 					id: item.id
 				}
@@ -534,7 +534,7 @@ export default {
 
 		toOrder(item) {
 			this.$c.to({
-				url: '/pages/user/order',
+				url: '/pages/users/order',
 				query: {
 					id: item.id
 				}
diff --git a/pages/shouye/bangdan.vue b/pages/main/bangdan.vue
similarity index 99%
rename from pages/shouye/bangdan.vue
rename to pages/main/bangdan.vue
index 9fdc076..c86de86 100644
--- a/pages/shouye/bangdan.vue
+++ b/pages/main/bangdan.vue
@@ -256,9 +256,9 @@ export default {
       var pages = getCurrentPages()
       // console.log(pages)
 
-      if (pages.length == 1 && pages[0].route == 'pages/shouye/bangdan') {
+      if (pages.length == 1 && pages[0].route == 'pages/main/bangdan') {
         uni.redirectTo({
-          url: '/pages/shouye/index'
+          url: '/pages/main/index'
         })
       } else {
         uni.navigateBack()
diff --git a/pages/shouye/canvas-prize-demo.vue b/pages/main/canvas-prize-demo.vue
similarity index 100%
rename from pages/shouye/canvas-prize-demo.vue
rename to pages/main/canvas-prize-demo.vue
diff --git a/pages/shouye/dada_ranking.vue b/pages/main/dada_ranking.vue
similarity index 100%
rename from pages/shouye/dada_ranking.vue
rename to pages/main/dada_ranking.vue
diff --git a/pages/shouye/danye.vue b/pages/main/danye.vue
similarity index 100%
rename from pages/shouye/danye.vue
rename to pages/main/danye.vue
diff --git a/pages/shouye/detail.vue b/pages/main/detail.vue
similarity index 99%
rename from pages/shouye/detail.vue
rename to pages/main/detail.vue
index 41bd16a..a32fc2c 100644
--- a/pages/shouye/detail.vue
+++ b/pages/main/detail.vue
@@ -249,7 +249,7 @@ export default {
 			title: this.$config.getAppSetting("app_name") +
 				`${this.pageData.goods.title}系列 第${this.pageData.goods.num}套`,
 			imageUrl: this.pageData.goods.imgurl_detail,
-			path: "/pages/shouye/detail" +
+			path: "/pages/main/detail" +
 				this.$c.qs({
 					goods_id: this.pageData.goods.id,
 					goods_num: this.pageData.goods.num,
@@ -365,7 +365,7 @@ export default {
 
 		toCoupon() {
 			this.$c.to({
-				url: "/pages/user/coupon",
+				url: "/pages/users/coupon",
 				query: {
 					type: 2,
 					total_price: this.orderData.order_total,
@@ -572,7 +572,7 @@ export default {
 
 		changeBox() {
 			this.$c.to({
-				url: "/pages/shouye/huanxiang",
+				url: "/pages/main/huanxiang",
 				query: {
 					id: this.pageData.goods.id,
 					type_text: this.optData.type_text,
diff --git a/pages/shouye/detail_wuxian.vue b/pages/main/detail_wuxian.vue
similarity index 99%
rename from pages/shouye/detail_wuxian.vue
rename to pages/main/detail_wuxian.vue
index 68e5d16..ab26482 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/main/detail_wuxian.vue
@@ -314,7 +314,7 @@ export default {
 		return {
 			title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`,
 			imageUrl: this.pageData.goods.imgurl_detail,
-			path: '/pages/shouye/detail_wuxian' +
+			path: '/pages/main/detail_wuxian' +
 				this.$c.qs({
 					goods_id: this.pageData.goods.id,
 					goods_num: this.pageData.goods.num,
@@ -476,7 +476,7 @@ export default {
 
 		toCoupon() {
 			this.$c.to({
-				url: '/pages/user/coupon',
+				url: '/pages/users/coupon',
 				query: {
 					type: 2,
 					total_price: this.orderData.order_total
diff --git a/pages/shouye/huanxiang.vue b/pages/main/huanxiang.vue
similarity index 100%
rename from pages/shouye/huanxiang.vue
rename to pages/main/huanxiang.vue
diff --git a/pages/shouye/index.vue b/pages/main/index.vue
similarity index 98%
rename from pages/shouye/index.vue
rename to pages/main/index.vue
index 212ecf7..573f76d 100644
--- a/pages/shouye/index.vue
+++ b/pages/main/index.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script>
-	import lffBarrage from "@/components/lff-barrage/lff-barrage.vue";
+ 
 	import FloatBall from "@/components/float-ball/FloatBall.vue";
 	import {
 		getAdvert,
@@ -129,7 +129,7 @@
 	} from "../../common/server/config";
 	export default {
 		components: {
-			lffBarrage,
+		 
 			FloatBall
 		},
 		data() {
@@ -207,7 +207,7 @@
 				imageUrl: imageUrl,
 				title: this.$config.getAppSetting("app_name") + "，正版潮玩手办一番赏",
 
-				path: "/pages/shouye/index?pid=" + uni.getStorageSync("userinfo").ID,
+				path: "/pages/main/index?pid=" + uni.getStorageSync("userinfo").ID,
 			};
 		},
 		computed: {
@@ -340,14 +340,14 @@
 			},
 			todetails(e) {
 				// 无限赏
-				let url = "/pages/shouye/detail";
+				let url = "/pages/main/detail";
 				let params = {
 					goods_id: e.id,
 					// type_text: e.type_text
 				};
 
 				if (e.type == 2 || e.type == 8 || e.type == 16) {
-					url = "/pages/shouye/detail_wuxian";
+					url = "/pages/main/detail_wuxian";
 				}
 
 				if (e.type == 9) {
@@ -369,10 +369,10 @@
 			},
 
 			toRanking() {
-				this.$customRouter.navigateTo("/pages/shouye/ranking");
+				this.$customRouter.navigateTo("/pages/main/ranking");
 			},
 			toyaqingRanking() {
-				this.$customRouter.navigateTo("/pages/shouye/invite_ranking");
+				this.$customRouter.navigateTo("/pages/main/invite_ranking");
 			},
 
 			jumapSlots() {
diff --git a/pages/shouye/invite_ranking.vue b/pages/main/invite_ranking.vue
similarity index 98%
rename from pages/shouye/invite_ranking.vue
rename to pages/main/invite_ranking.vue
index 66c0d00..66648a3 100644
--- a/pages/shouye/invite_ranking.vue
+++ b/pages/main/invite_ranking.vue
@@ -52,7 +52,7 @@
 			</view>
 
 			<view class="bottom-btn">
-				<view class="invite-btn" @click="$c.nav('/pages/user/tui-guang')">
+				<view class="invite-btn" @click="$c.nav('/pages/users/tui-guang')">
 					<text>立即邀请</text>
 				</view>
 			</view>
diff --git a/pages/shouye/prize-wheel-demo.vue b/pages/main/prize-wheel-demo.vue
similarity index 100%
rename from pages/shouye/prize-wheel-demo.vue
rename to pages/main/prize-wheel-demo.vue
diff --git a/pages/shouye/ranking.vue b/pages/main/ranking.vue
similarity index 100%
rename from pages/shouye/ranking.vue
rename to pages/main/ranking.vue
diff --git a/pages/shouye/rili.vue b/pages/main/rili.vue
similarity index 100%
rename from pages/shouye/rili.vue
rename to pages/main/rili.vue
diff --git a/pages/shouye/slots.vue b/pages/main/slots.vue
similarity index 100%
rename from pages/shouye/slots.vue
rename to pages/main/slots.vue
diff --git a/pages/other/about.vue b/pages/other/about.vue
index ce5eadc..022cf5a 100644
--- a/pages/other/about.vue
+++ b/pages/other/about.vue
@@ -206,7 +206,7 @@ export default {
 						uni.removeStorageSync('userinfo');
 						// uni.removeStorageSync('test_mode_status');
 						uni.switchTab({
-							url: '/pages/shouye/index'
+							url: '/pages/main/index'
 						});
 					} else if (res.cancel) {
 						console.log('用户点击取消');
diff --git a/package/mine/qy-rule.vue b/pages/other/qy-rule.vue
similarity index 100%
rename from package/mine/qy-rule.vue
rename to pages/other/qy-rule.vue
diff --git a/pages/mall/index.vue b/pages/shangcheng/index.vue
similarity index 99%
rename from pages/mall/index.vue
rename to pages/shangcheng/index.vue
index 5e3b4a2..6d6cb4f 100644
--- a/pages/mall/index.vue
+++ b/pages/shangcheng/index.vue
@@ -148,7 +148,7 @@ export default {
 		return {
 			imageUrl: imageUrl,
 			title: "友达上线,来就送！",
-			path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
+			path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID
 		}
 	},
 	data() {
diff --git a/pages/user/login.vue b/pages/user/login.vue
deleted file mode 100644
index 95465ba..0000000
--- a/pages/user/login.vue
+++ /dev/null
@@ -1,569 +0,0 @@
-<template>
-	<view class="all">
-		<!-- 小程序登录界面 -->
-		<view v-if="isCanUse && isMpWeixin">
-			<view>
-				<view class="header">
-					<image :src="$img1('common/logo.png?x=1')"></image>
-				</view>
-				<view class="content">
-					<view>申请获取以下权限</view>
-					<text style="color: #979797;">获得你的公开信息</text>
-				</view>
-
-				<view @click="isAgree = !isAgree" class="agree">
-					<view class="icon">
-						<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
-
-						<image v-else :src="$img1('common/check.png')" lazy-load></image>
-					</view>
-
-					<view class="agree-r">
-						我已阅读并同意
-						<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', {type: 4})">
-							《用户协议》
-						</text>
-						和
-						<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', {type: 5})">
-							《隐私政策》
-						</text>
-					</view>
-				</view>
-
-				<view class="btn-list">
-					<view @click="navigateBack()" class="cancel">
-						拒绝
-					</view>
-					<button class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
-						@click="getUserProfile">
-						<text>授权登录</text>
-					</button>
-				</view>
-				<view style="font-size: 20rpx;color: #979797;position: fixed;bottom: 20rpx;right:47rpx;">version:v1.0.3
-				</view>
-			</view>
-		</view>
-
-		<!-- H5手机号登录界面 -->
-		<view v-if="isCanUse && !isMpWeixin">
-			<view>
-				<view class="header">
-					<image :src="$img1('common/logo.png?x=1')"></image>
-				</view>
-
-				<view class="h5-login-form">
-					<view class="input-item">
-						<input type="number" v-model="mobile" placeholder="请输入手机号" maxlength="11" class="phone-input" />
-					</view>
-
-					<view class="input-item code-item">
-						<input type="number" v-model="verifyCode" placeholder="请输入验证码" maxlength="6"
-							class="code-input" />
-						<view @click="sendVerifyCode" class="send-code-btn" :class="{ disabled: countdown > 0 }">
-							{{ countdown > 0 ? countdown + '秒' : '发送验证码' }}
-						</view>
-					</view>
-
-					<view @click="isAgree = !isAgree" class="agree">
-						<view class="icon">
-							<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
-							<image v-else :src="$img1('common/check.png')" lazy-load></image>
-						</view>
-						<view class="agree-r">
-							我已阅读并同意
-							<text @click.stop="$platform.getUserAgreement()">
-								《用户协议》
-							</text>
-							和
-							<text @click.stop="$platform.getPrivacyAgreement()">
-								《隐私政策》
-							</text>
-						</view>
-					</view>
-
-					<view class="btn-list">
-						<view @click="navigateBack()" class="cancel">
-							拒绝
-						</view>
-						<view class="bottom center" @click="phoneLogin">
-							<text>登录</text>
-						</view>
-					</view>
-				</view>
-
-				<view style="font-size: 20rpx;color: #979797;position: fixed;bottom: 20rpx;right:47rpx;">version:v1.0.3
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				z_imgPath: this.$z_img2,
-				SessionKey: '',
-				OpenId: '',
-				nickName: null,
-				avatarUrl: null,
-				isCanUse: uni.getStorageSync('isCanUse') || true, //默认为true
-				code: '',
-				isAgree: false,
-				// H5手机号登录相关数据
-				isMpWeixin: false, // 是否为小程序环境
-				mobile: '', // 手机号
-				verifyCode: '', // 验证码
-				countdown: 0, // 发送验证码倒计时
-				timer: null, // 倒计时定时器
-				codeSent: false // 是否已发送验证码
-			}
-		},
-		onLoad(option) {
-			// 判断当前环境
-			// #ifdef MP
-			this.isMpWeixin = true;
-			// #endif
-
-			//默认加载
-			if (option != null) {
-				if (option.code != null) {
-
-				}
-			}
-		},
-		onUnload() {
-			// 清除定时器
-			if (this.timer) {
-				clearInterval(this.timer);
-				this.timer = null;
-			}
-		},
-		methods: {
-			//返回上一页
-			navigateBack() {
-				uni.navigateBack({
-					delta: 1,
-					fail: () => {
-						// 如果没有上一页，则跳转到首页
-						this.$customRouter.navigateTo('/pages/shouye/index', {}, 'switchTab');
-					}
-				});
-			},
-			//第一授权获取用户信息===》按钮触发
-			getUserProfile(e) {
-				if (!this.isAgree) {
-					return uni.showToast({
-						title: '请阅读并同意《用户协议》和《隐私政策》',
-						icon: 'none'
-					});
-				}
-
-				// #ifdef MP
-				this.wxUserProfile();
-				// #endif
-			},
-			// 发送验证码
-			async sendVerifyCode() {
-				// 如果正在倒计时，不允许重复发送
-				if (this.countdown > 0) {
-					return;
-				}
-
-				// 检查是否同意协议
-				if (!this.isAgree) {
-					return uni.showToast({
-						title: '请阅读并同意《用户协议》和《隐私政策》',
-						icon: 'none'
-					});
-				}
-
-				// 验证手机号
-				if (!this.mobile || !/^1\d{10}$/.test(this.mobile)) {
-					return uni.showToast({
-						title: '请输入正确的手机号',
-						icon: 'none'
-					});
-				}
-
-				// 发送验证码请求
-				try {
-					const res = await this.$request.post('v2/account/sendSms', {
-						phone: this.mobile
-					});
-
-					if (res.status == 1) {
-						uni.showToast({
-							title: '验证码已发送',
-							icon: 'none'
-						});
-
-						// 标记已发送验证码（仅当前会话有效）
-						this.codeSent = true;
-
-						// 开始倒计时，使用接口返回的时间
-						this.countdown = res.data || 60; // 使用返回的秒数，默认60秒
-						this.timer = setInterval(() => {
-							this.countdown--;
-							if (this.countdown <= 0) {
-								clearInterval(this.timer);
-								this.timer = null;
-							}
-						}, 1000);
-					} else {
-						uni.showToast({
-							title: res.msg || '发送失败，请稍后重试',
-							icon: 'none'
-						});
-					}
-				} catch (error) {
-					uni.showToast({
-						title: '发送验证码失败，请稍后重试',
-						icon: 'none'
-					});
-					console.error('发送验证码失败:', error);
-				}
-			},
-			// 手机号登录
-			async phoneLogin() {
-				// 验证表单
-				if (!this.isAgree) {
-					return uni.showToast({
-						title: '请阅读并同意《用户协议》和《隐私政策》',
-						icon: 'none'
-					});
-				}
-
-				if (!this.mobile || !/^1\d{10}$/.test(this.mobile)) {
-					return uni.showToast({
-						title: '请输入正确的手机号',
-						icon: 'none'
-					});
-				}
-
-				if (!this.verifyCode) {
-					return uni.showToast({
-						title: '请输入验证码',
-						icon: 'none'
-					});
-				}
-
-				// 检查当前会话中是否发送过验证码
-				// if (!this.codeSent) {
-				// 	return uni.showToast({
-				// 		title: '请先发送验证码',
-				// 		icon: 'none'
-				// 	});
-				// }
-
-				// 发送登录请求
-				try {
-					const res = await this.$request.post('mobileLogin', {
-						mobile: this.mobile,
-						code: this.verifyCode,
-						pid: uni.getStorageSync('pid')
-					});
-
-					if (res.status == 1) {
-						uni.setStorageSync('token', res.data);
-						this.$c.msg("登录成功");
-
-						// 检查重定向URL
-						const redirectUrl = uni.getStorageSync('redirect');
-
-						if (redirectUrl) {
-							// 清除重定向信息
-							uni.removeStorageSync('redirect');
-							// 使用公共方法处理重定向
-							this.handleRedirect(redirectUrl);
-						} else {
-							// 无重定向页面，检查是否需要绑定手机号
-							setTimeout(() => {
-								this.getdata();
-							}, 1000);
-						}
-					} else {
-						this.$c.msg("登录失败!" + res.msg);
-					}
-				} catch (error) {
-					// this.$c.msg("登录请求失败，请稍后重试");
-					console.error('登录失败:', error);
-				}
-			},
-			/**
-			 * 处理登录成功后的重定向逻辑
-			 * @param {String} redirectUrl 重定向URL
-			 */
-			handleRedirect(redirectUrl) {
-				let that = this;
-
-				// 获取当前页面栈
-				const pages = getCurrentPages();
-
-				// 检查是否有上一页，以及redirect URL是否与上一页相同
-				if (pages.length > 1) {
-					const prevPage = pages[pages.length - 2];
-					// 构建完整的上一页路径(带参数)
-					let prevPageUrl = '/' + prevPage.route;
-					if (prevPage.options && Object.keys(prevPage.options).length > 0) {
-						const paramStr = Object.keys(prevPage.options)
-							.map(key => `${key}=${prevPage.options[key]}`)
-							.join('&');
-						prevPageUrl += '?' + paramStr;
-					}
-
-					// 比较redirect URL和上一页URL
-					const redirectUrlPath = redirectUrl.split('?')[0];
-					const prevPageUrlPath = prevPageUrl.split('?')[0];
-
-					if (redirectUrlPath === prevPageUrlPath) {
-						// 如果路径相同，直接返回上一页
-						console.log('重定向URL与上一页相同，直接返回');
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 1000);
-						return true;
-					}
-				}
-
-				// 重定向到指定URL
-				setTimeout(() => {
-					that.$customRouter.navigateTo(redirectUrl).catch(err => {
-						console.error('重定向跳转失败:', err)
-						// 失败时跳转到首页
-						that.$customRouter.navigateTo('/pages/user/index')
-					})
-				}, 1000);
-
-				return true;
-			},
-			async wxUserProfile() {
-				try {
-					const profileRes = await new Promise((resolve, reject) => {
-						uni.getUserProfile({
-							desc: '用于向用户发送商品',
-							lang: 'zh_CN',
-							success: resolve,
-							fail: reject,
-							complete: (e) => {
-								console.log(e, '用于向用户发送商品');
-							}
-						});
-					});
-
-					try {
-						const loginRes = await new Promise((resolve, reject) => {
-							uni.login({
-								provider: 'weixin',
-								success: resolve,
-								fail: (e) => {
-									this.$c.msg("登录失败，网络错误！" + e.msg);
-									console.log(e, '登录失败', e);
-									reject(e);
-								},
-								complete: (e) => {
-									console.log(e, '登录');
-								}
-							});
-						});
-
-						try {
-							const res = await this.$request.post('login', {
-								code: loginRes.code,
-								nickname: '',
-								headimg: '',
-								pid: uni.getStorageSync('pid')
-							});
-							console.log(res, '登录成功');
-							
-							if (res.status == 1) {
-								uni.setStorageSync('token', res.data);
-								this.$c.msg("登录成功");
-
-								// 检查重定向URL
-								const redirectUrl = uni.getStorageSync('redirect');
-
-								if (redirectUrl) {
-									// 清除重定向信息
-									uni.removeStorageSync('redirect');
-
-									// 使用公共方法处理重定向
-									this.handleRedirect(redirectUrl);
-								} else {
-									// 无重定向页面，检查是否需要绑定手机号
-									setTimeout(() => {
-										this.getdata();
-									}, 1000);
-								}
-							} else {
-								this.$c.msg("登录失败!" + res.msg);
-							}
-						} catch (error) {
-							console.error('请求登录失败:', error);
-						}
-					} catch (error) {
-						console.error('微信登录失败:', error);
-					}
-				} catch (error) {
-					this.$c.msg("登录失败,申请获取微信用户数据失败");
-					console.log(error, '获取微信用户数据失败');
-				}
-			},
-			async getdata() {
-				try {
-					const res = await this.$request.post('user');
-					if (res.status == 1 && res.data.userinfo != null && res.data.userinfo.mobile_is == 0) {
-						console.log("判断用户有没有手机号", res.data.userinfo.mobile_is);
-						// 使用新的路由守卫方法跳转到绑定页面
-						this.$customRouter.navigateTo('/pages/user/bangding', {}, 'navigateTo');
-					} else {
-						// 使用新的路由守卫方法跳转到用户首页
-						this.$customRouter.navigateTo('/pages/user/index', {}, 'navigateTo');
-					}
-				} catch (error) {
-					console.error('获取用户数据失败:', error);
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.all {
-		min-height: 100vh;
-		background-color: #FFFFFF;
-		// background: url($imgurl+'common/pageBg1.png') no-repeat 0 0 / 100% auto;
-	}
-
-	.header {
-		margin: 0 0 90rpx 50rpx;
-		padding: 90rpx 0 0;
-		border-bottom: 1px solid #E8E8E8;
-		text-align: center;
-		width: 650rpx;
-		height: 300rpx;
-		line-height: 450rpx;
-	}
-
-	.header image {
-		width: 200rpx;
-		height: 200rpx;
-		border-radius: 50%;
-	}
-
-	.content {
-		margin-left: 50rpx;
-		margin-bottom: 90rpx;
-		color: #333333;
-	}
-
-	.content text {
-		display: block;
-		margin-top: 28rpx;
-	}
-
-	// H5登录表单样式
-	.h5-login-form {
-		padding: 0 50rpx;
-
-		.input-item {
-			height: 90rpx;
-			border-bottom: 1px solid #E8E8E8;
-			margin-bottom: 40rpx;
-
-			input {
-				height: 100%;
-				width: 100%;
-				font-size: 28rpx;
-			}
-		}
-
-		.code-item {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.code-input {
-				flex: 1;
-			}
-
-			.send-code-btn {
-				width: 200rpx;
-				height: 70rpx;
-				background-color: #333333;
-				color: #CDEF27;
-				font-size: 24rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				border-radius: 12rpx;
-
-				&.disabled {
-					background-color: #cccccc;
-					color: #ffffff;
-				}
-			}
-		}
-	}
-
-	.agree {
-		display: flex;
-		padding: 0 50rpx;
-		margin: 40rpx 0;
-
-		.icon {
-			width: 32rpx;
-			height: 32rpx;
-		}
-
-		.agree-r {
-			flex: 1;
-			word-wrap: break-word;
-			word-break: break-all;
-			padding-left: 20rpx;
-			line-height: 32rpx;
-
-			font-size: 20rpx;
-			color: #999999;
-
-			text {
-				color: #333333;
-			}
-		}
-	}
-
-	.btn-list {
-		display: flex;
-		justify-content: space-evenly;
-		padding: 50rpx 0 0;
-
-		.cancel {
-			width: 200rpx;
-			height: 80rpx;
-			box-sizing: border-box;
-			border-radius: 16rpx;
-			font-size: 28rpx;
-			color: #333333;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background-color: #CDEF27;
-			// filter: grayscale(1);
-		}
-
-		.bottom {
-			background: #333333;
-			margin: 0;
-			width: 416rpx;
-			height: 80rpx;
-			text-align: center;
-			box-sizing: border-box;
-			border-radius: 16rpx;
-			font-size: 28rpx;
-			color: #CDEF27;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/user/bangding.vue b/pages/users/bangding.vue
similarity index 95%
rename from pages/user/bangding.vue
rename to pages/users/bangding.vue
index ff9c264..f108e9e 100644
--- a/pages/user/bangding.vue
+++ b/pages/users/bangding.vue
@@ -44,7 +44,7 @@ export default {
 			uni.navigateBack({
 				fail: function() {
 					// 如果返回失败，表示没有上一页，则跳转到首页
-					that.$customRouter.navigateTo('/pages/user/index', {}, 'reLaunch');
+					that.$customRouter.navigateTo('/pages/users/index', {}, 'reLaunch');
 				}
 			});
 		},
@@ -79,7 +79,7 @@ export default {
 													uni.navigateBack({
 														fail: function() {
 															// 如果返回失败，表示没有上一页，则跳转到首页
-															that.$customRouter.navigateTo('/pages/user/index', {}, 'reLaunch');
+															that.$customRouter.navigateTo('/pages/users/index', {}, 'reLaunch');
 														}
 													});
 												}, 1000)
diff --git a/pages/user/bangdingweb.vue b/pages/users/bangdingweb.vue
similarity index 100%
rename from pages/user/bangdingweb.vue
rename to pages/users/bangdingweb.vue
diff --git a/pages/user/bi_jl.vue b/pages/users/bi_jl.vue
similarity index 100%
rename from pages/user/bi_jl.vue
rename to pages/users/bi_jl.vue
diff --git a/pages/user/cancel-account-page.vue b/pages/users/cancel-account-page.vue
similarity index 98%
rename from pages/user/cancel-account-page.vue
rename to pages/users/cancel-account-page.vue
index a947ea6..2dac380 100644
--- a/pages/user/cancel-account-page.vue
+++ b/pages/users/cancel-account-page.vue
@@ -83,7 +83,7 @@
 						}
 						this.closePop();
 						uni.switchTab({
-							url: '/pages/shouye/index'
+							url: '/pages/main/index'
 						});
 					}
 				})
diff --git a/pages/user/change.vue b/pages/users/change.vue
similarity index 100%
rename from pages/user/change.vue
rename to pages/users/change.vue
diff --git a/pages/users/collect.vue b/pages/users/collect.vue
new file mode 100644
index 0000000..cfe1dc1
--- /dev/null
+++ b/pages/users/collect.vue
@@ -0,0 +1,357 @@
+<template>
+    <view class="content">
+        <uni-nav-bar left-icon="left" title="我的收藏" color="#000000" backgroundColor="transparent" :fixed="true"
+            :statusBar="true" :border="false" @clickLeft="$c.back"></uni-nav-bar>
+
+        <!-- 顶部标签栏 -->
+        <scroll-view class="tab" scroll-x>
+            <view class="tab-item" v-for="(item, i) in tabList" :key="i" :class="{ active: tabCur === i }"
+                @click="tabChange(i)">
+                {{ item.title }}
+            </view>
+        </scroll-view>
+
+        <!-- 列表区域 -->
+        <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getList" :down="downOption"
+            :up="upOption">
+            <view class="list" v-if="listData.length > 0">
+                <view class="list-item" v-for="(item, i) in listData" :key="i" @click="toDetail(item)">
+                    <view class="pic">
+                        <image class="pic-img" :src="item.imgurl" mode="aspectFill" lazy-load></image>
+                    </view>
+                    <view class="tag" :style="{ backgroundImage: `url(${$img1('common/label1.png')})` }">
+                        <text>{{ tabList[tabCur].title }}</text>
+                    </view>
+                    <view class="title ellipsis">{{ item.goods_title }}</view>
+
+                    <view class="price-box">
+                        <view class="price">
+                            ¥<text>{{ item.goods_price }}</text>
+                        </view>
+                        <view v-if="item.stock" class="stock">
+                            <view class="stock-num">{{ item.surplus_stock }}/{{ item.stock }}</view>
+                            <image class="stock-icon" :src="$img1('index/box.png')" lazy-load></image>
+                        </view>
+                    </view>
+                </view>
+            </view>
+
+            <!-- 空状态 -->
+            <view class="empty-state" v-if="listData.length === 0 && !isLoading">
+                <image class="empty-image" :src="$img1('common/empty.png')" mode="aspectFit"></image>
+                <text class="empty-text">暂无收藏内容</text>
+            </view>
+        </mescroll-body>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            // 下拉刷新配置
+            downOption: {
+                auto: false,
+            },
+            // 上拉加载配置
+            upOption: {
+                auto: true,
+                page: {
+                    size: 10, // 每页数据数量
+                },
+                noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据
+                empty: {
+                    use: false, // 使用自定义的空状态
+                },
+            },
+            tabList: [], // 标签列表
+            tabCur: 0, // 当前选中标签索引
+            listData: [], // 列表数据
+            isLoading: true, // 是否正在加载
+        };
+    },
+
+    created() {
+        // 获取商品类型列表
+        this.initTabList();
+    },
+
+    methods: {
+        /**
+         * 初始化标签列表
+         */
+        initTabList() {
+            const tabList = this.$config.getGoodType();
+            // 过滤掉id为0的选项
+            this.tabList = tabList.filter((item) => item.id !== 0);
+        },
+
+        /**
+         * 初始化mescroll对象
+         * @param {Object} mescroll mescroll实例
+         */
+        mescrollInit(mescroll) {
+            this.mescroll = mescroll;
+        },
+
+        /**
+         * 下拉刷新回调
+         */
+        downCallback() {
+            this.mescroll.resetUpScroll();
+        },
+
+        /**
+         * 跳转到详情页
+         * @param {Object} item 商品项
+         */
+        toDetail(item) {
+            let url = "/pages/main/detail";
+
+            // 根据商品类型跳转到不同详情页
+            if (item.type === 2 || item.type === 8) {
+                url = "/pages/main/detail_wuxian";
+            } else if (item.type === 9) {
+                url = "/package/index/lian-ji";
+            }
+
+            this.$c.to({
+                url,
+                query: {
+                    goods_id: item.goods_id,
+                    type_text: this.tabList[this.tabCur].title,
+                },
+            });
+        },
+
+        /**
+         * 切换标签
+         * @param {Number} index 标签索引
+         */
+        tabChange(index) {
+            if (this.tabCur === index) return;
+
+            this.tabCur = index;
+            this.listData = [];
+            this.isLoading = true;
+
+            // 重置列表并滚动到顶部
+            this.mescroll.resetUpScroll();
+            this.mescroll.scrollTo(0, 0);
+        },
+
+        /**
+         * 获取收藏列表数据
+         * @param {Object} params 分页参数
+         */
+        getList({ num, size }) {
+            this.isLoading = true;
+
+            // 使用Promise方式调用API
+            this.$request
+                .post("listCollect", {
+                    page: num,
+                    type: this.tabList[this.tabCur].id,
+                })
+                .then((res) => {
+                    this.isLoading = false;
+
+                    if (res.status === 1) {
+                        // 第一页时清空数据
+                        if (num === 1) {
+                            this.listData = [];
+                        }
+
+                        // 追加数据
+                        this.listData = this.listData.concat(res.data.data || []);
+
+                        // 更新分页状态
+                        this.mescroll.endByPage(
+                            res.data.data ? res.data.data.length : 0,
+                            res.data.last_page || 1
+                        );
+                    } else {
+                        this.mescroll.endErr();
+                        uni.showToast({
+                            title: res.msg || "加载失败",
+                            icon: "none",
+                        });
+                    }
+                })
+                .catch((err) => {
+                    this.isLoading = false;
+                    this.mescroll.endErr();
+                    uni.showToast({
+                        title: "网络请求失败",
+                        icon: "none",
+                    });
+                    console.error(err);
+                });
+        },
+    },
+};
+</script>
+
+<style lang="scss">
+.content {
+    background-color: #f7f7f7;
+    min-height: 100vh;
+
+    // 顶部标签栏
+    .tab {
+        white-space: nowrap;
+        padding: 15rpx 0;
+
+        .tab-item {
+            width: 88rpx;
+            height: 40rpx;
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 30rpx;
+            background-color: #ffffff;
+            font-size: 20rpx;
+            border-radius: 8rpx;
+            color: #333333;
+            transition: all 0.2s;
+
+            &:last-child {
+                margin-right: 30rpx;
+            }
+
+            &.active {
+                background-color: #e6f791;
+                font-weight: 500;
+            }
+        }
+    }
+
+    // 商品列表
+    .list {
+        padding: 15rpx 30rpx 30rpx;
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+
+        .list-item {
+            width: 330rpx;
+            height: 487rpx;
+            margin-top: 30rpx;
+            position: relative;
+            background-color: #ffffff;
+            border-radius: 16rpx;
+            overflow: hidden;
+            box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+
+            .pic {
+                width: 100%;
+                height: 332rpx;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                background-color: #f5f5f5;
+                border-radius: 16rpx 16rpx 0 0;
+                overflow: hidden;
+
+                .pic-img {
+                    width: 100%;
+                    height: 100%;
+                    border-radius: 16rpx 16rpx 0 0;
+                }
+            }
+
+            .tag {
+                position: absolute;
+                z-index: 1;
+                top: 12rpx;
+                left: 12rpx;
+                width: 68rpx;
+                height: 32rpx;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                background-size: 100% 100%;
+
+                text {
+                    font-size: 14rpx;
+                    color: #ffffff;
+                }
+            }
+
+            .title {
+                padding: 20rpx 20rpx 0;
+                font-size: 20rpx;
+                color: #333333;
+                line-height: 1.4;
+                height: 56rpx;
+            }
+
+            .price-box {
+                padding: 20rpx 20rpx 10rpx;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                right: 0;
+
+                .price {
+                    font-size: 16rpx;
+                    color: #333333;
+
+                    text {
+                        font-size: 24rpx;
+                        font-weight: 500;
+                    }
+                }
+
+                .stock {
+                    display: flex;
+                    align-items: center;
+
+                    .stock-num {
+                        font-size: 24rpx;
+                        color: #cccccc;
+                    }
+
+                    .stock-icon {
+                        width: 26rpx;
+                        height: 26rpx;
+                        margin-left: 6rpx;
+                    }
+                }
+            }
+        }
+    }
+
+    // 空状态
+    .empty-state {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        padding: 100rpx 0;
+
+        .empty-image {
+            width: 200rpx;
+            height: 200rpx;
+            margin-bottom: 20rpx;
+        }
+
+        .empty-text {
+            font-size: 28rpx;
+            color: #999;
+        }
+    }
+
+    // 公共类
+    .ellipsis {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/package/mine/coupon-detail.vue b/pages/users/coupon-detail.vue
similarity index 99%
rename from package/mine/coupon-detail.vue
rename to pages/users/coupon-detail.vue
index 516ae01..bc06761 100644
--- a/package/mine/coupon-detail.vue
+++ b/pages/users/coupon-detail.vue
@@ -137,7 +137,7 @@
 			return {
 				title: `快来领取${userInfo.nickname}分享的${this.pageData.num}赏币的${this.pageData.level_text}`,
 				imageUrl: this.pageData.level_img,
-				path: '/pages/user/index' +
+				path: '/pages/users/index' +
 					this.$c.qs({
 						ou_coupon_id: this.pageData.id
 					})
diff --git a/pages/user/coupon.vue b/pages/users/coupon.vue
similarity index 97%
rename from pages/user/coupon.vue
rename to pages/users/coupon.vue
index 9f825b7..c819a97 100644
--- a/pages/user/coupon.vue
+++ b/pages/users/coupon.vue
@@ -1,8 +1,4 @@
-<!--
- * @Date: 2023-06-30 09:27:33
- * @LastEditTime: 2023-12-21 11:05:07
- * @Description: content
--->
+
 <template>
 	<view class="content">
 		<uni-nav-bar left-icon="left" color="#000000" backgroundColor="transparent" :fixed="true" :statusBar="true"
@@ -106,7 +102,7 @@
 		methods: {
 			toUse(item) {
 				if (this.pageType == 1) {
-					this.$customRouter.navigateTo('/pages/shouye/index', {}, 'switchTab');
+					this.$customRouter.navigateTo('/pages/main/index', {}, 'switchTab');
 				}
 
 				if (this.pageType == 2) {
diff --git a/package/mine/equity.vue b/pages/users/equity.vue
similarity index 98%
rename from package/mine/equity.vue
rename to pages/users/equity.vue
index e1b7c9d..b97b6a4 100644
--- a/package/mine/equity.vue
+++ b/pages/users/equity.vue
@@ -33,7 +33,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="buy" @click="$c.to({ type: 3, url: '/pages/shouye/index' })">
+				<view class="buy" @click="$c.to({ type: 3, url: '/pages/main/index' })">
 					<text>去购买</text>
 				</view>
 
@@ -237,7 +237,7 @@
 				uni.setStorageSync('_qy_rule', this.pageData.danye_list)
 
 				this.$c.to({
-					url: '/package/mine/qy-rule'
+					url: '/pages/other/qy-rule'
 				})
 			},
 
@@ -337,12 +337,12 @@
 			toPage(id) {
 				if (id == 1) {
 					this.$c.to({
-						url: '/pages/user/tui-guang'
+						url: '/pages/users/tui-guang'
 					})
 				} else {
 					this.$c.to({
 						type: 3,
-						url: '/pages/shouye/index'
+						url: '/pages/main/index'
 					})
 				}
 			},
diff --git a/pages/user/fhjl.vue b/pages/users/fhjl.vue
similarity index 98%
rename from pages/user/fhjl.vue
rename to pages/users/fhjl.vue
index d9a09e7..f55a0fb 100644
--- a/pages/user/fhjl.vue
+++ b/pages/users/fhjl.vue
@@ -219,13 +219,13 @@ export default {
       })
     },
     toorder(e) {
-      this.$customRouter.navigateTo('/pages/shouye/detail', {
+      this.$customRouter.navigateTo('/pages/main/detail', {
         goods_id: e,
         goods_num: 1
       })
     },
     towuliu(e) {
-      this.$customRouter.navigateTo('/pages/shouye/wuliu_detail', { id: e })
+      this.$customRouter.navigateTo('/pages/main/wuliu_detail', { id: e })
     },
     getlist(v) {
       this.show = v
diff --git a/pages/user/hsjl.vue b/pages/users/hsjl.vue
similarity index 100%
rename from pages/user/hsjl.vue
rename to pages/users/hsjl.vue
diff --git a/pages/user/index.vue b/pages/users/index.vue
similarity index 94%
rename from pages/user/index.vue
rename to pages/users/index.vue
index 23d1475..69532b3 100644
--- a/pages/user/index.vue
+++ b/pages/users/index.vue
@@ -23,7 +23,7 @@
 			</view>
 
 			<view v-if="userinfo && getIsCheck()" class="lv-box align-center justify-between"
-				@click="$c.to({ url: '/package/mine/equity' })">
+				@click="$c.to({ url: '/pages/users/equity' })">
 				<text class="lv-box-dengji">LV.{{ userinfo.quan_yi_level.level }}</text>
 				<view class="lv-box-ouqi column">
 					<text>
@@ -37,7 +37,7 @@
 							:strokeWidth="3"></cmd-progress>
 					</view>
 				</view>
-				<text class="lv-box-detail center" @click="$c.to({ url: '/package/mine/equity' })">查看详情</text>
+				<text class="lv-box-detail center" @click="$c.to({ url: '/pages/users/equity' })">查看详情</text>
 				<image style="width: 206rpx; height: 206rpx; position: absolute; top: -40rpx; right: 8rpx;"
 					:src="$img1('my/ou.png')">
 				</image>
@@ -51,22 +51,22 @@
 
 		<view v-if="getIsCheck('user_money')" class="money-card">
 			<view class="other-num">
-				<view v-if="zuanshi" class="other-item" @click="$c.to({ url: '/pages/user/yetx' })">
+				<view v-if="zuanshi" class="other-item" @click="$c.to({ url: '/pages/users/yetx' })">
 					<view class="title">{{ $config.getAppSetting('balance_name') }}</view>
 					<view class="flex row">
 						<view class="num" style="">{{ formatNumber(userinfo.money) }}</view>
-						<image @click.stop="$c.to({ url: '/pages/user/recharge-page' })"
+						<image @click.stop="$c.to({ url: '/pages/users/recharge-page' })"
 							:src="$img1('my/ic_recharge.png')" style="width: 83rpx; height: 48rpx; margin-left: 10rpx;"
 							mode=""></image>
 					</view>
 				</view>
-				<view class="other-item" @click="$c.to({ url: '/pages/user/bi_jl' })">
+				<view class="other-item" @click="$c.to({ url: '/pages/users/bi_jl' })">
 					<view class="title">{{ $config.getAppSetting('currency1_name') }}</view>
 					<view class="num" style="color: #333333;">{{ formatNumber(userinfo.integral) }}
 					</view>
 				</view>
 
-				<view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
+				<view class="other-item" @click="$c.to({ url: '/pages/users/jf_jl' })">
 					<view class="title">{{ $config.getAppSetting('currency2_name') }}</view>
 					<view class="num" style="color: #333333;">{{ formatNumber(userinfo.money2) }}
 					</view>
@@ -187,7 +187,7 @@ export default {
 		return {
 			imageUrl: imageUrl,
 			title: "友达赏，正版潮玩手办一番赏",
-			path: '/pages/user/index?pid=' + uni.getStorageSync('userinfo').ID
+			path: '/pages/users/index?pid=' + uni.getStorageSync('userinfo').ID
 		}
 	},
 	onShow() {
@@ -209,13 +209,13 @@ export default {
 		toChange() {
 			var user = uni.getStorageSync('userinfo');
 			if (user == null || user == "" || this.userinfo == '') {
-				uni.setStorageSync('redirect', '/pages/user/index');
-				this.$c.nav("/pages/user/login")
+				uni.setStorageSync('redirect', '/pages/users/index');
+				this.$c.nav("/pages/users/login")
 				return;
 			}
 
 			this.$c.to({
-				url: '/pages/user/change'
+				url: '/pages/users/change'
 			})
 		},
 		getIsCheck(tag) {
@@ -238,7 +238,7 @@ export default {
 							duration: 500,
 							success: () => {
 								this.$c.to({
-									url: '/package/mine/coupon-detail',
+									url: '/pages/users/coupon-detail',
 									query: {
 										id: coupon_id
 									}
@@ -247,7 +247,7 @@ export default {
 						})
 					} else if (res.status == 2222) {
 						this.$c.to({
-							url: '/package/mine/coupon-detail',
+							url: '/pages/users/coupon-detail',
 							query: {
 								id: coupon_id
 							}
@@ -294,17 +294,17 @@ export default {
 				fail: error => { }
 			})
 		},
- 
+
 		getlist(index) {
 			this.show = index
 		},
 		todetail(a) {
 			if (a.type == 2) {
-				this.$customRouter.navigateTo('/pages/shouye/detail_wuxian', {
+				this.$customRouter.navigateTo('/pages/main/detail_wuxian', {
 					goods_id: a.goods_id
 				});
 			} else {
-				this.$customRouter.navigateTo('/pages/shouye/detail', {
+				this.$customRouter.navigateTo('/pages/main/detail', {
 					goods_id: a.goods_id,
 					goods_num: a.num
 				});
@@ -334,12 +334,12 @@ export default {
 		toPage(id) {
 			if (id == 1) {
 				this.$c.to({
-					url: '/pages/user/tui-guang'
+					url: '/pages/users/tui-guang'
 				})
 			} else {
 				this.$c.to({
 					type: 3,
-					url: '/pages/shouye/index'
+					url: '/pages/main/index'
 				})
 			}
 		},
diff --git a/pages/user/jf_jl.vue b/pages/users/jf_jl.vue
similarity index 100%
rename from pages/user/jf_jl.vue
rename to pages/users/jf_jl.vue
diff --git a/pages/users/login.vue b/pages/users/login.vue
new file mode 100644
index 0000000..a16c760
--- /dev/null
+++ b/pages/users/login.vue
@@ -0,0 +1,562 @@
+<template>
+	<view class="all">
+		<!-- 小程序登录界面 -->
+		<view v-if="isCanUse && isMpWeixin">
+			<view>
+				<view class="header">
+					<image :src="$img1('common/logo.png?x=1')"></image>
+				</view>
+				<view class="content">
+					<view>申请获取以下权限</view>
+					<text style="color: #979797;">获得你的公开信息</text>
+				</view>
+
+				<view @click="isAgree = !isAgree" class="agree">
+					<view class="icon">
+						<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
+
+						<image v-else :src="$img1('common/check.png')" lazy-load></image>
+					</view>
+
+					<view class="agree-r">
+						我已阅读并同意
+						<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', { type: 4 })">
+							《用户协议》
+						</text>
+						和
+						<text @click.stop="$customRouter.navigateTo('/pages/guize/guize', { type: 5 })">
+							《隐私政策》
+						</text>
+					</view>
+				</view>
+
+				<view class="btn-list">
+					<view @click="navigateBack()" class="cancel">
+						拒绝
+					</view>
+					<button class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
+						@click="getUserProfile">
+						<text>授权登录</text>
+					</button>
+				</view>
+				<view style="font-size: 20rpx;color: #979797;position: fixed;bottom: 20rpx;right:47rpx;">version:v1.0.3
+				</view>
+			</view>
+		</view>
+
+		<!-- H5手机号登录界面 -->
+		<view v-if="isCanUse && !isMpWeixin">
+			<view>
+				<view class="header">
+					<image :src="$img1('common/logo.png?x=1')"></image>
+				</view>
+
+				<view class="h5-login-form">
+					<view class="input-item">
+						<input type="number" v-model="mobile" placeholder="请输入手机号" maxlength="11" class="phone-input" />
+					</view>
+
+					<view class="input-item code-item">
+						<input type="number" v-model="verifyCode" placeholder="请输入验证码" maxlength="6"
+							class="code-input" />
+						<view @click="sendVerifyCode" class="send-code-btn" :class="{ disabled: countdown > 0 }">
+							{{ countdown > 0 ? countdown + '秒' : '发送验证码' }}
+						</view>
+					</view>
+
+					<view @click="isAgree = !isAgree" class="agree">
+						<view class="icon">
+							<image v-if="isAgree" :src="$img1('common/check_act.png')" lazy-load></image>
+							<image v-else :src="$img1('common/check.png')" lazy-load></image>
+						</view>
+						<view class="agree-r">
+							我已阅读并同意
+							<text @click.stop="$platform.getUserAgreement()">
+								《用户协议》
+							</text>
+							和
+							<text @click.stop="$platform.getPrivacyAgreement()">
+								《隐私政策》
+							</text>
+						</view>
+					</view>
+
+					<view class="btn-list">
+						<view @click="navigateBack()" class="cancel">
+							拒绝
+						</view>
+						<view class="bottom center" @click="phoneLogin">
+							<text>登录</text>
+						</view>
+					</view>
+				</view>
+
+				<view style="font-size: 20rpx;color: #979797;position: fixed;bottom: 20rpx;right:47rpx;">version:v1.0.3
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			z_imgPath: this.$z_img2,
+			SessionKey: '',
+			OpenId: '',
+			nickName: null,
+			avatarUrl: null,
+			isCanUse: uni.getStorageSync('isCanUse') || true, //默认为true
+			code: '',
+			isAgree: false,
+			// H5手机号登录相关数据
+			isMpWeixin: false, // 是否为小程序环境
+			mobile: '', // 手机号
+			verifyCode: '', // 验证码
+			countdown: 0, // 发送验证码倒计时
+			timer: null, // 倒计时定时器
+			codeSent: false // 是否已发送验证码
+		}
+	},
+	onLoad(option) {
+		// 判断当前环境
+		// #ifdef MP
+		this.isMpWeixin = true;
+		// #endif
+
+		//默认加载
+		if (option != null) {
+			if (option.code != null) {
+
+			}
+		}
+	},
+	onUnload() {
+		// 清除定时器
+		if (this.timer) {
+			clearInterval(this.timer);
+			this.timer = null;
+		}
+	},
+	methods: {
+		//返回上一页
+		navigateBack() {
+			uni.navigateBack({
+				delta: 1,
+				fail: () => {
+					// 如果没有上一页，则跳转到首页
+					this.$customRouter.navigateTo('/pages/main/index', {}, 'switchTab');
+				}
+			});
+		},
+		//第一授权获取用户信息===》按钮触发
+		getUserProfile(e) {
+			if (!this.isAgree) {
+				return uni.showToast({
+					title: '请阅读并同意《用户协议》和《隐私政策》',
+					icon: 'none'
+				});
+			}
+
+			// #ifdef MP
+			this.wxUserProfile();
+			// #endif
+		},
+		// 发送验证码
+		async sendVerifyCode() {
+			// 如果正在倒计时，不允许重复发送
+			if (this.countdown > 0) {
+				return;
+			}
+
+			// 检查是否同意协议
+			if (!this.isAgree) {
+				return uni.showToast({
+					title: '请阅读并同意《用户协议》和《隐私政策》',
+					icon: 'none'
+				});
+			}
+
+			// 验证手机号
+			if (!this.mobile || !/^1\d{10}$/.test(this.mobile)) {
+				return uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+			}
+
+			// 发送验证码请求
+			try {
+				const res = await this.$request.post('v2/account/sendSms', {
+					phone: this.mobile
+				});
+
+				if (res.status == 1) {
+					uni.showToast({
+						title: '验证码已发送',
+						icon: 'none'
+					});
+
+					// 标记已发送验证码（仅当前会话有效）
+					this.codeSent = true;
+
+					// 开始倒计时，使用接口返回的时间
+					this.countdown = res.data || 60; // 使用返回的秒数，默认60秒
+					this.timer = setInterval(() => {
+						this.countdown--;
+						if (this.countdown <= 0) {
+							clearInterval(this.timer);
+							this.timer = null;
+						}
+					}, 1000);
+				} else {
+					uni.showToast({
+						title: res.msg || '发送失败，请稍后重试',
+						icon: 'none'
+					});
+				}
+			} catch (error) {
+				uni.showToast({
+					title: '发送验证码失败，请稍后重试',
+					icon: 'none'
+				});
+				console.error('发送验证码失败:', error);
+			}
+		},
+		// 手机号登录
+		async phoneLogin() {
+			// 验证表单
+			if (!this.isAgree) {
+				return uni.showToast({
+					title: '请阅读并同意《用户协议》和《隐私政策》',
+					icon: 'none'
+				});
+			}
+
+			if (!this.mobile || !/^1\d{10}$/.test(this.mobile)) {
+				return uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+			}
+
+			if (!this.verifyCode) {
+				return uni.showToast({
+					title: '请输入验证码',
+					icon: 'none'
+				});
+			}
+
+
+			// 发送登录请求
+			try {
+				const res = await this.$request.post('mobileLogin', {
+					mobile: this.mobile,
+					code: this.verifyCode,
+					pid: uni.getStorageSync('pid')
+				});
+
+				if (res.status == 1) {
+					uni.setStorageSync('token', res.data);
+					this.$c.msg("登录成功");
+
+					// 检查重定向URL
+					const redirectUrl = uni.getStorageSync('redirect');
+
+					if (redirectUrl) {
+						// 清除重定向信息
+						uni.removeStorageSync('redirect');
+						// 使用公共方法处理重定向
+						this.handleRedirect(redirectUrl);
+					} else {
+						// 无重定向页面，检查是否需要绑定手机号
+						setTimeout(() => {
+							this.getdata();
+						}, 1000);
+					}
+				} else {
+					this.$c.msg("登录失败!" + res.msg);
+				}
+			} catch (error) {
+				// this.$c.msg("登录请求失败，请稍后重试");
+				console.error('登录失败:', error);
+			}
+		},
+		/**
+		 * 处理登录成功后的重定向逻辑
+		 * @param {String} redirectUrl 重定向URL
+		 */
+		handleRedirect(redirectUrl) {
+			let that = this;
+
+			// 获取当前页面栈
+			const pages = getCurrentPages();
+
+			// 检查是否有上一页，以及redirect URL是否与上一页相同
+			if (pages.length > 1) {
+				const prevPage = pages[pages.length - 2];
+				// 构建完整的上一页路径(带参数)
+				let prevPageUrl = '/' + prevPage.route;
+				if (prevPage.options && Object.keys(prevPage.options).length > 0) {
+					const paramStr = Object.keys(prevPage.options)
+						.map(key => `${key}=${prevPage.options[key]}`)
+						.join('&');
+					prevPageUrl += '?' + paramStr;
+				}
+
+				// 比较redirect URL和上一页URL
+				const redirectUrlPath = redirectUrl.split('?')[0];
+				const prevPageUrlPath = prevPageUrl.split('?')[0];
+
+				if (redirectUrlPath === prevPageUrlPath) {
+					// 如果路径相同，直接返回上一页
+					console.log('重定向URL与上一页相同，直接返回');
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1000);
+					return true;
+				}
+			}
+
+			// 重定向到指定URL
+			setTimeout(() => {
+				that.$customRouter.navigateTo(redirectUrl).catch(err => {
+					console.error('重定向跳转失败:', err)
+					// 失败时跳转到首页
+					that.$customRouter.navigateTo('/pages/users/index')
+				})
+			}, 1000);
+
+			return true;
+		},
+		async wxUserProfile() {
+			try {
+				const profileRes = await new Promise((resolve, reject) => {
+					uni.getUserProfile({
+						desc: '用于向用户发送商品',
+						lang: 'zh_CN',
+						success: resolve,
+						fail: reject,
+						complete: (e) => {
+							console.log(e, '用于向用户发送商品');
+						}
+					});
+				});
+
+				try {
+					const loginRes = await new Promise((resolve, reject) => {
+						uni.login({
+							provider: 'weixin',
+							success: resolve,
+							fail: (e) => {
+								this.$c.msg("登录失败，网络错误！" + e.msg);
+								console.log(e, '登录失败', e);
+								reject(e);
+							},
+							complete: (e) => {
+								console.log(e, '登录');
+							}
+						});
+					});
+
+					try {
+						const res = await this.$request.post('login', {
+							code: loginRes.code,
+							nickname: '',
+							headimg: '',
+							pid: uni.getStorageSync('pid')
+						});
+						console.log(res, '登录成功');
+
+						if (res.status == 1) {
+							uni.setStorageSync('token', res.data);
+							this.$c.msg("登录成功");
+
+							// 检查重定向URL
+							const redirectUrl = uni.getStorageSync('redirect');
+
+							if (redirectUrl) {
+								// 清除重定向信息
+								uni.removeStorageSync('redirect');
+
+								// 使用公共方法处理重定向
+								this.handleRedirect(redirectUrl);
+							} else {
+								// 无重定向页面，检查是否需要绑定手机号
+								setTimeout(() => {
+									this.getdata();
+								}, 1000);
+							}
+						} else {
+							this.$c.msg("登录失败!" + res.msg);
+						}
+					} catch (error) {
+						console.error('请求登录失败:', error);
+					}
+				} catch (error) {
+					console.error('微信登录失败:', error);
+				}
+			} catch (error) {
+				this.$c.msg("登录失败,申请获取微信用户数据失败");
+				console.log(error, '获取微信用户数据失败');
+			}
+		},
+		async getdata() {
+			try {
+				const res = await this.$request.post('user');
+				if (res.status == 1 && res.data.userinfo != null && res.data.userinfo.mobile_is == 0) {
+					console.log("判断用户有没有手机号", res.data.userinfo.mobile_is);
+					// 使用新的路由守卫方法跳转到绑定页面
+					this.$customRouter.navigateTo('/pages/users/bangding', {}, 'navigateTo');
+				} else {
+					// 使用新的路由守卫方法跳转到用户首页
+					this.$customRouter.navigateTo('/pages/users/index', {}, 'navigateTo');
+				}
+			} catch (error) {
+				console.error('获取用户数据失败:', error);
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+.all {
+	min-height: 100vh;
+	background-color: #FFFFFF;
+	// background: url($imgurl+'common/pageBg1.png') no-repeat 0 0 / 100% auto;
+}
+
+.header {
+	margin: 0 0 90rpx 50rpx;
+	padding: 90rpx 0 0;
+	border-bottom: 1px solid #E8E8E8;
+	text-align: center;
+	width: 650rpx;
+	height: 300rpx;
+	line-height: 450rpx;
+}
+
+.header image {
+	width: 200rpx;
+	height: 200rpx;
+	border-radius: 50%;
+}
+
+.content {
+	margin-left: 50rpx;
+	margin-bottom: 90rpx;
+	color: #333333;
+}
+
+.content text {
+	display: block;
+	margin-top: 28rpx;
+}
+
+// H5登录表单样式
+.h5-login-form {
+	padding: 0 50rpx;
+
+	.input-item {
+		height: 90rpx;
+		border-bottom: 1px solid #E8E8E8;
+		margin-bottom: 40rpx;
+
+		input {
+			height: 100%;
+			width: 100%;
+			font-size: 28rpx;
+		}
+	}
+
+	.code-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.code-input {
+			flex: 1;
+		}
+
+		.send-code-btn {
+			width: 200rpx;
+			height: 70rpx;
+			background-color: #333333;
+			color: #CDEF27;
+			font-size: 24rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 12rpx;
+
+			&.disabled {
+				background-color: #cccccc;
+				color: #ffffff;
+			}
+		}
+	}
+}
+
+.agree {
+	display: flex;
+	padding: 0 50rpx;
+	margin: 40rpx 0;
+
+	.icon {
+		width: 32rpx;
+		height: 32rpx;
+	}
+
+	.agree-r {
+		flex: 1;
+		word-wrap: break-word;
+		word-break: break-all;
+		padding-left: 20rpx;
+		line-height: 32rpx;
+
+		font-size: 20rpx;
+		color: #999999;
+
+		text {
+			color: #333333;
+		}
+	}
+}
+
+.btn-list {
+	display: flex;
+	justify-content: space-evenly;
+	padding: 50rpx 0 0;
+
+	.cancel {
+		width: 200rpx;
+		height: 80rpx;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+		color: #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #CDEF27;
+		// filter: grayscale(1);
+	}
+
+	.bottom {
+		background: #333333;
+		margin: 0;
+		width: 416rpx;
+		height: 80rpx;
+		text-align: center;
+		box-sizing: border-box;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+		color: #CDEF27;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/myCa.vue b/pages/users/myCa.vue
similarity index 100%
rename from pages/user/myCa.vue
rename to pages/users/myCa.vue
diff --git a/pages/user/my_coupon.vue b/pages/users/my_coupon.vue
similarity index 99%
rename from pages/user/my_coupon.vue
rename to pages/users/my_coupon.vue
index 31232af..d64f1b6 100644
--- a/pages/user/my_coupon.vue
+++ b/pages/users/my_coupon.vue
@@ -166,7 +166,7 @@
 			return {
 				title: `快来领取${userInfo.nickname}分享的${item.num}赏币的${item.title}`,
 				imageUrl: item.level_img,
-				path: '/pages/user/index' +
+				path: '/pages/users/index' +
 					this.$c.qs({
 						ou_coupon_id: item.id
 					})
@@ -189,7 +189,7 @@
 				var data = {
 					title: `快来领取${userInfo.nickname}分享的${item.num}赏币的${item.title}`,
 					imageUrl: item.level_img,
-					path: '/pages/user/index' +
+					path: '/pages/users/index' +
 						this.$c.qs({
 							ou_coupon_id: item.id
 						})
@@ -349,7 +349,7 @@
 				}
 
 				this.$c.to({
-					url: '/package/mine/coupon-detail',
+					url: '/pages/users/coupon-detail',
 					query: {
 						id: item.id
 					}
diff --git a/pages/user/order.vue b/pages/users/order.vue
similarity index 100%
rename from pages/user/order.vue
rename to pages/users/order.vue
diff --git a/pages/user/recharge-page.vue b/pages/users/recharge-page.vue
similarity index 100%
rename from pages/user/recharge-page.vue
rename to pages/users/recharge-page.vue
diff --git a/pages/user/tui-guang.vue b/pages/users/tui-guang.vue
similarity index 98%
rename from pages/user/tui-guang.vue
rename to pages/users/tui-guang.vue
index 73ca99c..b1982fc 100644
--- a/pages/user/tui-guang.vue
+++ b/pages/users/tui-guang.vue
@@ -149,7 +149,7 @@ export default {
 		return {
 			imageUrl: imageUrl,
 			title: "友达上线,来就送！",
-			path: '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
+			path: '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID
 		}
 	},
 	onLoad() {
@@ -179,7 +179,7 @@ export default {
 	methods: {
 		yaoaing() {
 			uni.setClipboardData({
-				data: window.location.origin + '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID
+				data: window.location.origin + '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID
 			});
 			this.$c.msg("链接已复制，快去分享吧~")
 		},
@@ -214,7 +214,7 @@ export default {
 		},
 		fenxiang() {
 			var image = this.$baseUrl + "/storage/topic/20240617/30a73c0d5061f700a66f653deeb60f6d.jpg";
-			var path = '/pages/shouye/index?pid=' + uni.getStorageSync('userinfo').ID;
+			var path = '/pages/main/index?pid=' + uni.getStorageSync('userinfo').ID;
 			this.$c.$fenxiang('友达赏，正版潮玩手办一番赏', '', path, image);
 
 		},
diff --git a/pages/user/vip.vue b/pages/users/vip.vue
similarity index 100%
rename from pages/user/vip.vue
rename to pages/users/vip.vue
diff --git a/pages/user/wuliu_detail.vue b/pages/users/wuliu_detail.vue
similarity index 100%
rename from pages/user/wuliu_detail.vue
rename to pages/users/wuliu_detail.vue
diff --git a/pages/user/xfjl.vue b/pages/users/xfjl.vue
similarity index 100%
rename from pages/user/xfjl.vue
rename to pages/users/xfjl.vue
diff --git a/pages/user/yetx.vue b/pages/users/yetx.vue
similarity index 100%
rename from pages/user/yetx.vue
rename to pages/users/yetx.vue
diff --git a/static/app-plus/no-data.png b/static/app-plus/no-data.png
new file mode 100644
index 0000000..96dd0ed
Binary files /dev/null and b/static/app-plus/no-data.png differ
diff --git a/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue b/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue
index 89dedd3..9b454a8 100644
--- a/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue
+++ b/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.vue
@@ -35,7 +35,7 @@ export default {
 	computed: {
 		// 图标
 		icon() {
-			return '/static/common/kong.png'
+			return '/static/app-plus/no-data.png'
 			if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
 				return this.option.icon
 			} else{