Merge remote-tracking branch 'origin/master'

components/base/tabBar.vue

@@ -11,33 +11,20 @@
 				{{ $t(item.title) }}
 			</view>
 		</view>
+		
+		
+		<!-- 客服列表 -->
+		<serviceList :show="showService" @close="closeServiceList"></serviceList>
 	</view>
 </template>
-<!-- "tabBar": {
-		"backgroundColor": "white",
-		"selectedColor": "#cd0000",
-		"list": [
-			{
-				"selectedIconPath": "/static/tabbar/2.png",
-				"iconPath": "/static/tabbar/1.png",
-				"pagePath": "pages/home/home",
-				"text": "%tabbar.title.1%"
-			},{
-				"selectedIconPath": "/static/tabbar/4.png",
-				"iconPath": "/static/tabbar/3.png",
-				"pagePath": "pages/cart/cart",
-				"text": "%tabbar.title.2%"
-			},{
-				"selectedIconPath": "/static/tabbar/6.png",
-				"iconPath": "/static/tabbar/5.png",
-				"pagePath": "pages/order/order",
-				"text": "%tabbar.title.3%"
-			}
-		]
-	} -->
+
 <script>
+	import serviceList from '@/components/serviceList/serviceList.vue'
 	export default {
 		props : ['select'],
+		components : {
+			serviceList,
+		},
 		data() {
 			return {
 				// "list": [
@@ -83,17 +70,19 @@
 						"pagePath": "/pages/center/center",
 						"title": "tabbar.title.5"
 					}
-				]
+				],
+				showService: false,
+				serverList: [],
 			}
 		},
 		methods: {
 			toPath(item, index){
 				if(index == this.select){
-					return
+					return 
 				}
 				
 				if(!item.pagePath){
-					return
+					return this.revealServiceList()
 				}
 				
 				this.$play()
@@ -101,6 +90,17 @@
 					url: item.pagePath
 				})
 			},
+
+			//显示客服列表
+			revealServiceList() {
+				this.$play()
+				this.showService = true;
+			},			
+			//关闭客服列表
+			closeServiceList() {
+				this.$play()
+				this.showService = false;
+			},
 		}
 	}
 </script>

components/serviceList/serviceList.vue

@@ -17,13 +17,21 @@
 				type : Boolean,
 				default : false
 			},
-			serverList : {
-				type : Array,
-				default : function(){
-					return []
-				}
+			// serverList : {
+			// 	type : Array,
+			// 	default : function(){
+			// 		return []
+			// 	}
+			// }
+		},
+		data(){
+			return {
+				serverList : []
 			}
 		},
+		created(){
+			this.forgetPass()
+		},
 		methods : {
 			
 			//跳转客服网址
@@ -31,7 +39,16 @@
 				this.$play()
 				window.open(url)
 				this.$emit('close')
-			}
+			},
+			
+			//获取客服列表
+			forgetPass() {
+				this.request('forgetPass').then(res => {
+					if (res.code == 200) {
+						this.serverList = res.result
+					}
+				})
+			},
 		}
 	}
 </script>

locale/en.js

@@ -157,22 +157,26 @@ export default {
 			"title": "Withdrawal",
 			"account": "Account Amount US",
 			"unit": "USDT",
-			"withdraw-amount": "Withdrawal Amount",
-			"withdraw-descript": "Withdrawal will be transferred to cryptocurrency wallet",
-			"withdrawal-all": "Withdraw All",
-			"deposit-now": "Deposit Amount",
-			"pin": "Security PIN",
-			"submit": "Submit",
-			"noBalance": "Your balance is 0",
-			"successfulWithdrawal": "Successful withdrawal",
-			"insufficientBalance": "Insufficient balance",
-			"creditLimit": "The withdrawal amount must be greater than 0",
-			"payPassEmpty": "Please enter the withdrawal amount",
-			"warn": "Warning",
-			"warn-detail": "Since your funds are large and exceed the withdrawal amount of ordinary users, please consider upgrading your VIP level!",
-			"ok": "OK",
-			"address" : "Withdrawal address",
-			"addressEmpty" : "Please add address"
+			// "withdraw-amount": "Withdrawal Amount",
+			// "withdraw-descript": "Withdrawal will be transferred to cryptocurrency wallet",
+			// "withdrawal-all": "Withdraw All",
+			// "deposit-now": "Deposit Amount",
+			// "pin": "Security PIN",
+			// "submit": "Submit",
+			// "noBalance": "Your balance is 0",
+			// "successfulWithdrawal": "Successful withdrawal",
+			// "insufficientBalance": "Insufficient balance",
+			// "creditLimit": "The withdrawal amount must be greater than 0",
+			// "payPassEmpty": "Please enter the withdrawal amount",
+			// "warn": "Warning",
+			// "warn-detail": "Since your funds are large and exceed the withdrawal amount of ordinary users, please consider upgrading your VIP level!",
+			// "ok": "OK",
+			// "address" : "Withdrawal address",
+			// "addressEmpty" : "Please add address",
+			"payment_passwrod-placeholder" : "Please enter payment passwrod",
+			"payment_passwrod" : "Payment passwrod",
+			"Minimum" : "Minimum Withdrawal amount 1",
+			"Withdraw_amount" : "Withdraw amount",
 		},
 		"login": {
 			"username": "Username",

main.js

@@ -16,10 +16,6 @@ Vue.prototype.request = request
 
 import store from './store/index.js'
 
-import sTabbar from '@/components/base/tabBar.vue'
-
-Vue.component("sTabbar", sTabbar)
-
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 
@@ -27,6 +23,11 @@ import './plugin'
 
 import 'interceptor/interceptor.js'
 
+
+import sTabbar from '@/components/base/tabBar.vue'
+
+Vue.component("sTabbar", sTabbar)
+
 //后端返回数据格式过滤
 window.parseList = function(data) {
 	if (!data) {

pages/center/center.vue

@@ -227,19 +227,19 @@
 		<changeLanguage :show.sync="showLanguage" @close="closeLanguage"></changeLanguage>
 
 		<!-- 客服列表 -->
-		<serviceList :show="showService" :serverList="serverList" @close="closeServiceList"></serviceList>
+		<!-- <serviceList :show="showService" :serverList="serverList" @close="closeServiceList"></serviceList> -->
 	</view>
 </template>
 
 <script>
 	import changeLanguage from '@/components/changeLanguage/changeLanguage.vue'
-	import serviceList from '@/components/serviceList/serviceList.vue'
+	// import serviceList from '@/components/serviceList/serviceList.vue'
 
 	export default {
 		name: "center",
 		components: {
 			changeLanguage,
-			serviceList,
+			// serviceList,
 		},
 		data() {
 			return {

pages/modifyUser/modifyUser.vue

@@ -160,7 +160,7 @@
 					display: flex;
 					align-items: center;
 					
-					border-bottom: 1px solid #33333377;
+					border-bottom: 1px solid #33333333;
 					
 					.title{
 						color: $uni-text-color;

pages/withdraw/withdraw.vue

@@ -1,24 +1,46 @@
 <!-- 提现页面 -->
 <template>
 	<view class="withdraw bx">
-		<navbar :leftClick="leftClick" :title="$t('page.withdraw.title')"></navbar>
 
 		<!-- 用户余额信息 -->
 		<view class="user-money content">
-			<view class="title">{{ $t('page.purse.account') }}</view>
+			<view class="title info">{{ $t('page.center.account_balance') }}</view>
 			<view class="money">
 				<view class="money-unit">{{ $t('page.withdraw.unit') }}</view>
 				<view class="money-detail">{{ money }}</view>
 			</view>
 		</view>
 		
-		<view class="withdraw-amount content">
+		<view class="box content">
+			<view class="info">
+				<!-- Withdraw amount -->
+				{{ $t('page.withdraw.Withdraw_amount') }}
+			</view>
+			<view style="font-size: 50rpx;font-weight: 900;
+			padding: 30rpx 0;display: flex;align-items: center;
+			">
+				<text style="padding-right: 40rpx;">{{ $t('page.withdraw.unit') }}</text> <input type="text" />
+			</view>
+			<view class="info"
+			style="font-size: 22rpx;
+			border-top: 1px solid #99999944;
+			padding-top: 10rpx;">
+				<!-- Minimum Withdrawal amount 1 -->
+				{{ $t('page.withdraw.Minimum') }}
+			</view>
+		</view>
+		<view class="box content">
+			<view class="title info">{{ $t('page.withdraw.payment_passwrod') }}</view>
+			<input v-model="form.money" type="number" :placeholder="$t('page.withdraw.payment_passwrod-placeholder')"/>
+		</view>
+		
+		<!-- <view class="withdraw-amount content">
 			<view class="withdraw-title">{{ $t('page.withdraw.withdraw-amount')}}</view>
 			<view class="withdraw-content">{{ $t('page.withdraw.withdraw-descript')}}</view>
-		</view>
+		</view> -->
 		
 		<!-- 输入框组 -->
-		<view class="inputs content">
+		<!-- <view class="inputs content">
 			
 			<view class="input-item">
 				<view class="input-top">
@@ -37,16 +59,10 @@
 				<input v-model="form.money" type="number" :placeholder="$t('page.withdraw.deposit-now')"/>
 			</view>
 			
-		<!-- 	<view class="input-item">
-				<view class="input-top">
-					<view class="title">{{ $t('page.withdraw.pin') }}</view>
-				</view>
-				<input v-model="form.payPass" type="password"/>
-			</view> -->
-		</view>
+		</view> -->
 		
 		<!-- 提交按钮 -->
-		<view @click="withdraw" class="submit content">{{ $t('page.withdraw.submit') }}</view>
+		<view @click="withdraw" class="submit content">{{ $t('page.modifyUser.confirm') }}</view>
 		
 		<!-- 超出最大提现金额提示 -->
 		<view v-if="showModal" class="modal">
@@ -57,19 +73,15 @@
 			</view>
 		</view>
 		
-		<!-- 客服列表 -->
-		<serviceList :show="showService" :serverList="serverList" @close="closeServiceList"></serviceList>
+		
+		<sTabbar />
+		
 	</view>
 </template>
 
 <script>
-	import navbar from '@/components/base/m-navbar.vue'
-	import serviceList from '@/components/serviceList/serviceList.vue';
 
 	export default {
-		components: {
-			navbar
-		},
 		data() {
 			return {
 				money : '',
@@ -182,36 +194,57 @@
 	.withdraw {
 		width: 750rpx;
 		min-height: 100vh;
-		// background-color: black;
+		background-color: #f3f3f3;
 		margin: 0 auto;
-		// background-image: url('@/static/withdraw/bg.png');
 		background-size: 100%;
 		background-repeat: no-repeat;
 
 		.content {
-			width: 96%;
+			width: 94%;
 			margin: 0 auto;
 		}
+		
+		.box{
+			margin-top: 5rpx;
+			background-color: #fff;
+			box-sizing: border-box;
+			padding: 20rpx;
+			.info{
+				color: #999;
+				font-size: 26rpx;
+			}
+			.title{
+				font-size: 28rpx;
+				margin-bottom: 20rpx;
+			}
+		}
 
 		.user-money {
 			background: $uni-bg-color-app;
 			color: $uni-text-color-inverse;
 			margin: 20rpx auto 30rpx auto;
-			// border: 4rpx solid #D3EA5E;
-			padding: 60rpx 0rpx;
+			padding: 70rpx 0rpx;
 			font-size: 36rpx;
+			border-radius: 10rpx;
+			border-top-right-radius: 55rpx;
 		
-			.title,
+			.title{
+				padding-left: 40rpx;
+				margin-bottom: 40rpx;
+				font-size: 26rpx;
+				color: #999;
+			}
 			.money {
 				display: flex;
-				justify-content: center;
 				align-items: center;
 				height: 60rpx;
+				padding-left: 40rpx;
 		
 				.money-unit {
 					margin-right: 15rpx;
-					font-size: 28rpx;
+					font-size: 26rpx;
 					font-weight: bold;
+					margin-top: 15rpx;
 				}
 				
 				.money-detail{
@@ -286,7 +319,7 @@
 			align-items: center;
 			justify-content: center;
 			background: $uni-bg-color-app;
-			border-radius: 10rpx;
+			border-radius: 40rpx;
 			font-size: 40rpx;
 			font-weight: bold;
 			margin-top: 30rpx;