From 5835447d35fd90f8200eae3387ddb6e3aed2a076 Mon Sep 17 00:00:00 2001
From: fan <1209452658@qq.com>
Date: Wed, 14 Jul 2021 18:40:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=8F=90=E4=BA=A42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |  4 ++
 components/navigation/navigation.vue | 17 +++++----
 pages/login/index.vue                |  6 +--
 pages/menu/My/index.vue              | 16 +++++---
 pages/menu/color/index.vue           | 11 ++----
 pages/menu/index/index.vue           |  4 +-
 pages/menu/promotion/index.vue       | 10 ++---
 pages/menu/recharge/index.css        | 35 +++++++++++++++++
 pages/menu/recharge/index.vue        | 57 ++++++++++++++++++++++++++--
 pages/menu/rule/index.vue            |  1 +
 pages/menu/rule/inviteRule/index.vue |  1 +
 pages/menu/withdrawl/index.vue       |  2 +-
 pages/register/index.vue             |  3 +-
 13 files changed, 129 insertions(+), 38 deletions(-)

diff --git a/App.vue b/App.vue
index 394ad50..6ba3e13 100644
--- a/App.vue
+++ b/App.vue
@@ -17,7 +17,11 @@
 </script>
 
 <style lang="scss">
+	.uni-btn-icon{
+		display: none;
+	}
 uni-tabbar {
+
         .uni-tabbar { // tab背景
 		    padding-top:28rpx;
 		     padding-bottom: 50rpx !important;
diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue
index 1e49ca1..b588047 100644
--- a/components/navigation/navigation.vue
+++ b/components/navigation/navigation.vue
@@ -25,15 +25,16 @@
 		},
 		methods: {
 		back(){
+
 				console.log('back')
-				history.back()
-				// uni.navigateBack()
-			uni.switchTab({
-				url:'../../pages/menu/promotion/index',
-				// url:'../../pages/menu/index/index',
-				// url:'../../pages/menu/My/index',
-			})
-		}
+				// #ifdef H5
+					history.back()
+				// #endif
+				
+				// #ifdef APP-PLUS	
+				uni.navigateBack()
+				// #endif
+				}	
 	},
 	}
 </script>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1a586e1..1a4316c 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -90,7 +90,7 @@
 	         const ticket= uni.getStorageSync('logInfo').data;
 	         console.log(ticket,7777777777777777777)
 	 // if(ticket !=  ''){
-		// 		uni.reLaunch({
+		// 		uni.navigateTo({
 		// 			url: '../menu/index/index'
 		// 		})
 
@@ -105,12 +105,12 @@
 
 			},
 			gores() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: './resetPassword/index'
 				})
 			},
 			goReg() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '../register/index'
 				})
 			},
diff --git a/pages/menu/My/index.vue b/pages/menu/My/index.vue
index 847987a..ba0c125 100644
--- a/pages/menu/My/index.vue
+++ b/pages/menu/My/index.vue
@@ -174,9 +174,13 @@
 				}
 				if (i == 2) {
 					console.log(this.androidUrl)
-					uni.navigateTo({
-						url: this.androidUrl
-					})
+					// #ifdef H5
+					window.location.href=this.androidUrl;
+					// #endif
+						// #ifdef APP-PLUS
+							plus.runtime.openURL(this.androidUrl);
+						// #endif
+		
 				}
 			},
 			changeName() {
@@ -227,7 +231,7 @@
 				
 			},
 			goRecharge() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '../recharge/index'
 				})
 			},
@@ -246,7 +250,7 @@
 						uni.showLoading({
 							title: 'loading'
 						})
-						if (res.data.success == true) {
+						if (res.success == true) {
 							uni.showToast({
 								title: 'Log out successfully',
 								icon: 'success',
@@ -255,7 +259,7 @@
 							uni.removeStorageSync('logInfo');
 							uni.removeStorageSync('ticket')
 							setTimeout(function() {
-								uni.reLaunch({
+								uni.navigateTo({
 									url: '../../login/index'
 								})
 							}, 2000)
diff --git a/pages/menu/color/index.vue b/pages/menu/color/index.vue
index 1ef9a9d..6a8cef0 100644
--- a/pages/menu/color/index.vue
+++ b/pages/menu/color/index.vue
@@ -786,13 +786,10 @@
 								}
 							
 								})
-							
-							setTimeout(function(){
-								location.reload();
-							},2000)
+
 						} else {
 							uni.showToast({
-								title: res.data.errMsg,
+								title: res.errMsg,
 								icon: 'none',
 								duration: 1500
 							})
@@ -880,7 +877,7 @@
 
 			},
 			goRule() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '../rule/index'
 				})
 			},
@@ -890,7 +887,7 @@
 
 			},
 			getSonValue() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '../recharge/index'
 				})
 			},
diff --git a/pages/menu/index/index.vue b/pages/menu/index/index.vue
index 1b84927..8e85fa2 100644
--- a/pages/menu/index/index.vue
+++ b/pages/menu/index/index.vue
@@ -73,13 +73,13 @@
 		},
 		methods: {
 			getSonValue(){
-					  uni.reLaunch({
+					  uni.navigateTo({
 					  	url:'../recharge/index'
 					  })
 			},
 			
 			goColor(){
-				uni.reLaunch({
+				uni.navigateTo({
 					url:'../color/index'
 				})
 			},
diff --git a/pages/menu/promotion/index.vue b/pages/menu/promotion/index.vue
index c7921bb..5319a1e 100644
--- a/pages/menu/promotion/index.vue
+++ b/pages/menu/promotion/index.vue
@@ -161,7 +161,7 @@
 					"tranAmt": this.tranAmt,
 				})
 				post.then(res => {
-						if (res != undefined) {
+						if (res) {
 							if (res.success == true) {
 								uni.showToast({
 									title: 'Commission successfully transferred out to balance',
@@ -170,7 +170,7 @@
 								})
 							} else {
 								uni.showToast({
-									title: res.data.errMsg,
+									title: res.errMsg,
 									icon: 'none',
 									duration: 1500
 								})
@@ -187,17 +187,17 @@
 
 			},
 			goProRe() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: './promotionRecord/index'
 				})
 			},
 			goBouns() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: './bounsRecord/index'
 				})
 			},
 			applyRecord() {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: './applyRecord/index'
 				})
 			},
diff --git a/pages/menu/recharge/index.css b/pages/menu/recharge/index.css
index 2a1bfcb..d864f42 100644
--- a/pages/menu/recharge/index.css
+++ b/pages/menu/recharge/index.css
@@ -159,4 +159,39 @@ display: flex;
 	font-size: 28rpx;
 	padding: 0;
 	color: rgb(149, 77, 227);
+}
+
+
+
+
+.invite-more{
+	width: 750rpx;
+height: 480rpx;
+background: #FFFFFF;
+border-radius: 48rpx 48rpx 0px 0px;
+position: fixed;
+bottom: 0;
+z-index: 9999;
+}
+.more-a{
+	text-transform: capitalize;
+	font-size: 32rpx;
+	color: #303133;
+	text-align: center;
+	line-height: 108rpx;
+}
+.invite-con{
+	padding: 24rpx 0;
+}
+.invite-con2{
+	background-color: #F5F7FA;
+}
+.msg-box-bg {
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 1001;
+ background-color: rgba(0,0,0,.5);
 }
\ No newline at end of file
diff --git a/pages/menu/recharge/index.vue b/pages/menu/recharge/index.vue
index d5e21d4..7056c36 100644
--- a/pages/menu/recharge/index.vue
+++ b/pages/menu/recharge/index.vue
@@ -2,7 +2,7 @@
 	<view class="content">
 		<navigation>
 			Recharge
-			<view class="bread" slot="bread">
+			<view class="bread" slot="bread" @click="invMore=true,msShow=true">
 				<image src="../../../static/promo/nav_icon_more@2x.png" mode=""></image>
 			</view>
 		</navigation>
@@ -87,6 +87,28 @@
 			 </view>
 	
 		</view>
+		
+		
+	<view class="invite-more" v-show="invMore">
+		<view class="invite-con">
+			<view class="more-a" @click="goRecod()">
+				recharge record
+			</view>
+			<view class="more-a" @click="goRerule()">
+				recharge rules
+			</view>
+		</view>
+		<view class="invite-con2">
+			<view class="more-a" @click="invMore=false,msShow=false">
+				cancel
+			</view>
+		</view>
+	</view>
+		<view class="msg-box-bg" v-show="msShow" @click="invMore=false,msShow=false,appl=false">
+		</view>
+		
+		
+		
 	</view>
 
 </template>
@@ -110,6 +132,9 @@
 				currencySymbol:'',
 				currentBalance:'',
 				userId:'',
+				invMore: false,
+				appl: false,
+				msShow: false,
 			}
 		},
 
@@ -161,6 +186,16 @@
 
 		},
 		methods: {
+			goRecod(){
+				uni.navigateTo({
+					url:'record/index'
+				})
+			},
+			goRerule(){
+				uni.navigateTo({
+					url:'./rechargeRule'
+				})
+			},
 			copyTextMethod() {
 				this.$copyText(this.copyText).then(res => {
 					uni.showToast({
@@ -228,9 +263,23 @@
 								 icon: 'success',
 								duration: 1500
 							})
-							setTimeout(function(){
-								location.reload()
-							},1000)
+                               //更新余额
+                               const post = api.withdrawConfig({
+                               	"ticket": uni.getStorageSync('logInfo').data,
+                               })
+                               post.then(res => {
+                               	if(res.data){
+                               		this.currentBalance=res.data.currentBalance;
+                               		uni.setStorage({
+                               			key: 'currentBalance',
+                               			data: this.currentBalance,
+                               			success: function() {
+                               				console.log('success')
+                               			}
+                               		});
+                               	}
+                               
+                               	})
 						}else{
 							uni.showToast({
 								title: 'Payment failed',
diff --git a/pages/menu/rule/index.vue b/pages/menu/rule/index.vue
index 68e3d47..611c2a8 100644
--- a/pages/menu/rule/index.vue
+++ b/pages/menu/rule/index.vue
@@ -13,6 +13,7 @@
 </template>
 
 <script>
+	import api from '@/utils/api'
 	import cont from "@/components/navigation/navigation.vue"
 	export default {
 		data() {
diff --git a/pages/menu/rule/inviteRule/index.vue b/pages/menu/rule/inviteRule/index.vue
index cbe8034..38d5ac9 100644
--- a/pages/menu/rule/inviteRule/index.vue
+++ b/pages/menu/rule/inviteRule/index.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script>
+	import api from '@/utils/api'
 	export default {
 		data() {
 			return {
diff --git a/pages/menu/withdrawl/index.vue b/pages/menu/withdrawl/index.vue
index 0c2f6c9..20b13b6 100644
--- a/pages/menu/withdrawl/index.vue
+++ b/pages/menu/withdrawl/index.vue
@@ -266,7 +266,7 @@
 									"ticket": uni.getStorageSync('logInfo').data,
 									// 'password': md5(this.password),
 									"tranAmt": this.tranAmt,
-									"ticket": uni.getStorageSync('MyInfo').data,
+									"ticket": uni.getStorageSync('logInfo').data,
 								})
 								post.then(res => {
 							console.log(res.data, '45464654646446');
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 35c6c89..66151ec 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -119,8 +119,6 @@
 			this.areacode = uni.getStorageSync('siteInfo').areaCode;
 		},
 		methods: {
-
-
 			codeChange(text) {
 				this.tips = text;
 			},
@@ -207,6 +205,7 @@
 			console.log();
 			console.log(this.imgcodeUrl)
 		},
+
 		regist() {
 			if (this.mobile == '') {
 				uni.showToast({