10.18

pages.json

@@ -202,7 +202,7 @@
             
         }
         ,{
-            "path" : "pages/promotion/promotion",
+            "path" : "pages/introduce/promotion",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "推广计划",
@@ -211,7 +211,7 @@
             
         }
         ,{
-            "path" : "pages/recharge/recharge",
+            "path" : "pages/jump/recharge",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "充值",
@@ -220,7 +220,7 @@
             
         }
         ,{
-            "path" : "pages/withdrawal/withdrawal",
+            "path" : "pages/jump/withdrawal",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "提幣",
@@ -229,7 +229,7 @@
             
         },
 		{
-		    "path" : "pages/game/game",
+		    "path" : "pages/introduce/game",
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "游戏举例",
@@ -238,7 +238,7 @@
 		    
 		}
         ,{
-            "path" : "pages/tabulation/tabulation",
+            "path" : "pages/jump/tabulation",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "会员列表",
@@ -247,7 +247,7 @@
             
         }
         ,{
-            "path" : "pages/transaction/transaction",
+            "path" : "pages/user/transaction",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "交易密码",
@@ -256,7 +256,7 @@
             
         }
         ,{
-            "path" : "pages/zyXingqing/zyXingqing",
+            "path" : "pages/myPledge/zyXingqing",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
@@ -265,7 +265,7 @@
             
         }
         ,{
-            "path" : "pages/history/history",
+            "path" : "pages/jump/history",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "历史列表",
@@ -274,7 +274,7 @@
             
         }
         ,{
-            "path" : "pages/details/details",
+            "path" : "pages/jump/details",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "他的粉絲",

pages/index/entertainment.vue

@@ -639,17 +639,17 @@
 			// 页面逻辑
 			nav() {
 				uni.navigateTo({
-					url: "/pages/history/history",
+					url: "/pages/jump/history",
 				});
 			},
 			navC() {
 				uni.navigateTo({
-					url: "/pages/recharge/recharge",
+					url: "/pages/jump/recharge",
 				});
 			},
 			navW() {
 				uni.navigateTo({
-					url: "/pages/transaction/transaction",
+					url: "/pages/user/transaction",
 				});
 			},
 		},
@@ -659,7 +659,6 @@
 <style lang="scss">
 	.all {
 		width: 750rpx;
-		/* height: 2500rpx; */
 		height: 100%;
 		padding-top: var(--status-bar-height);
 		padding-bottom: 30rpx;

pages/index/information.vue

@@ -79,12 +79,12 @@
 			},
 			navigatorT() {
 				uni.navigateTo({
-					url: '/pages/promotion/promotion'
+					url: '/pages/introduce/promotion'
 				})
 			},
 			navigatorY() {
 				uni.navigateTo({
-					url: '/pages/game/game'
+					url: '/pages/introduce/game'
 				})
 			},
 			navigatorH() {

pages/index/pledge.vue

@@ -99,7 +99,7 @@
 			},
 			nav() {
 				uni.navigateTo({
-					url: '/pages/zyXingqing/zyXingqing'
+					url: '/pages/myPledge/zyXingqing'
 				})
 			},
 			loadData(source) {

pages/index/user.vue

@@ -75,7 +75,7 @@
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
 			<!-- 额外添加 -->
-			<view class="user-list flex" @click="navTo('/pages/tabulation/tabulation')">
+			<view class="user-list flex" @click="navTo('/pages/jump/tabulation')">
 				<image src="../../static/shouye/liebiao.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b4')}}
@@ -96,7 +96,7 @@
 				</view>
 				<image src="../../static/icon/back.png" mode="scaleToFill" class="right-img"></image>
 			</view>
-			<view class="user-list flex" @click="navTo('/pages/transaction/transaction')">
+			<view class="user-list flex" @click="navTo('/pages/user/transaction')">
 				<image src="../../static/shouye/jiaoyi.png" mode="scaleToFill" class="left-img"></image>
 				<view class="item-name">
 					{{$t('user.b7')}}
@@ -202,12 +202,12 @@
 			},
 			navigatorT() {
 				uni.navigateTo({
-					url: '/pages/withdrawal/withdrawal'
+					url: '/pages/jump/withdrawal'
 				})
 			},
 			navigator() {
 				uni.navigateTo({
-					url: '/pages/recharge/recharge'
+					url: '/pages/jump/recharge'
 				})
 			},
 

pages/details/details.vue → pages/jump/details.vue

@@ -90,7 +90,6 @@
 .ima {
 	width: 13rpx;
 	height: 19rpx;
-	// background: #FFFFFF;
 	margin-top: 35rpx;
 	margin-left: 20rpx;
 }

pages/tabulation/tabulation.vue → pages/jump/tabulation.vue

@@ -60,7 +60,7 @@
 		methods: {
 			navX() {
 				uni.navigateTo({
-					url: '/pages/details/details'
+					url: '/pages/jump/details'
 				})
 			},
 		}

pages/user/shareQrCode.vue

@@ -32,13 +32,11 @@
 				
 			};
 		},
-	
 		onLoad() {
 			// this.test()
-			// this.getGame()
-			this.request()
+			this.getGame()
+			// this.request()
 		},
-		
 		//下拉刷新
 		onPullDownRefresh() {
 			let obj = this;
@@ -48,18 +46,17 @@
 				uni.stopPullDownRefresh(); //停止下拉刷新动画
 			}, 1000);
 		},
-		
 		methods: {
-			async request() {
-				try{
-					const res1 = await test();   //第一个异步函数
-					const res2 = await getGame();  //第二个异步函数
+			// async request() {
+			// 	try{
+			// 		const res1 = await test();   //第一个异步函数
+			// 		const res2 = await getGame();  //第二个异步函数
 					
-					console.log('11',res1);
-				}catch(error) {
-					console.log(error);
-				}
-			}
+			// 		console.log('11',res1);
+			// 	}catch(error) {
+			// 		console.log(error);
+			// 	}
+			// }
 			// async test() {
 			//   try {
 			//     const res = await test();
@@ -69,15 +66,15 @@
 			//   }
 			// },
 			
-			// // 互娱记录
-			// async getGame() {
-			//   try {
-			//     const res = await getGame();
-			//     console.log('12312', res);
-			//   } catch (error) {
-			//     console.error('请求出错', error);
-			//   }
-			// }
+			// 互娱记录
+			async getGame() {
+			  try {
+			    const res = await getGame();
+			    console.log('12312', res);
+			  } catch (error) {
+			    console.error('请求出错', error);
+			  }
+			}
 
 		}
 	};

pages/user/team.vue

@@ -9,11 +9,10 @@
 				<view class="header">{{$t('money.a1')}}</view>
 			</view>
 			<view class="content-bg">
-				<!-- <image src="../../static/yonghu/jf.png" mode=""></image> -->
 			</view>
 			<view class="money-box">
 				<view>{{$t('money.a2')}}</view>
-				<view class="money">{{userWallet}}U</view>
+				<view class="money">{{ yj || 0 }}</view>
 				
 			</view>
 			<!-- 数据代办 -->
@@ -121,7 +120,6 @@
 		},
 		data() {
 			return {
-				userWallet: 0, //余额 
 				userInfo: {},
 				yj: '',
 				height: '',
@@ -166,12 +164,6 @@
 			this.loadData();
 		},
 		methods: {
-			// 获取用户余额信息
-			getUserWallet() {
-				gameWallet().then((res) => {
-					this.userWallet = +res.data.back.USDT.money.money
-				})
-			},
 			getUserInfo() {
 				getUserInfo({}).then(({
 					data