From 67585c6a6119e7881f89ff3fc51874f943a4b7a7 Mon Sep 17 00:00:00 2001
From: j1ack <1209452658@qq.com>
Date: Fri, 2 Sep 2022 19:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/KeyValueRow/KeyValueRow.vue        |   8 +-
 .../entrustOrderList/entrustOrderList.vue     |  23 +-
 .../language-popups/language-popups.vue       |   7 +-
 components/transaction/transaction.vue        |   4 +-
 pages/charity/details.vue                     |   4 +-
 pages/charity/index.vue                       |   8 +
 pages/home/index.vue                          |  14 +-
 pages/login/forget.vue                        |   2 +-
 pages/me/index.vue                            |  21 +-
 pages/me/inviteFriends.vue                    |  38 +++-
 pages/me/myTeam.vue                           |  12 +-
 pages/me/transfer.vue                         |  70 ++++--
 pages/me/walletHistory.vue                    |  16 +-
 pages/mine/mine.vue                           |  13 +-
 pages/mine/mineDetails.vue                    |   2 +-
 pages/recharge/recharge.vue                   | 211 ++++++++++--------
 pages/recharge/rechargeRecord.vue             |   3 +-
 pages/subscription/details.vue                |  22 +-
 pages/subscription/index.vue                  |  64 +++---
 pages/withdrawal/addAddress.vue               |  46 +++-
 pages/withdrawal/chooseAddress.vue            |  21 +-
 pages/withdrawal/withdrawal.vue               |  30 ++-
 pages/withdrawal/withdrawalRecord.vue         |  16 +-
 utils/language/en_US.js                       |  14 +-
 utils/language/vi_VN.js                       |   9 +-
 utils/language/zh_TW.js                       |  11 +-
 26 files changed, 457 insertions(+), 232 deletions(-)

diff --git a/components/KeyValueRow/KeyValueRow.vue b/components/KeyValueRow/KeyValueRow.vue
index f954e5a..aa91bf9 100644
--- a/components/KeyValueRow/KeyValueRow.vue
+++ b/components/KeyValueRow/KeyValueRow.vue
@@ -7,7 +7,7 @@
         <view class="keyName"
             :style="{ color: leftColor, fontSize: size || leftSize, lineHeight: lineHeight || lineHeightValue }">{{
                     keyName
-            }} </view>
+            }} </view> <text v-if="isBr"><br></text>
         <view class="value"
             :style="{ color: rightColor, fontSize: size || rightSize, lineHeight: lineHeight || lineHeightValue }">{{
                     value
@@ -66,6 +66,12 @@ export default {
             default() {
                 return ''
             }
+        },
+		isBr: {
+            type: Boolean,
+            default() {
+                return false
+            }
         },
     },
     data() {
diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index 3120871..804fb29 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -54,7 +54,8 @@
 							<view class="value" style="color:#00E8A2;" v-show="type === 1" @click="getStopLimit(item)">
 								Stop/Limit</view>
 							<view class="title">{{ i18n.ExpectProfit }}</view>
-							<view class="value" v-show="type === 1" :style="parseFloat(getItem(item.direction=='buy'?(marketDetail.close-item.openedPrice)*item.hand:(item.openedPrice-marketDetail.close)*item.hand))>=0?'color:#00E8A2':'color:#F4506A'">
+							<view class="value" v-show="type === 1"
+								:style="parseFloat(getItem(item.direction=='buy'?(marketDetail.close-item.openedPrice)*item.hand:(item.openedPrice-marketDetail.close)*item.hand))>=0?'color:#00E8A2':'color:#F4506A'">
 								{{getItem(item.direction=='buy'?(marketDetail.close-item.openedPrice)*item.hand:(item.openedPrice-marketDetail.close)*item.hand)}}
 							</view>
 							<view class="value" style="color:#00E8A2;" v-show="type === 2">0</view>
@@ -66,14 +67,17 @@
 							<view class="title">{{ i18n.status }}</view>
 							<view class="value">{{item.status}}</view>
 							<view class="title">{{ i18n.PL }}</view>
-							<view class="value" :style="item.profitAmount-item.fee>=0?'color:#00E8A2;':'color:#F4506A'">{{item.profitAmount-item.fee}}</view>
+							<view class="value" :style="item.profitAmount-item.fee>=0?'color:#00E8A2;':'color:#F4506A'">
+								{{item.profitAmount-item.fee}}</view>
 						</view>
 						<!-- Revoked -->
 						<view class="right" v-show="type === 3">
 							<view class="title">{{ i18n.status }}</view>
 							<view class="value" style="color:#F4506A;">{{item.status}}</view>
 							<view class="title">{{ i18n.PL }}</view>
-							<view class="value" style="color:#00E8A2;"><!-- {{item.currentPl}} --> 0</view>
+							<view class="value" style="color:#00E8A2;">
+								<!-- {{item.currentPl}} --> 0
+							</view>
 						</view>
 					</view>
 				</view>
@@ -211,6 +215,14 @@
 		mounted() {
 			this.getContractOrderList()
 		},
+		//全局事件在组件实例创建完成定义
+		created() {
+			uni.$on('upData', num => {
+				if(num){
+					this.getContractOrderList()
+				}
+			})
+		},
 		onHide() {
 			clearTimeout(timer2);
 			clearInterval(timer2);
@@ -396,13 +408,16 @@
 
 <style scoped lang="scss">
 	/deep/ .u-empty {
-	    top: 500% !important;
+		top: 500% !important;
 	}
+
 	/deep/ .u-modal__content__text {
 		color: #96959E !important;
 	}
+
 	.entrustOrderList {
 		position: relative;
+
 		.tab {
 			display: flex;
 			background: #211F32;
diff --git a/components/language-popups/language-popups.vue b/components/language-popups/language-popups.vue
index 681d208..17a0b6a 100644
--- a/components/language-popups/language-popups.vue
+++ b/components/language-popups/language-popups.vue
@@ -1,5 +1,10 @@
 <template>
-	<view class="mask" :class="!show ? '' : 'mask-show'" @tap="tapMask">
+		<!-- #ifdef APP-PLUS -->
+		<view class="mask" :class="!show ? '' : 'mask-show'" @tap="tapMask">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+		<view class="mask" :class="!show ? '' : 'mask-show'" @tap="tapMask" style="top: 100rpx;">
+				<!-- #endif -->
 		<view class="popups">
 			<view v-for="(item, index) in popData" :key="index" @tap.stop="tapItem(item)" class="item">
 				{{ item.title }}
diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue
index 3d6c4cd..51d4bcd 100644
--- a/components/transaction/transaction.vue
+++ b/components/transaction/transaction.vue
@@ -188,7 +188,9 @@
 						title: this.$t("markets").Succeeded,
 						icon: 'success',
 						duration: 1500
-					})
+					})
+					//使用uni.$emit触发全局事件，并传参 触发这个给兄弟组件 刷新页面下面的订单列表
+					uni.$emit("upData",true)
 				});
 			},
 		}
diff --git a/pages/charity/details.vue b/pages/charity/details.vue
index 27183c5..551aafd 100644
--- a/pages/charity/details.vue
+++ b/pages/charity/details.vue
@@ -59,7 +59,7 @@
 							</u-form-item>
 							<!-- 密码 -->
 							<u-form-item class="input-item" prop="payPassword" ref="item1">
-								<u-input class="input" v-model="coinInfo.payPassword" color="#fff" fontSize="32rpx"
+								<u-input class="input" v-model="coinInfo.payPassword" type="password" color="#fff" fontSize="32rpx"
 									border="none" :placeholder="i18n.WithdrawalPassword">
 								</u-input>
 							</u-form-item>
@@ -172,6 +172,8 @@
 					      uni.$u.toast(this.$t("login").Donationsucceeded)
 						  setTimeout(()=>{
 							  this.getDetail(this.id)
+							  this.coinInfo.amount=null
+							  this.coinInfo.payPassword=null
 							  this.DonatePopupShow = false
 						  },600)
 						 
diff --git a/pages/charity/index.vue b/pages/charity/index.vue
index 18e3966..6391f1b 100644
--- a/pages/charity/index.vue
+++ b/pages/charity/index.vue
@@ -18,6 +18,7 @@
 				<view class="target">Target: {{item.targetAmount}}{{" "}}{{coinTypeInfo.system_cropto_code}}</view>
 				<u-line-progress class="progressbar"  :percentage="item.percentage"
 					activeColor="#00E8A2" height="22rpx">
+					<text class="u-percentage-slot">{{item.percentage}}%</text>
 				</u-line-progress>
 			</view>
 		</view>
@@ -109,6 +110,13 @@
 </script>
 
 <style lang="scss" scoped>
+	.u-percentage-slot {
+		position: absolute;
+		    top: -6rpx;
+		    left: 24rpx;
+		    font-size: 24rpx;
+		    color: #333;
+	}
 	.main {
 		padding-bottom: 198rpx; // 避免底部TabBar盖住内容
 
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e57c596..ce32c04 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -19,8 +19,18 @@
 				</u-overlay>
 			</view>
 			<!-- 轮播图 -->
-			<u-swiper class="swiper" :list="swiperList" previousMargin="48rpx" nextMargin="80rpx" circular
-				:autoplay="true" radius="32rpx" bgColor="rgba(0,0,0,0)" height="360rpx"></u-swiper>
+			
+				
+				<!-- #ifdef APP-PLUS -->
+				 <u-swiper class="swiper" :list="swiperList" previousMargin="48rpx" nextMargin="80rpx" circular
+				 	:autoplay="true" radius="32rpx" bgColor="rgba(0,0,0,0)" height="360rpx">
+					<!-- #endif -->
+				<!-- #ifdef H5 -->
+				 <u-swiper class="swiper" :list="swiperList" previousMargin="48rpx" nextMargin="80rpx" circular
+				 	:autoplay="true" radius="32rpx" bgColor="rgba(0,0,0,0)" height="360rpx" style="margin-top: 145rpx;">
+					<!-- #endif -->
+				
+				</u-swiper>
 			<!-- 消息 -->
 			<view class="message" @click="go('/pages/me/notification')">
 				<u-icon class="icon" name="../../static/home/ic_proclamation.png" size="60rpx" width="60rpx"></u-icon>
diff --git a/pages/login/forget.vue b/pages/login/forget.vue
index d41601a..8109815 100644
--- a/pages/login/forget.vue
+++ b/pages/login/forget.vue
@@ -162,7 +162,7 @@
 				if (this.$refs.uCode.canGetCode) {
 					const data = {
 						email: this.userInfo.email,
-						type: 0,
+						type: 1,
 					}
 					// 模拟向后端请求验证码
 					uni.showLoading({
diff --git a/pages/me/index.vue b/pages/me/index.vue
index c2a3b5e..d70cdb2 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -85,8 +85,11 @@
 		<!-- tabBar -->
 		<tab-bar :selectActive="5"></tab-bar>
 		<!-- 确认退出登录 -->
-		<u-modal :show="showLogOut" :showCancelButton="true" :confirmText="i18n.Confirm" :cancelText="i18n.Cancel" 
-		:content="i18n.isLogOut" @confirm="logOut" @cancel="showLogOut=false"></u-modal>
+		<u-modal :show="showLogOut" :confirmText="i18n.Confirm" :cancelText="i18n.Cancel" :showCancelButton="true"
+			 :content='i18n.isLogOut' @confirm="logOut" @cancel="showLogOut=false"
+			confirmColor="#00E8A2" cancelColor="#96959E">
+		</u-modal>
+		
 	</view>
 </template>
 
@@ -202,6 +205,20 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/ .u-modal__content__text {
+		color: #96959E !important;
+	}
+	/deep/.u-popup__content {
+		background: #323045;
+	
+		.u-modal__title {
+			color: #fff;
+		}
+	
+		.u-modal__content__text {
+			text-align: center;
+		}
+	}
 	.main {
 		padding-top: 88rpx;
 		padding-bottom: 198rpx; // 避免底部TabBar盖住内容
diff --git a/pages/me/inviteFriends.vue b/pages/me/inviteFriends.vue
index a2554e2..ea403fa 100644
--- a/pages/me/inviteFriends.vue
+++ b/pages/me/inviteFriends.vue
@@ -11,7 +11,7 @@
 				<u-image class="QRCodeImg" :src="qr" width="400rpx" height="400rpx">
 				</u-image>
 			</view>
-		<!-- 	<view class="myIdText">{{ i18n.MyReferralID }}{{inviteRules.invitationCode}}</view> -->
+			<!-- 	<view class="myIdText">{{ i18n.MyReferralID }}{{inviteRules.invitationCode}}</view> -->
 			<!-- 按钮 -->
 			<!-- 	<u-button class="button" color="#00E8A2" throttleTime="500" @click="copyId(referralID)">{{
                     i18n.CopyID
@@ -22,10 +22,10 @@
 					{{link}}
 				</view>
 				<view class="btn" @click="copyId(link)">
-					 {{ i18n.CopyLink}}
+					{{ i18n.CopyLink}}
 				</view>
 			</view>
-			
+
 			<view class="copy">
 				<view class="item2">
 					{{ i18n.MyReferralID }}{{this.inviteRules.invitationCode}}
@@ -34,10 +34,7 @@
 					{{ i18n.CopyID}}
 				</view>
 			</view>
-			
-			<view class="title" style="color: #94939B;">
-			{{ i18n.TIPS}}
-			</view>
+
 			<view class="scanText" v-html="inviteRules.invitationRules"></view>
 		</view>
 	</view>
@@ -53,7 +50,7 @@
 		data() {
 			return {
 				// 邀请链接
-				link:'',
+				link: '',
 				qr: null,
 				referralID: 857222,
 				inviteRules: {},
@@ -73,7 +70,7 @@
 			invitation() {
 				api.invitation().then(res => {
 					this.inviteRules = res
-					this.link = this.inviteRules.generateQRCodeUrl + this.inviteRules.invitLink
+					this.link = this.inviteRules.invitLink
 					// let baseURL = constant.BASE_URL
 					// e=e.replace('h5Path',baseURL)
 					this.qr = QR.createQrCodeImg(this.link)
@@ -115,7 +112,7 @@
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
-            width: 450rpx;
+			width: 450rpx;
 		}
 
 		.btn {
@@ -153,9 +150,26 @@
 
 			.scanText {
 				font-size: 32rpx;
-				text-align: center;
+				text-align: left;
 				color: #A2A0A8;
-				word-break: break-all;
+				
+				// HTML+CSS 对于英文单词强制换行但不截断单词的解决办法
+				
+			  /* 这两个在技术上是一样的, 为了兼容了浏览器两个都加上 */
+			  overflow-wrap: break-word;
+			  word-wrap: break-word;
+			
+			  -ms-word-break: break-all;
+			  /* 这个的使用在web-kit中有些危险，他可能会阶段所有东西 */
+			  word-break: break-all;
+			  /* Instead use this non-standard one: */
+			  word-break: break-word;
+			
+			  /* 如果浏览器支持的话增加一个连接符(Blink不支持) */
+			  -ms-hyphens: auto;
+			  -moz-hyphens: auto;
+			  -webkit-hyphens: auto;
+			  hyphens: auto;
 			}
 
 			.QRCode {
diff --git a/pages/me/myTeam.vue b/pages/me/myTeam.vue
index 11e11e1..eb06917 100644
--- a/pages/me/myTeam.vue
+++ b/pages/me/myTeam.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="item">
 					<view class="t1">
-						{{inviteData.yestodayRevenue}}
+						{{Number(inviteData.yestodayRevenue)}}
 					</view>
 					<view class="t2">
 						{{i18n.Earnlingsyesterday}}
@@ -22,7 +22,7 @@
 				</view>
 				<view class="item">
 					<view class="t1">
-					{{inviteData.totalRevenue}}
+					{{Number(inviteData.totalRevenue)}}
 					</view>
 					<view class="t2">
 						{{i18n.Totalincome}}
@@ -36,15 +36,17 @@
 					<thead class="thead">
 						<tr>
 							<td>{{i18n.User}}</td>
+							<td v-if="curNow==1">{{i18n.Rebateamount}}</td>
 							<td>{{i18n.Financialfunds}}</td>
 							<td>{{i18n.Time}}</td>
 						</tr>
 					</thead>
 					<tbody  class="tbody">
 						<tr v-for="item,index in userInfoObj" :key="index">
-							<td>{{item.email}}</td>
-							<td v-if="curNow==0">{{item.tranAmt}}{{coinTypeInfo.system_coin_code}}</td>
+							<td style="width: 100px;"><div style="width: 100%;"><div style="width: 130px;word-break: break-all;">{{item.email}}</div></div></td>
 							<td v-if="curNow==1">{{item.amount}}{{coinTypeInfo.system_coin_code}}</td>
+							<td>{{i18n.Financialfunds}}{{item.userLevel}}</td>
+							<!-- <td v-if="curNow==0">{{item.tranAmt}}{{coinTypeInfo.system_coin_code}}</td>-->
 							<td>{{item.timestr}}</td>
 						</tr>
 					</tbody>
@@ -228,7 +230,7 @@
 		.tbody{
 			tr{
 				height: 84rpx;
-				line-height: 84rpx;
+				// line-height: 84rpx;
 				border-top: 2rpx solid #323045 !important;
 				td{
 					color: #fff;
diff --git a/pages/me/transfer.vue b/pages/me/transfer.vue
index 6b8c49c..03f1335 100644
--- a/pages/me/transfer.vue
+++ b/pages/me/transfer.vue
@@ -13,24 +13,24 @@
 				<!-- coin选择框 -->
 				<view class="text">{{ i18n.SelectCurrency }}</view>
 				<view class="input-item"> 
-					<u-input @focus="USDTPopupShow = true" class="input" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
-						:placeholder="i18n.PleaseChooseCoin" > 
+					<u-input  class="input" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.PleaseChooseCoin" :disabled="true"> 
 					</u-input>
-					<view class="downSelect" ></view>
+					<view class="downSelect"  @click="USDTPopupShow = true"></view>
 				</view>
 				<!-- form地址选择框 -->
 				<view class="text">{{ i18n.From }}</view>
 				<view class="input-item">
-					<u-input class="input" v-model="coinInfo.fromWays" color="#fff" fontSize="32rpx" border="none"
-						:placeholder="i18n.OptionAccount">
+					<u-input class="input" v-model="transCoinInfo.fromWays" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.OptionAccount" :disabled="true">
 					</u-input>
 					<view class="downSelect" @click="accountPopupShow = true"></view>
 				</view>
 				<!-- to地址选择框 -->
 				<view class="text">{{ i18n.To }}</view>
 				<view class="input-item">
-					<u-input class="input" v-model="coinInfo.toWays" color="#fff" fontSize="32rpx" border="none"
-						:placeholder="i18n.TradingAccount">
+					<u-input class="input" v-model="transCoinInfo.toWays" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.TradingAccount" :disabled="true">
 					</u-input>
 					<view class="downSelect" @click="accountPopupShowTo = true"></view>
 				</view>
@@ -38,7 +38,7 @@
 				<view class="text">{{ i18n.TransferNumber }}</view>
 				<view class="input-item">
 					<u-input class="input" v-model="coinInfo.tranAmt" color="#fff" fontSize="32rpx" border="none"
-						:placeholder="i18n.PleaseEnterNumber">
+						:placeholder="i18n.pamount" >
 					</u-input>
 					<view class="numberDownSelect">{{coinInfo.coinCode||''}}
 						<view class="all" @click="coinInfo.tranAmt=coinWayInfo.userCapital">{{i18n.ALL}}</view>
@@ -96,11 +96,11 @@
 							<!-- v-for="(item, index) in 3" :key="index" -->
 							<label class="checkBox" @click="getAccount('exchange','form')">
 								<view class="name">Balance account</view>
-								<radio color="#00E8A2" shape="square" :checked="transCoinInfo.fromWays=='exchange'"></radio>
+								<radio color="#00E8A2" shape="square" :checked="transCoinInfo.fromWays=='Balance account'"></radio>
 							</label>
 							<label class="checkBox" @click="getAccount('contract','form')">
 								<view class="name">Contract account</view>
-								<radio color="#00E8A2" shape="square" :checked="transCoinInfo.fromWays=='contract'"></radio>
+								<radio color="#00E8A2" shape="square" :checked="transCoinInfo.fromWays=='Contract account'"></radio>
 							</label>
 						</radio-group>
 					</scroll-view>
@@ -121,11 +121,11 @@
          				<!-- v-for="(item, index) in 3" :key="index" -->
 						<label class="checkBox" @click="getAccount('contract','to')">
 							<view class="name">Contract account</view>
-							<radio color="#00E8A2" shape="square" :checked="transCoinInfo.toWays=='contract'"></radio>
+							<radio color="#00E8A2" shape="square" :checked="transCoinInfo.toWays=='Contract account'"></radio>
 						</label>
          				<label class="checkBox" @click="getAccount('exchange','to')">
          					<view class="name">Balance account</view>
-         					<radio color="#00E8A2" shape="square" :checked="transCoinInfo.toWays=='exchange'"></radio>
+         					<radio color="#00E8A2" shape="square" :checked="transCoinInfo.toWays=='Balance account'"></radio>
          				</label>
          			
          			</radio-group>
@@ -208,9 +208,19 @@
 			getAccount(e,type){
 				this.type=type
 				if(type=='form'){
-					this.transCoinInfo.fromWays=e
+					if(e=='exchange'){
+						this.transCoinInfo.fromWays='Balance account'
+					}else{
+						this.transCoinInfo.fromWays='Contract account'
+					}
+					this.coinInfo.fromWays=e
 				}else{
-					this.transCoinInfo.toWays=e
+					if(e=='exchange'){
+						this.transCoinInfo.toWays='Balance account'
+					}else{
+						this.transCoinInfo.toWays='Contract account'
+					}
+					this.coinInfo.toWays=e
 				}
 				 this.$forceUpdate()
 			},
@@ -218,9 +228,9 @@
 			transfer() {
 				api.transfer(this.coinInfo).then(res => {
 					uni.$u.toast(this.$t("login").Transfersucceeded)
-					this.reset()
 					setTimeout(() => {
-						this.getInfo()
+						this.getInfo(true)
+						this.reset()
 					}, 1200)
 				})
 			},
@@ -238,22 +248,36 @@
 			// 切换币种或转出账户
 			getCoinOrAccount() {
 				this.transCoinInfo.coinCode=this.coinInfo.coinCode2
-			    this.coinInfo.fromWays=this.transCoinInfo.fromWays
-				this.coinInfo.toWays=this.transCoinInfo.toWays
+			 //    this.coinInfo.fromWays=this.transCoinInfo.fromWays
+				// this.coinInfo.toWays=this.transCoinInfo.toWays
 				if(this.type=='to'){
 					this.accountPopupShowTo = false
 					return;
 				}
-				api.changeCoinWays(this.transCoinInfo).then(res => {
+				api.changeCoinWays({
+					coinCode:this.transCoinInfo.coinCode,
+					fromWays:this.coinInfo.fromWays,
+				}).then(res => {
 					this.coinWayInfo=res
 					this.accountPopupShow = false
 				})
 			},
 			// 获取配置信息
-			getInfo() {
+			getInfo(type) {
 				api.getTransferConfig({}).then(res => {
-					console.log(res)
 					this.info = res
+					// 首次进来才默认选择
+					if(type){
+						return;
+					}
+					// 3个下拉框默认选中第一个,另外选项弹出框也默认第一个
+					this.coinInfo.coinCode=this.info.coinList[0].enname
+					this.coinCode = this.info.coinList[0].enname
+					this.coinCode2 = this.info.coinList[0].code
+					this.coinInfo.fromWays='exchange';
+					this.coinInfo.toWays='contract';
+					this.transCoinInfo.fromWays='Balance account';
+					this.transCoinInfo.toWays='Contract account';
 				})
 			},
 			USDTRadioChange(e) {},
@@ -263,6 +287,9 @@
 </script>
 
 <style lang="scss" scoped>
+	/deep/ .u-input--square{
+		border-radius: 34rpx !important;
+	}
 	.main {
 		.body {
 			.form {
@@ -287,6 +314,7 @@
 						width: 400rpx;
 						height: 112rpx;
 						padding-left: 40rpx !important;
+						background: #323045 !important;
 					}
 
 					.downSelect {
diff --git a/pages/me/walletHistory.vue b/pages/me/walletHistory.vue
index 27c7ef5..84a9dcb 100644
--- a/pages/me/walletHistory.vue
+++ b/pages/me/walletHistory.vue
@@ -29,7 +29,7 @@
 				</card-header>
 				<view class="dataBody" v-if="form.ways === 'exchange'">
 					<key-value-row :keyName="i18n.Status" :value="item.status"></key-value-row>
-					<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
+					<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
 					<view class="text">Postscript : {{item.witType}}
 					</view>
 				</view>
@@ -43,7 +43,7 @@
 				</card-header>
 				<view class="dataBody" v-if="form.ways === 'contract'">
 					<key-value-row :keyName="i18n.Status" :value="item.status"></key-value-row>
-					<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
+					<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
 					<view class="text">Postscript : {{item.witType}}
 					</view>
 				</view>
@@ -116,8 +116,20 @@
 					if (res.content.length) {
 						if (this.form.pageNumber > 1) {
 							this.userInfoObj = this.userInfoObj.concat(res.content)
+							for (var i = 0; i < this.userInfoObj.length; i++) {
+								if (this.userInfoObj[i].addTime) {
+									this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
+										i].addTime)
+								}
+							}
 						} else {
 							this.userInfoObj = res.content
+							for (var i = 0; i < this.userInfoObj.length; i++) {
+								if (this.userInfoObj[i].addTime) {
+									this.userInfoObj[i].timestr = this.$index.formatyymmddhhmmss(this.userInfoObj[
+										i].addTime)
+								}
+							}
 						}
 						if (this.userInfoObj.length >= Number(res.count)) { // 判断接口返回数据量小于请求数据量，则表示此为最后一页
 							this.isLoadMore = true
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index aee16cc..83624de 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -2,13 +2,22 @@
 	<view class="main">
 		<!-- nav -->
 		<navigation>{{ i18n.MinePool }}</navigation>
-		<view class="poolContent">
+			<!-- #ifdef H5 -->
+			<view class="poolContent" style="margin-top: 110rpx;">
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="poolContent">
+					<!-- #endif -->
+			
 			<!-- pool选择框 -->
 			<view class="pool-item" v-for="(item, index) in mineCon.mineList" :key="index">
 				<u-icon class="icon" :name="mineCon.imgAddress+item.imgMobile" size="92rpx" width="92rpx"></u-icon>
 				<view class="right">
 					<view class="title">{{item.name}}</view>
-					<view class="description">{{item.remarks}}</view>
+					<view class="description">
+						Every time lock {{item.baseAmount}}{{item.baseCoin}}, Lock {{item.day}} days Mine poolLock,to produce {{item.profitAmount}}
+						{{item.profitCoin}} per 1 day
+					</view>
 				</view>
 				<u-button class="button" @click="gotoDetails(item,index)" color="#00E8A2" throttleTime="500" :disabled="item.status!='open'">
 					{{ i18n.OpenMine }}</u-button>
diff --git a/pages/mine/mineDetails.vue b/pages/mine/mineDetails.vue
index 9174577..1c15397 100644
--- a/pages/mine/mineDetails.vue
+++ b/pages/mine/mineDetails.vue
@@ -16,7 +16,7 @@
 				</view>
 				<view class="bottom">
 					<view class="item">
-						<view class="title">{{ i18n.LockBTC }}</view>
+						<view class="title">{{ i18n.LockBTC }}{{" "}}{{detail.mineDetails.baseCoin}}</view>
 						<view class="value">{{ detail.mineDetails.limitMin }}</view>
 					</view>
 					<view class="item">
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index e5ec90a..291c9c4 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -7,104 +7,106 @@
 			</view>
 		</navigation>
 		<!-- headBtn -->
-			
-			<!-- #ifdef H5 -->
-			<view class="head" style="margin-top: 120rpx;">
+
+		<!-- #ifdef H5 -->
+		<view class="head" style="margin-top: 120rpx;">
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="head">
 				<!-- #endif -->
-				<!-- #ifdef APP-PLUS -->
-				<view class="head">
-					<!-- #endif -->
-			
-			<view class="headItem" @click="pageState = 'crypto',getRechargeInfo()"
-				:class="{ select: pageState === 'crypto' }">
-				{{ i18n.CoinRecharge }}
-			</view>
-			<view class="headItem" @click="pageState = 'online',getRechargeInfo()"
-				:class="{ select: pageState === 'online' }">
-				{{ i18n.CashRecharge }}
-			</view>
-		</view>
-		<view class="coinContent" v-if="pageState === 'crypto'">
-			<!-- coin选择框 -->
-			<view class="input-item">
-				<u-input class="input" v-model="coin" color="#fff" fontSize="32rpx" border="none"
-					:placeholder="i18n.PleaseChooseCoin" :disabled="true">
-				</u-input>
-				<view class="selectCoinBtn" @click="USDTPopupShow = true">{{coin}}
-				</view>
-			</view>
 
-			<view class="coin-item">
-				<view class="QRCode">
-					<u-image class="QRCodeImg" :src="qr" width="310rpx" height="310rpx">
-					</u-image>
+				<view class="headItem" @click="pageState = 'crypto',getRechargeInfo()"
+					:class="{ select: pageState === 'crypto' }">
+					{{ i18n.CoinRecharge }}
+				</view>
+				<view class="headItem" @click="pageState = 'online',getRechargeInfo()"
+					:class="{ select: pageState === 'online' }">
+					{{ i18n.CashRecharge }}
 				</view>
-				<view class="CoinAddressTitle">{{ i18n.CoinDepositAddress }}</view>
-				<view class="Copy" @click="copyAddress(coinAddress)">{{ i18n.CopyAddress }}</view>
-				<view class="CoinAddress">{{ coinAddress }}</view>
-				<u-divider text="" :dashed="true"></u-divider>
-				<view class="ScanQR">{{ i18n.ScanQR }}</view>
-			</view>
-			<view class="message-item">
-				{{ i18n.message }}
 			</view>
-
-			<!-- USDT按钮通知弹出层 -->
-			<u-popup class="USDTPopup" :show="USDTPopupShow" round="40rpx" mode="bottom" @close="USDTPopupShow = false"
-				@open="USDTPopupShow = true" bgColor="#211F32">
-				<view class="content">
-					<view class="close" @click="USDTPopupShow = false"></view>
-					<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true"
-						@touchmove.stop.prevent="">
-						<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
-							<label class="checkBox" v-for="(item, index) in reInfo.coins" :key="index"
-								@click="radioChange(item)">
-								<view class="icon">
-									<u-icon :name="baseURL+'/coins/'+item.code+'.png'" size="52rpx" width="52rpx">
-									</u-icon>
-								</view>
-								<view class="iconName">
-									<view class="top">{{item.enname}}</view>
-									<view class="bottom">{{item.useCapital}}{{" "}}{{item.code}}</view>
-								</view>
-								<radio color="#00E8A2" shape="square" :checked="coin==item.enname"></radio>
-							</label>
-
-						</radio-group>
-					</scroll-view>
-
-					<u-button class="button" color="#00E8A2" throttleTime="500" @click="USDTPopupShow = false">OK
-					</u-button>
+			<view class="coinContent" v-if="pageState === 'crypto'">
+				<!-- coin选择框 -->
+				<view class="input-item">
+					<u-input class="input" v-model="coin" color="#fff" fontSize="32rpx" border="none"
+						:placeholder="i18n.PleaseChooseCoin" :disabled="true">
+					</u-input>
+					<view class="selectCoinBtn" @click="USDTPopupShow = true">{{coin}}
+					</view>
 				</view>
-			</u-popup>
-		</view>
 
-		<view class="cashContent" v-if="pageState === 'online'">
-			<view class="enter">
-				<view class="selectTitle">{{ i18n.selectAmount }}</view>
-				<view class="numberSelect">
-					<view :class="{ select: item === onlineInfo.tranAmt }" class="item" v-for="item,index in reInfo.fastAmount" @click="getAmount(item,index)">
-						{{item}}{{coinTypeInfo.system_coin_code}}
+				<view class="coin-item">
+					<view class="QRCode">
+						<u-image class="QRCodeImg" :src="qr" width="310rpx" height="310rpx">
+						</u-image>
 					</view>
+					<view class="CoinAddressTitle">{{ i18n.CoinDepositAddress }}</view>
+					<view class="Copy" @click="copyAddress(coinAddress)">{{ i18n.CopyAddress }}</view>
+					<view class="CoinAddress">{{ coinAddress }}</view>
+					<u-divider text="" :dashed="true"></u-divider>
+					<view class="ScanQR">{{ i18n.ScanQR }}</view>
 				</view>
-				<input class="input" v-model="onlineInfo.tranAmt" focus :placeholder="i18n.EnterNumber"
-					placeholder-style="color:#A1A0A8" />
+				<view class="message-item">
+					{{ i18n.message }}
+				</view>
+
+				<!-- USDT按钮通知弹出层 -->
+				<u-popup class="USDTPopup" :show="USDTPopupShow" round="40rpx" mode="bottom"
+					@close="USDTPopupShow = false" @open="USDTPopupShow = true" bgColor="#211F32">
+					<view class="content">
+						<view class="close" @click="USDTPopupShow = false"></view>
+						<scroll-view scroll-y="true" style="height: 432rpx;" scroll-with-animation="true"
+							@touchmove.stop.prevent="">
+							<radio-group class="radioGroup" @change="USDTRadioChange" v-model="USDTRadioValue">
+								<label class="checkBox" v-for="(item, index) in reInfo.coins" :key="index"
+									@click="radioChange(item)">
+									<view class="icon">
+										<u-icon :name="baseURL+'/coins/'+item.code+'.png'" size="52rpx" width="52rpx">
+										</u-icon>
+									</view>
+									<view class="iconName">
+										<view class="top">{{item.enname}}</view>
+										<view class="bottom">{{item.useCapital}}{{" "}}{{item.code}}</view>
+									</view>
+									<radio color="#00E8A2" shape="square" :checked="coin==item.enname"></radio>
+								</label>
+
+							</radio-group>
+						</scroll-view>
+
+						<u-button class="button" color="#00E8A2" throttleTime="500" @click="USDTPopupShow = false">OK
+						</u-button>
+					</view>
+				</u-popup>
 			</view>
-			<view class="RechargeMethod">
-				<view class="methodTitle">{{ i18n.RechargeMethod }}</view>
-				<view class="methodSelect">
-					<view class="item" v-for="item,index in reInfo.payTypes" :class="{ select:item.payType === onlineInfo.payType }" @click="getCoinType(item,index)" >
-						{{item.typeName}}
+
+			<view class="cashContent" v-if="pageState === 'online'">
+				<view class="enter">
+					<view class="selectTitle">{{ i18n.selectAmount }}</view>
+					<view class="numberSelect">
+						<view :class="{ select: item === onlineInfo.tranAmt }" class="item"
+							v-for="item,index in reInfo.fastAmount" @click="getAmount(item,index)">
+							{{item}}{{coinTypeInfo.system_coin_code}}
+						</view>
+					</view>
+					<input class="input" v-model="onlineInfo.tranAmt" focus :placeholder="i18n.EnterNumber"
+						placeholder-style="color:#A1A0A8" />
+				</view>
+				<view class="RechargeMethod">
+					<view class="methodTitle">{{ i18n.RechargeMethod }}</view>
+					<view class="methodSelect">
+						<view class="item" v-for="item,index in reInfo.payTypes"
+							:class="{ select:item.payType === onlineInfo.payType }" @click="getCoinType(item,index)">
+							{{item.typeName}}
+						</view>
 					</view>
 				</view>
-			</view>
 
-			<u-button class="button" color="#00E8A2" throttleTime="500" @click="recharge">{{ i18n.Submit }}
-			</u-button>
-		</view>
+				<u-button class="button" color="#00E8A2" throttleTime="500" @click="recharge">{{ i18n.Submit }}
+				</u-button>
+			</view>
 
 
-	</view>
+		</view>
 </template>
 
 <script>
@@ -155,21 +157,32 @@
 		onShow() {},
 		methods: {
 			// 法币充值
-			recharge(){
+			recharge() {
 				api.recharge(this.onlineInfo).then(res => {
-				  uni.$u.toast(this.$t("login").Rechargesucceeded)
-				  setTimeout(()=>{
-					  this.getRechargeInfo()
-				  },1200)
+					// uni.$u.toast(this.$t("login").Rechargesucceeded)
+					if (res.code == 0) {
+                      // #ifdef APP-PLUS
+                      plus.runtime.openURL(res.msg);
+                      // #endif
+                      // #ifdef H5
+                      window.location.href = res.msg
+                      // #endif
+				 }
+				 if (res.code == 1) {
+						uni.$u.toast(res.msg)	  
+					}
+					setTimeout(() => {
+						this.getRechargeInfo()
+					}, 1200)
 				})
 			},
 			// 获取选择充值的钱
-			getAmount(t,i) {
-				this.onlineInfo.tranAmt=t
+			getAmount(t, i) {
+				this.onlineInfo.tranAmt = t
 			},
 			// 获取充值类型
-			getCoinType(t,i){
-				this.onlineInfo.payType=t.payType
+			getCoinType(t, i) {
+				this.onlineInfo.payType = t.payType
 			},
 			radioChange(e) {
 				this.coin = e.enname
@@ -181,11 +194,11 @@
 					// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
 					api.rechargeAddress(coinInfo).then(res => {
 						this.coinAddress = res.address
-						this.qr = this.reInfo.generateQRCodeUrl + this.coinAddress
+						this.qr = this.coinAddress
 					})
 				} else {
 					this.coinAddress = e.address
-					this.qr = this.reInfo.generateQRCodeUrl + this.coinAddress
+					this.qr = this.coinAddress
 				}
 			},
 			// 获取二维码
@@ -200,7 +213,7 @@
 					if (this.pageState == 'crypto') {
 						if (this.reInfo.coins[0].address) {
 							this.coinAddress = this.reInfo.coins[0].address
-							let img = this.reInfo.generateQRCodeUrl + this.reInfo.coins[0].address
+							let img = this.reInfo.coins[0].address
 							this.coin = this.reInfo.coins[0].enname
 							this.coinCode = this.reInfo.coins[0].code
 							this.getQr(img)
@@ -211,13 +224,13 @@
 							// 返回的币种没有充值地址就用接口传code换取虚拟币充值地址
 							api.rechargeAddress(coinInfo).then(res => {
 								this.coinAddress = res.address
-								this.qr = this.reInfo.generateQRCodeUrl + this.coinAddress
+								this.qr = this.coinAddress
 							})
 						}
 					} else {
 						this.reInfo.fastAmount = this.reInfo.fastAmount.split(',')
-						this.onlineInfo.tranAmt=this.reInfo.fastAmount[0]
-						this.onlineInfo.payType=this.reInfo.payTypes[0].payType
+						this.onlineInfo.tranAmt = this.reInfo.fastAmount[0]
+						this.onlineInfo.payType = this.reInfo.payTypes[0].payType
 					}
 
 
diff --git a/pages/recharge/rechargeRecord.vue b/pages/recharge/rechargeRecord.vue
index 7ea41da..c0e473a 100644
--- a/pages/recharge/rechargeRecord.vue
+++ b/pages/recharge/rechargeRecord.vue
@@ -9,7 +9,6 @@
 			<!-- #ifdef H5 -->
 			  <view class="head" style="margin-top: 100rpx;">
 				<!-- #endif -->
-			
 			<view class="headItem" @click="form.type = 'crypto',getList()"
 				:class="{ select: form.type === 'crypto' }">
 				{{ i18n.CoinRecharge }}
@@ -37,7 +36,7 @@
 				<view class="dataBody" v-if="form.type === 'crypto'">
 					<view style="padding:20rpx 32rpx;">
 						<key-value-row :keyName="i18n.OrderID" :value="item.orderNo"></key-value-row>
-						<key-value-row :keyName="i18n.Fees" :value="(item.tranAmt-(parseInt(item.realAmount,16)))+item.coinCode"></key-value-row>
+						<key-value-row :keyName="i18n.Fees" :value="(item.tranAmt-item.realAmount)+item.coinCode"></key-value-row>
 						<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
 					</view>
 					<view style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
diff --git a/pages/subscription/details.vue b/pages/subscription/details.vue
index 98326b4..7ee9541 100644
--- a/pages/subscription/details.vue
+++ b/pages/subscription/details.vue
@@ -7,36 +7,40 @@
 			<view class="countDown">
 				<view class="item">
 					<view class="title">{{ i18n.Days }}</view>
-					<view class="value">{{day}}</view>
+					<view class="value" v-if="deinfo.sysCoinInfo.status=='open'">{{day}}</view>
+					<view class="value" v-else>0</view>
 				</view>
 				<view class="item">
 					<view class="title">{{ i18n.Hours }}</view>
-					<view class="value">{{hr}}</view>
+					<view class="value" v-if="deinfo.sysCoinInfo.status=='open'">{{hr}}</view>
+					<view class="value" v-else>0</view>
 				</view>
 				<view class="item">
 					<view class="title">{{ i18n.Minutes }}</view>
-					<view class="value">{{min}}</view>
+					<view class="value" v-if="deinfo.sysCoinInfo.status=='open'">{{min}}</view>
+					<view class="value" v-else>0</view>
 				</view>
 				<view class="item">
 					<view class="title">{{ i18n.Seconds }}</view>
-					<view class="value">{{sec}}</view>
+					<view class="value" v-if="deinfo.sysCoinInfo.status=='open'">{{sec}}</view>
+					<view class="value" v-else>0</view>
 				</view>
 			</view>
 
 			<!-- input -->
 			<view class="input-item">
 				<u-input class="input" v-model="SubscribeCount" color="#A1A0A8" fontSize="32rpx" border="none"
-					:placeholder="i18n.PleaseChooseCoin" @focus="SubscribeCount=''">
+					:placeholder="i18n.PleaseChooseCoin" @focus="SubscribeCount=''" :disabled="deinfo.sysCoinInfo.status!='open'">
 				</u-input>
-				<view class="selectCoin" @click="USDTPopupShow = true">{{deinfo.sysCoinInfo.coinCode}}
+				<view class="selectCoin" @click="USDTPopupShow = true">{{deinfo.coins[0].code}}
 				</view>
 			</view>
 			<!-- total -->
-			<key-value-row :keyName="i18n.Total" :value="'≈'+coinPirce+deinfo.coins[0].code" :size="'24rpx'"
+			<key-value-row :keyName="i18n.Total" :value="'≈'+coinPirce+deinfo.sysCoinInfo.coinCode" :size="'24rpx'"
 				:leftColor="'#A1A0A8'" :rightColor="'#A1A0A8'"></key-value-row>
 
 			<!-- 按钮 -->
-			<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="SubscribeNowed" @click="subscribe">{{
+			<u-button class="button" color="#00E8A2" throttleTime="500" :disabled="SubscribeNowed||deinfo.sysCoinInfo.status!='open'" @click="subscribe">{{
                     i18n.SubscribeNow
             }}
 			</u-button>
@@ -177,6 +181,7 @@
 				api.subscription({
 					coinCode: e,
 				}).then(res => {
+					
 					this.deinfo = res;
 					this.des = this.deinfo.sysCoinInfo.info
 					this.deinfo.lefttime=this.deinfo.lefttime/1000
@@ -249,6 +254,7 @@
 				.input {
 					width: 80%;
 					height: 124rpx;
+					    background: #323045 !important;
 				}
 
 				.selectCoin {
diff --git a/pages/subscription/index.vue b/pages/subscription/index.vue
index ec2afa3..596d1cc 100644
--- a/pages/subscription/index.vue
+++ b/pages/subscription/index.vue
@@ -34,45 +34,49 @@
 				<!-- 卡片条件渲染 -->
 				<!-- product -->
 				<card-header v-if="pageState === 'product'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
-					:title="item.fullName"
+					:title="item.coinCode"
 					:rightName="item.status=='open'?'Subscribe':item.status=='close'?'Ended':'Coming soon'"
 					:hasBtn="true" :btnColor="item.status=='open'?'#00E8A2':item.status=='close'?'#A1A0A8':'#F2FE8D'">
 				</card-header>
 				<view class="dataBody" v-if="pageState === 'product'">
 					<key-value-row :keyName="i18n.STLTotalCirculation" :value="item.issueAmount"></key-value-row>
-					<key-value-row :keyName="i18n.PrivateSalePrice" :value="item.initalPrice+item.coinCode">
+					<key-value-row :keyName="i18n.PrivateSalePrice" :value="item.initalPrice+'USDT'">
 					</key-value-row>
-					<key-value-row :keyName="i18n.ICOTime" :value="item.timestr"></key-value-row>
+					<key-value-row size="24rpx" :keyName="i18n.ICOTime" :value="item.timestr+'-'+item.timestrIntital"></key-value-row>
 				</view>
 			</view>
 			<view class="card" v-for="(item, index) in userInfoObj" :key="index" v-if="pageState === 'pending'">
 				<!-- pending -->
 				<card-header v-if="pageState === 'pending'" :iconName="baseURL+'/coins/'+item.coinSymbol+'.png'"
-					:title="item.orderNo" :rightName="item.status" :fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
+					:title="item.orderNo" 
+					:rightName="item.status=='undone'?'Reviewing':item.status=='cancel'?'Rejected':'Completed'"
+					:fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
 				</card-header>
 				<view class="dataBody" v-if="pageState === 'pending'">
-					<key-value-row :keyName="i18n.Price" :value="item.pendingPrice"></key-value-row>
-					<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount"></key-value-row>
-					<key-value-row :keyName="i18n.USDT" :value="parseInt(item.usdtPrice,16)"></key-value-row>
-					<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
+					<key-value-row :keyName="i18n.Price" :value="item.pendingPrice+'USDT'"></key-value-row>
+					<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount+item.coinSymbol"></key-value-row>
+					<key-value-row :keyName="i18n.USDT" :value="item.baseAmount+item.baseSymbol"></key-value-row>
+					<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
 				</view>
 			</view>
 			
          <view class="card" v-for="(item, index) in userInfoObj" :key="index" v-if="pageState === 'complete'">
 			<!-- complete -->
 			<card-header v-if="pageState === 'complete'" :iconName="baseURL+'/coins/'+item.coinSymbol+'.png'"
-				:title="item.orderNo" :rightName="item.status" :fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
+				:title="item.orderNo" 
+				:rightName="item.status=='undone'?'Reviewing':item.status=='cancel'?'Rejected':'Completed'"
+				:fontColor="item.status=='undone'?'#A1A0A8':item.status=='cancel'?'#F4506A':'#00E8A2'">
 			</card-header>
 			<view class="dataBody" v-if="pageState === 'complete'">
-				<key-value-row :keyName="i18n.Price" :value="item.pendingPrice"></key-value-row>
-				<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount"></key-value-row>
-				<key-value-row :keyName="i18n.ConfirmAmount" :value="item.tradeAmount" :leftColor="'#F2FE8D'"
+			<key-value-row :keyName="i18n.Price" :value="item.pendingPrice+'USDT'"></key-value-row>
+			<key-value-row :keyName="i18n.Quantity" :value="item.pendingAmount+item.coinSymbol"></key-value-row>
+				<key-value-row :keyName="i18n.ConfirmAmount" :value="item.tradeAmount+item.coinSymbol" :leftColor="'#F2FE8D'"
 					:rightColor="'#F2FE8D'"></key-value-row>
-				<key-value-row :keyName="i18n.USDT" :value="parseInt(item.usdtPrice,16)"></key-value-row>
-				<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount" :leftColor="'#F2FE8D'"
+			<key-value-row :keyName="i18n.USDT" :value="item.baseAmount+item.baseSymbol"></key-value-row>
+				<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount+item.baseAmount" :leftColor="'#F2FE8D'"
 					:rightColor="'#F2FE8D'">
 				</key-value-row>
-				<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
+				<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
 
 			</view>
 			</view>
@@ -198,23 +202,27 @@
 					this.isLoadMore = true
 					this.loadStatus = 'nomore'
 					for (var i = 0; i < this.info.length; i++) {
-						if (this.info[i].startDate) {
-							this.info[i].timestr = this.$index.formatyymmddhhmmss(this.info[
-								i].startDate)
-						}
+					if (this.info[i].startDate) {
+						this.info[i].timestr = this.$index.formatyymmddhhmmss(this.info[
+							i].startDate)
+					}
+					if (this.info[i].initalDate) {
+						this.info[i].timestrIntital = this.$index.formatyymmddhhmmss(this.info[
+							i].initalDate)
+					}
 					}
 				})
 			},
 			gotoDetails(i, index) {
-				if (this.pageState !== 'product') return
-				if (i.status == 'close') {
-					uni.$u.toast(this.$t("subscription").Subcompleted)
-					return;
-				}
-				if (i.status == 'unstart') {
-					uni.$u.toast(this.$t("subscription").Substarted)
-					return;
-				}
+				// if (this.pageState !== 'product') return
+				// if (i.status == 'close') {
+				// 	uni.$u.toast(this.$t("subscription").Subcompleted)
+				// 	return;
+				// }
+				// if (i.status == 'unstart') {
+				// 	uni.$u.toast(this.$t("subscription").Substarted)
+				// 	return;
+				// }
 				uni.navigateTo({
 					url: `/pages/subscription/details?id=${i.coinCode}`
 				});
diff --git a/pages/withdrawal/addAddress.vue b/pages/withdrawal/addAddress.vue
index a96134e..e6ff97c 100644
--- a/pages/withdrawal/addAddress.vue
+++ b/pages/withdrawal/addAddress.vue
@@ -5,10 +5,10 @@
         <view class="body">
             <!-- coin选择框 -->
             <view class="choose-item">
-                <u-input class="input" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
-                    :placeholder="i18n.PleaseChooseCoin">
+                <u-input class="input inputbg" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
+                    :placeholder="i18n.PleaseChooseCoin" :disabled="true">
                 </u-input>
-                <view class="selectCoinBtn" @click="USDTPopupShow = true">{{coinInfo.coinCode}}
+                <view class="selectCoinBtn" @click="USDTPopupShow = true" v-if="!coninType">{{coinInfo.coinCode}}
                 </view>
             </view>
 
@@ -75,6 +75,7 @@ export default {
     name: "withdrawal",
     data() {
         return {
+			coninType:null,
 			baseURL:'',
 			// 选择的币种信息
 			selectCoinInfo: {},
@@ -104,7 +105,24 @@ export default {
             }
         }
     },
-    onLoad() {
+    onLoad(res) {
+		// 2)从提现界面的choose进入地址页，点击添加地址，币种不能选择，只能添加提现界面所选币种的地址，也只显示提现界面选择币种的地址列表
+		if(res.coinCode){
+			// 传后台的
+			this.coinInfo.coinCode2=res.coinCode2
+			// 回显到页面的
+			this.coinInfo.coinCode=res.coinCode
+			// 币种不能选择
+			this.coninType=true
+           this.baseURL = constant.BASE_URL
+           this.getWithConfig(true)
+           // 监听事件  
+           uni.$on('coinAddressChang', (data) => {
+               this.coinAddress = data.coinAddress
+           })
+		   return;
+		}
+		
 		this.baseURL = constant.BASE_URL
 		this.getWithConfig()
         // 监听事件  
@@ -127,12 +145,9 @@ export default {
 			}).then(res => {
 			  uni.$u.toast(this.$t("login").Savesucceeded)
 			  setTimeout(()=>{
-				this.coinInfo={
-				  coinCode:null,
-				  address:null,
-				  remarks:null,
-				  coinCode2:null,
-				  }
+				uni.navigateBack({
+					
+				})
 			  },1200)
 			})
 		},
@@ -144,13 +159,17 @@ export default {
 		},
 		
 		// 获取提现配置
-		getWithConfig() {
+		getWithConfig(type) {
 			api.withdrawConfig({
 				type: 'crypto'
 			}).then(res => {
 				if (res) {
-					// 进来默认选中第一个币
 					this.withdrawInfo = res
+					// 从提现界面过来已经选了,不要选第一个了
+					if(type){
+						 return;
+					}
+					// 进来默认选中第一个币
 					this.coinInfo.coinCode = this.withdrawInfo.coins[0].enname
 					this.coinInfo.coinCode2 = this.withdrawInfo.coins[0].code
 				}
@@ -207,6 +226,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	.inputbg{
+		background: #211F32 !important;
+	}
 .main {
 
     .right {
diff --git a/pages/withdrawal/chooseAddress.vue b/pages/withdrawal/chooseAddress.vue
index dee3d7a..fcfa9a4 100644
--- a/pages/withdrawal/chooseAddress.vue
+++ b/pages/withdrawal/chooseAddress.vue
@@ -31,7 +31,7 @@
 							:class="{ select: (editCoinIndex === index && editCoinAddressIndex === item.id) }"
 							v-if="editFlag"></view>
 						<view class="addressInfo">
-							<view class="addressTitle">{{ i18n.myOmniAddress }}</view>
+							<view class="addressTitle">{{item.remark}}</view>
 							<view class="address">{{item.address}}</view>
 							<view class="time">{{item.timestr}}</view>
 						</view>
@@ -71,6 +71,8 @@
 		name: "chooseAddress",
 		data() {
 			return {
+				// 币种代码
+				coinCode:'',
 				coinList: [{}],
 				coinAddressList: [{}],
 				editFlag: false, // 是否在编辑状态
@@ -107,7 +109,17 @@
 				}
 			}
 		},
-		onLoad() {
+		onLoad(res) {
+			// 1)用户选好币种后，如果用户点击choose到 Choose address页面，只展示用户已选择币种的地址，withdrawAddressList接口可以传多一个参数coinCode，
+			//如果用户不是从withdrawl页面进到地址页，则展示全部币种的地址，而个人中心进去地址页和添加地址才是所有币种的
+			// 2)从提现界面的choose进入地址页，点击添加地址，币种不能选择，只能添加提现界面所选币种的地址，也只显示提现界面选择币种的地址列表
+			if(res.coinCode){
+				// 传后台的
+				this.form.coinCode=res.coinCode2
+				// 回显到页面的
+				this.coinCode=res.coinCode
+				this.getList()
+			}
 		},
 		onShow() {
 			this.getList()
@@ -179,7 +191,7 @@
 				} else {
 					// 在非编辑模式下直接跳转
 					uni.navigateTo({
-						url: '/pages/withdrawal/addAddress'
+						url:'/pages/withdrawal/addAddress?coinCode2='+this.form.coinCode +'&'+ 'coinCode='+this.coinCode
 					});
 				}
 			},
@@ -284,6 +296,7 @@
 								position: relative;
 								font-size: 24rpx;
 								margin-bottom: 20rpx;
+								word-break: break-all;
 
 								&::after {
 									display: block;
@@ -295,7 +308,7 @@
 									width: 32rpx;
 									height: 32rpx;
 									top: 0rpx;
-									right: 0rpx;
+									right: -18rpx;
 									transform: rotate(270deg);
 								}
 							}
diff --git a/pages/withdrawal/withdrawal.vue b/pages/withdrawal/withdrawal.vue
index 6427e58..69b7b80 100644
--- a/pages/withdrawal/withdrawal.vue
+++ b/pages/withdrawal/withdrawal.vue
@@ -27,8 +27,8 @@
 		<view class="DCContent" v-if="pageState === 'crypto'">
 			<!-- coin选择框 -->
 			<view class="input-item">
-				<u-input class="input" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
-					:placeholder="i18n.PleaseChooseCoin">
+				<u-input class="input inputbg" v-model="coinInfo.coinCode" color="#fff" fontSize="32rpx" border="none"
+					:placeholder="i18n.PleaseChooseCoin" :disabled="true">
 				</u-input>
 				<view class="selectCoinBtn" @click="USDTPopupShow = true">{{coinInfo.coinCode}}
 				</view>
@@ -40,20 +40,22 @@
 					<view class="choose" @click="goto('chooseAddress')">{{ i18n.Choose }}</view>
 				</view>
 				<!-- 地址 -->
-				<view class="address" v-if="coinAddress">{{ coinAddress }}
+				<view class="address">
+			     <text v-if="coinAddress">{{coinAddress}}</text>
+				 <text v-else>{{i18n.Pleasechoose}}</text>
 				</view>
 				<!-- 分割线 -->
 				<u-divider text="" lineColor="#B9C1D9"></u-divider>
 				<!-- 可用数量 -->
 				<key-value-row :keyName="i18n.Quantity"
-					:value="`${i18n.Available} ${parseInt(selectCoinInfo.useCapital,16)} ${selectCoinInfo.enname}`"
+					:value="`${i18n.Available} ${selectCoinInfo.useCapital} ${selectCoinInfo.enname}`"
 					rightColor="#A1A0A8"></key-value-row>
 				<!-- 数量输入框 -->
 				<view class="input-item">
 					<u-input class="input" v-model="coinInfo.tranAmt" color="#fff" fontSize="32rpx" border="none"
 						:placeholder="i18n.EnterTheQuantity">
 					</u-input>
-					<view class="all" @click="coinInfo.tranAmt=parseInt(selectCoinInfo.useCapital,16)">{{ i18n.ALL }}
+					<view class="all" @click="coinInfo.tranAmt=selectCoinInfo.useCapital">{{ i18n.ALL }}
 					</view>
 				</view>
 				<!-- 最低体现金额 -->
@@ -62,7 +64,7 @@
 				</key-value-row>
 				<!-- 手续费 -->
 				<key-value-row :keyName="i18n.HandlingFee" size="24rpx"
-					:value="selectCoinInfo.withdrawFeeAmount+selectCoinInfo.enname" rightColor="#A1A0A8">
+					:value="withdrawFeeAmount+selectCoinInfo.enname" rightColor="#A1A0A8">
 				</key-value-row>
 				<view class="title">{{ i18n.PaymentPassword }}</view>
 				<view class="input-item">
@@ -180,6 +182,8 @@
 		name: "withdrawal",
 		data() {
 			return {
+				// 提现手续费实时算
+				withdrawFeeAmount:0,
 				// 选择的币种信息
 				selectCoinInfo: {},
 				coinInfo: {
@@ -209,6 +213,14 @@
 				paymentPassword: '',
 			};
 		},
+		  watch: {
+		    'coinInfo.tranAmt': {
+		      deep: true,
+		      handler: function (n,i) {
+				  this.withdrawFeeAmount=n*this.withdrawInfo.rate
+		      }
+		    }
+		  },
 		computed: {
 			// 获取币种
 			coinTypeInfo() {
@@ -330,7 +342,7 @@
 						url = '/pages/withdrawal/withdrawalRecord'
 						break;
 					case 'chooseAddress':
-						url = '/pages/withdrawal/chooseAddress?form=withdrawal'
+						url = '/pages/withdrawal/chooseAddress?coinCode2='+this.coinInfo.coinCode2 +'&'+ 'coinCode='+this.coinInfo.coinCode
 						break;
 					case 'addBankCard':
 						url = '/pages/withdrawal/addOrEditBankCard?mode=addBank'
@@ -388,6 +400,10 @@
 </script>
 
 <style lang="scss" scoped>
+
+	.inputbg{
+		background: #211F32 !important;
+	}
 	.main {
 
 		.right {
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index 2ba97e0..d5e7330 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -10,11 +10,11 @@
 				<view class="head">
 					<!-- #endif -->
 			
-			<view class="headItem" @click="form.type = 'crypto',getList()"
+			<view class="headItem" @click="getType('crypto')"
 				:class="{ select: form.type === 'crypto' }">
 				{{ i18n.DigitalCurrency }}
 			</view>
-			<view class="headItem" @click="form.type = 'online',getList()" :class="{ select:form.type=== 'online' }">
+			<view class="headItem" @click="getType('online')" :class="{ select:form.type=== 'online' }">
 				{{ i18n.OnLine }}
 			</view>
 		</view>
@@ -38,8 +38,8 @@
 					</view>
 					<view style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
 						<show-more class="digitalShowMore">
-							<key-value-row :keyName="i18n.Address" :value="item.toAddress"></key-value-row>
-							<key-value-row :keyName="i18n.Hash" :value="item.txid"></key-value-row>
+							<key-value-row :keyName="i18n.Address" :value="item.toAddress" :isBr="true"></key-value-row>
+							<key-value-row :keyName="i18n.Hash" :value="item.txid" :isBr="true"></key-value-row>
 							<!-- <view class="text">Postscript : ontact customer service on the top-left corner for identity
 								verific
 							</view> -->
@@ -53,7 +53,7 @@
 			<!-- 	<card-header v-if="form.type === 'online'" iconName="../../static/withdrawal/money-send.png"
 					:title="'904.29483230ACTA'" rightName="Succeed" fontColor="#00E8A2">
 				</card-header> -->
-				<card-header v-if="form.type === 'crypto'" iconName="../../static/withdrawal/money-send.png"
+				<card-header v-if="form.type === 'online'" iconName="../../static/withdrawal/money-send.png"
 					:title="item.tranAmt+item.coinCode" 
 					:rightName="item.orderStatus=='processreview'?'Underreview':item.orderStatus=='processsuccess'?'Success':
 					item.orderStatus=='processing'?'Processing':item.orderStatus=='processfailed'?'Failed':'Failed'"			 
@@ -139,6 +139,12 @@
 		},
 		onShow() {},
 		methods: {
+			// 获取类型
+			getType(e){
+				this.userInfoObj=[]
+				this.form.type = e
+				this.getList()
+			},
 			getList() {
 				this.isLoadMore = true
 				api.withdrawList(this.form).then(res => {
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 8e63ac7..229adf2 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -210,7 +210,7 @@ export default {
 		Record: 'Record',
         Dataisempty:'Data is empty',
 		YourBTC: 'Your BTC',
-		LockBTC: 'Lock BTC',
+		LockBTC: 'Lock',
 		dayproduce: '1 day produce',
 		MinLockTime: 'Min lock time',
 		days: 'days',
@@ -232,6 +232,7 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Pleasechoose:'Please choose withdrawl address',
 		Dataisempty:'Data is empty',
 		Withdrawal: 'Withdrawal',
 		Record: 'Record',
@@ -301,7 +302,7 @@ export default {
 
 		EditBankInformation: 'Edit bank information',
 		AddBankInformation: 'Add bank information',
-		FirstName: 'First Name',
+		FirstName: 'Real Name',
 		enterName: 'Please enter your name',
 		Account: 'Account',
 		enterAccount: 'Please enter your Account',
@@ -351,15 +352,16 @@ export default {
 
 	//me
 	me: {
-		
+		Rebateamount:'Amount',
+		pamount:'Please enter amount',
 		Incomerecord:'Income record',
 		Myclient:'My client',
 		Time:'Time',
-		Financialfunds:'Financial funds',
+		Financialfunds:'Level',
 		User:'User',
 		Totalincome:'Total income',
 		Earnlingsyesterday:'Earnlings yesterday',
-		Numberofclionts:'Number of clionts',
+		Numberofclionts:'Number of clients',
 		Dataisempty:'Data is empty',
 		isLogOut:'Are you sure you want to log out?',
 		account: 'account',
@@ -417,7 +419,7 @@ export default {
 		OptionAccount: 'Option account',
 		To: 'To',
 		TradingAccount: 'Trading account',
-		TransferNumber: 'Transfer number',
+		TransferNumber: 'Truyền tải',
 		PleaseEnterNumber: 'Please enter number',
 		Usable: 'Usable ：',
 		ALL: 'ALL',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index 30bedaf..7d20c73 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -206,7 +206,7 @@ export default {
 		Record: 'Ghi lại',
         Dataisempty:'Dữ liệu trống',
 		YourBTC: 'Của bạn BTC',
-		LockBTC: 'Khóa BTC',
+		LockBTC: 'Khóa',
 		dayproduce: '1 ngày sản xuất',
 		MinLockTime: 'Thời gian khóa tối thiểu',
 		days: 'ngày',
@@ -228,6 +228,7 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Pleasechoose:'Hãy chọn địa chỉ rút lui',
 		Dataisempty:'Data is empty',
 		Withdrawal: 'Rút tiền',
 		Record: 'Ghi lại',
@@ -297,7 +298,7 @@ export default {
 
 		EditBankInformation: 'Chỉnh sửa thông tin ngân hàng',
 		AddBankInformation: 'Thêm thông tin ngân hàng',
-		FirstName: 'Họ',
+		FirstName: 'Tên thật',
 		enterName: 'xin hãy nhập tên của bạn',
 		Account: 'Tài khoản',
 		enterAccount: 'Vui lòng nhập tài khoản của bạn',
@@ -347,6 +348,10 @@ export default {
 
 	//me
 	me: {
+		Rebateamount:'số',
+		Financialfunds:'Hạng',
+		Numberofclionts:'Số khách hàng',
+		pamount:'Hãy nhập số',
 		Dataisempty:'Dữ liệu trống',
 		isLogOut:'Bạn có chắc chắn bạn muốn thoát?',
 		account: 'tài khoản',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index dc3fdc4..330ee9f 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -199,6 +199,7 @@ export default {
 
 	//mine
 	mine: {
+		Numberofclionts:'客戶數量',
 		Dataisempty:'數據為空',
 		MinePool: '礦池',
 		OpenMine: '開礦',
@@ -206,7 +207,7 @@ export default {
 		Record: '記錄',
         Dataisempty:'數據為空',
 		YourBTC: '您的 BTC',
-		LockBTC: '鎖 BTC',
+		LockBTC: '鎖定',
 		dayproduce: '1天生產',
 		MinLockTime: '最小鎖定時間',
 		days: '天',
@@ -228,6 +229,7 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		Pleasechoose:'請選擇取款地址',
 		Dataisempty:'數據為空',
 		Withdrawal: '提現',
 		Record: '記錄',
@@ -297,7 +299,7 @@ export default {
 
 		EditBankInformation: '修改銀行信息',
 		AddBankInformation: '添加銀行信息',
-		FirstName: '名',
+		FirstName: '真實姓名',
 		enterName: '請輸入你的名字',
 		Account: '帳戶',
 		enterAccount: '請輸入您的賬戶',
@@ -347,6 +349,9 @@ export default {
 
 	//me
 	me: {
+		Rebateamount:'金額',
+		Financialfunds:'等級',
+		pamount:'請輸入金額',
 		Dataisempty:'數據為空',
 		isLogOut:'您確定要退出嗎？',
 		account: '帳戶',
@@ -403,7 +408,7 @@ export default {
 		OptionAccount: '期權賬戶',
 		To: '至',
 		TradingAccount: '交易賬戶',
-		TransferNumber: '轉帳號碼',
+		TransferNumber: '轉帳金額',
 		PleaseEnterNumber: '請輸入號碼',
 		Usable: '可用 ：',
 		ALL: '全部',