diff --git a/App.vue b/App.vue
index 57ecc59..a948702 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,7 @@
 		// 	i18n() {
 		// 		return this.$t('index')
 		// 	},
-		// },
+		// }, 
 		onLaunch: function() {
 			console.log('App Launch')
 		// #ifdef APP-PLUS 
diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index 0626827..c02216d 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -15,7 +15,7 @@
 		<view class="content" v-if="list.length">
 			<view class="card" v-for="(item, index) in list" :key="index">
 				<view class="header">
-					<text :class="item.direction" >{{item.direction}}</text>
+					<text :class="item.direction">{{item.direction}}</text>
 					<text class="time">{{item.timestr}}</text>
 					<text class="closeTimeTitle" v-show="type === 2">{{ i18n.CloseTime }}</text>
 					<text class="closeTime" v-show="type === 2">{{item.timestr2}}</text>
@@ -49,10 +49,13 @@
 							<view class="title">{{ i18n.CurrentPrice }}</view>
 							<view class="value" style="color:#F4506A;">{{marketDetail.close}}</view>
 							<view class="title" v-show="type === 0">{{ i18n.status }}</view>
-							<view class="value" v-show="type === 0">{{item.status}}</view>
+							<view class="value" v-show="type === 0">
+								{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
+							</view>
 							<view class="title" v-show="type === 1">{{ i18n.do }}</view>
 							<view class="value" style="color:#00E8A2;" v-show="type === 1" @click="getStopLimit(item)">
-								Stop/Limit</view>
+								{{ i18n.StopLimit }}
+							</view>
 							<view class="title" v-show="type === 1||type === 2">{{ 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'">
@@ -63,17 +66,25 @@
 						<!-- Closed -->
 						<view class="right" v-show="type === 2">
 							<view class="title">{{ i18n.ClosePrice }}</view>
-							<view class="value" style="color:#00E8A2;">{{item.currentPrice}}</view>
+							<view class="value" style="color:#00E8A2;">{{item.closedPrice}}</view>
 							<view class="title">{{ i18n.status }}</view>
-							<view class="value">{{item.status}}</view>
+							<view class="value">
+								{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
+							</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 class="value" :style="item.profitAmount>=0?'color:#00E8A2;':'color:#F4506A'">
+								{{getPrice(item.profitAmount)}}
+							</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="value" style="color:#F4506A;">
+								{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
+							</view>
 							<view class="title">{{ i18n.PL }}</view>
 							<view class="value" style="color:#00E8A2;">
 								<!-- {{item.currentPl}} --> 0
@@ -115,7 +126,7 @@
 				<view class="numberInput">
 					<button class="btn sub" :class="{ disabled: stsSubBtnDisabled || stsValue <= 0 }"
 						:disabled="stsSubBtnDisabled" @click="stsValueChange('sub')"></button>
-					<input class="number" type="number" v-model="stsValue" @input="stopModalChange"/>
+					<input class="number" type="number" v-model="stsValue" @input="stopModalChange" />
 					<button class="btn add" @click="stsValueChange('add')"></button>
 				</view>
 			</view>
@@ -199,8 +210,8 @@
 				itemData: {},
 				// 设置止盈数据
 				stopLimitData: {},
-				profit:0,
-				loss:0
+				profit: 0,
+				loss: 0
 			}
 		},
 		computed: {
@@ -209,7 +220,7 @@
 			},
 		},
 		watch: {
-			deep:true,
+			deep: true,
 			symbol: {
 				handler: function() {
 					this.getContractOrderList()
@@ -223,7 +234,7 @@
 		//全局事件在组件实例创建完成定义
 		created() {
 			uni.$on('upData', num => {
-				if(num){
+				if (num) {
 					this.getContractOrderList()
 				}
 			})
@@ -235,18 +246,32 @@
 			timer2 = null;
 		},
 		methods: {
-			stopModalChange(){
-				if(this.stopLimitData.direction==='buy'){
-					if(this.styValue)
-					this.profit=this.getItem((this.styValue-this.stopLimitData.openedPrice)*this.stopLimitData.hand)
-					if(this.stsValue)
-					this.loss=this.getItem((this.stsValue-this.stopLimitData.openedPrice)*this.stopLimitData.hand)
-					
-				}else{
-					if(this.styValue)
-					this.profit=this.getItem((this.stopLimitData.openedPrice-this.styValue)*this.stopLimitData.hand)
-					if(this.stsValue)
-					this.loss=this.getItem((this.stopLimitData.openedPrice-this.stsValue)*this.stopLimitData.hand)
+			// 获取位数
+			getPrice(s) {
+				var i=s;
+				/* 
+				js 数字精度问题
+				*/
+				i = parseFloat(i.toPrecision(10))
+				i = String(i)
+				return i.substring(0, i.indexOf(".") + 5);
+			},
+			stopModalChange() {
+				if (this.stopLimitData.direction === 'buy') {
+					if (this.styValue)
+						this.profit = this.getItem((this.styValue - this.stopLimitData.openedPrice) * this.stopLimitData
+							.hand)
+					if (this.stsValue)
+						this.loss = this.getItem((this.stsValue - this.stopLimitData.openedPrice) * this.stopLimitData
+							.hand)
+
+				} else {
+					if (this.styValue)
+						this.profit = this.getItem((this.stopLimitData.openedPrice - this.styValue) * this.stopLimitData
+							.hand)
+					if (this.stsValue)
+						this.loss = this.getItem((this.stopLimitData.openedPrice - this.stsValue) * this.stopLimitData
+							.hand)
 				}
 			},
 			getItem(i) {
@@ -258,12 +283,12 @@
 			getStopLimit(i) {
 				this.stopLimitData = i
 				this.stopModalShow = true
-				this.styValue=0;
-				this.stsValue=0;
-				this.profit=0
-				this.loss=0
+				this.styValue = 0;
+				this.stsValue = 0;
+				this.profit = 0
+				this.loss = 0
 			},
-			
+
 			// 获取撤销订单
 			closeItem(item, i) {
 				this.itemData = item
@@ -466,6 +491,7 @@
 						color: #00E8A2;
 						margin-right: 28rpx;
 					}
+
 					.sell {
 						color: #F4506A;
 						margin-right: 28rpx;
diff --git a/components/showMore/showMore.vue b/components/showMore/showMore.vue
index de8ecd7..074bed4 100644
--- a/components/showMore/showMore.vue
+++ b/components/showMore/showMore.vue
@@ -36,7 +36,7 @@ export default {
     },
     data() {
         return {
-            title: 'Show more',
+            title: this.$t("recharge").ShowMore,
             collapseFlag: false, // 折叠状态
         }
     },
@@ -49,7 +49,7 @@ export default {
     methods: {
         collapse() {
             this.collapseFlag = !this.collapseFlag;
-            this.title = this.collapseFlag ? 'Pick up' : 'Show more'
+            this.title = this.collapseFlag ? this.$t("recharge").Pickup : this.$t("recharge").ShowMore
 
 
         }
diff --git a/pages.json b/pages.json
index bd3b5fc..00f4c09 100644
--- a/pages.json
+++ b/pages.json
@@ -29,9 +29,19 @@
 				"navigationStyle": "custom"
 			}
 		},
-		
-
+		{
+			"path": "pages/login/useragreement",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 
+	     {
+			"path": "pages/login/condition",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 
 		// markets
 		{
diff --git a/pages/charity/index.vue b/pages/charity/index.vue
index b6f3510..5365044 100644
--- a/pages/charity/index.vue
+++ b/pages/charity/index.vue
@@ -15,7 +15,7 @@
 				<u--image class="img" :showLoading="true" :src="baseURL+item.img" width="318rpx"
 					height="230rpx"></u--image>
 				<view class="title">{{item.title}} </view>
-				<view class="target">Target: {{item.targetAmount}}{{" "}}{{coinTypeInfo.system_cropto_code}}</view>
+				<view class="target">{{ i18n.Target }}{{item.targetAmount}}{{" "}}{{coinTypeInfo.system_cropto_code}}</view>
 				<u-line-progress class="progressbar"  :percentage="item.percentage"
 					activeColor="#00E8A2" height="30rpx">
 					<text class="u-percentage-slot">{{item.percentage}}%</text>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 9818d41..ffc2733 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -100,11 +100,11 @@
 					margin: 'auto 102rpx auto 118rpx',
 				}">
 						<view class="content">
-							<scroll-view scroll-y="true" style="max-height: 288rpx;" scroll-with-animation="true"
+							<scroll-view scroll-y="true" style="max-height: 388rpx;" scroll-with-animation="true"
 								@touchmove.stop.prevent="">
 								<view class="" v-html="contentFirst"></view>
 							</scroll-view>
-							<u-button class="button" color="#00E8A2" @click="toRead" :throttleTime="500">OK</u-button>
+							<u-button class="button" color="#00E8A2" @click="toRead" :throttleTime="500">{{i18n.OK}}</u-button>
 						</view>
 					</u-popup>
 				</view>
@@ -375,17 +375,15 @@
 			},
 			// 读公告
 			toRead() {
+				this.popupShow = false
 				api.noticeRead({
 					noticeId: this.noticeId
 				}).then(res => {
-
+					// this.noticeId = null;
+					// this.messageList=[];
+					// this.noticeList();
 				})
-				this.popupShow = false
-				setTimeout(() => {
-					this.noticeId = null;
-					this.messageList=[];
-					this.noticeList();
-				}, 1500)
+			
 
 			},
 			go(url) {
@@ -402,8 +400,12 @@
 					for (var i = 0; i < res.length; i++) {
 						this.messageList.push(res[i].title)
 					}
-					// 获取未读的公告
-					this.getNoReadNotice()
+					if (this.notice[0].isRead == 'no') {
+						this.contentFirst = this.notice[0].content
+						this.noticeId = this.notice[0].id
+						this.popupShow = true
+					}
+				
 				})
 			},
 			// 轮播
@@ -430,7 +432,10 @@
 				this.$store.commit('setLanguage', e.language)
 				this.langTrue = e.title
 				uni.setStorageSync('langTrue', e.title)
-				uni.redirectTo({
+				// uni.redirectTo({
+				// 	url: '/pages/home/index'
+				// })
+				uni.reLaunch({
 					url: '/pages/home/index'
 				})
 			},
diff --git a/pages/login/condition.vue b/pages/login/condition.vue
new file mode 100644
index 0000000..d12ca36
--- /dev/null
+++ b/pages/login/condition.vue
@@ -0,0 +1,290 @@
+<template>
+	<view class="main">
+		<navigation>{{ content.title }}</navigation>
+		
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
+			<view class="content" v-html="content.content">
+				
+			</view>
+
+
+	</view>
+	</view>
+</template>
+
+<script>
+	import UButton from '../../uview-ui/components/u-button/u-button.vue'
+	import api from '@/utils/api'
+	import md5 from 'js-md5'
+	export default {
+		name: "register",
+		data() {
+			return {
+			 content:{}
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("login");
+			},
+		},
+		onLoad() {
+		this.agreement()
+		},
+		watch: {
+			
+		},
+		onShow() {},
+		methods: {
+			// 服务协议
+			agreement() {
+					api.agreement({
+						type:'privacypolicy'
+					}).then(res => {
+						 this.content=res
+					})
+
+			},
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		margin-top: 50rpx;
+		text-align: left;
+		padding-bottom: 60rpx;
+		// 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;
+	}
+	.main {
+
+		.body {
+			margin-top: 204rpx;
+			padding: 0 40rpx;
+			overflow: hidden;
+
+			.welcomeText {
+				margin-top: 48rpx;
+				font-size: 48rpx;
+				font-weight: 800;
+				text-align: center;
+			}
+
+			.signInText {
+				font-size: 32rpx;
+				text-align: center;
+				color: #A2A0A8;
+			}
+
+			.form {
+				font-size: 32rpx;
+				margin-top: 48rpx;
+
+				.input-item {
+					height: 112rpx;
+					line-height: 112rpx;
+					background: #211F32;
+					margin-bottom: 48rpx;
+					border-radius: 32rpx;
+
+					.icon {
+						margin: 0 24rpx;
+					}
+
+					/deep/.u-form-item__body {
+						padding: 0;
+					}
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+				.vCode {
+
+					.getVCodeBtn {
+						// position: absolute;
+						width: 154rpx;
+						height: 56rpx;
+						right: 28rpx;
+						// top: 14px;
+						border-radius: 8px;
+						line-height: 56rpx;
+						font-size: 24rpx;
+						color: #00E8A2 !important;
+						padding: 0;
+					}
+				}
+			}
+
+			.agree {
+				font-size: 28rpx;
+
+				.check {
+					display: inline-block;
+					vertical-align: top;
+					margin-right: 32rpx;
+				}
+
+				.text {
+					display: inline-block;
+					width: 542rpx;
+				}
+
+				span {
+					cursor: pointer;
+					color: #00E8A2;
+					padding: 0 10rpx;
+
+				}
+			}
+
+			.button {
+				margin-top: 64rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 32rpx;
+				color: #15141F !important;
+			}
+
+			.signUp {
+				margin: 48rpx 0;
+				text-align: center;
+				font-size: 32rpx;
+
+				.navigator {
+					display: inline;
+					color: #00E8A2;
+					padding: 0 10rpx;
+				}
+
+			}
+		}
+     .body-app{
+     	margin-top: 204rpx !important;
+     	padding: 0 40rpx;
+     	overflow: hidden;
+     
+     	.welcomeText {
+     		margin-top: 48rpx;
+     		font-size: 48rpx;
+     		font-weight: 800;
+     		text-align: center;
+     	}
+     
+     	.signInText {
+     		font-size: 32rpx;
+     		text-align: center;
+     		color: #A2A0A8;
+     	}
+     
+     	.form {
+     		font-size: 32rpx;
+     		margin-top: 48rpx;
+     
+     		.input-item {
+     			height: 112rpx;
+     			line-height: 112rpx;
+     			background: #211F32;
+     			margin-bottom: 48rpx;
+     			border-radius: 32rpx;
+     
+     			.icon {
+     				margin: 0 24rpx;
+     			}
+     
+     			/deep/.u-form-item__body {
+     				padding: 0;
+     			}
+     
+     			.input {
+     				height: 112rpx;
+     			}
+     		}
+     
+     		.vCode {
+     
+     			.getVCodeBtn {
+     				// position: absolute;
+     				width: 154rpx;
+     				height: 56rpx;
+     				right: 28rpx;
+     				// top: 14px;
+     				border-radius: 8px;
+     				line-height: 56rpx;
+     				font-size: 24rpx;
+     				color: #00E8A2 !important;
+     				padding: 0;
+     			}
+     		}
+     	}
+     
+     	.agree {
+     		font-size: 28rpx;
+     
+     		.check {
+     			display: inline-block;
+     			vertical-align: top;
+     			margin-right: 32rpx;
+     		}
+     
+     		.text {
+     			display: inline-block;
+     			width: 542rpx;
+     		}
+     
+     		span {
+     			cursor: pointer;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     
+     		}
+     	}
+     
+     	.button {
+     		margin-top: 64rpx;
+     		height: 112rpx;
+     		line-height: 112rpx;
+     		border-radius: 32rpx;
+     		font-size: 32rpx;
+     		color: #15141F !important;
+     	}
+     
+     	.signUp {
+     		margin: 48rpx 0;
+     		text-align: center;
+     		font-size: 32rpx;
+     
+     		.navigator {
+     			display: inline;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     		}
+     
+     	}
+     }
+	}
+</style>
diff --git a/pages/login/register.vue b/pages/login/register.vue
index de93369..74b34d3 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -1,7 +1,13 @@
 <template>
 	<view class="main">
 		<navigation>{{ i18n.SignUp }}</navigation>
-		<view class="body">
+		
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
 			<view class="welcomeText">{{ i18n.registerWelcomeText }}</view>
 			<view class="signInText">{{ i18n.registerCreate }}</view>
 			<u--form class="form" :model="userInfo" :rules="rules" ref="uForm" errorType="toast">
@@ -69,7 +75,7 @@
 				<u-icon class="check" @click="agreeFlag = !agreeFlag"
 					:name="agreeFlag ? '../../static/login/Checkbox_pr.png' : '../../static/login/Checkbox_de.png'"
 					size="48rpx" width="48rpx"></u-icon>
-				<view class="text">{{ i18n.agreeText }}<span>{{ i18n.Terms }}</span>{{ i18n.and }}<span>{{
+				<view class="text">{{ i18n.agreeText }}<span @click="go('/pages/login/useragreement')">{{ i18n.Terms }}</span>{{ i18n.and }}<span @click="go('/pages/login/condition')">{{
                         i18n.Conditions
                 }}</span></view>
 			</view>
@@ -185,6 +191,11 @@
 		},
 		onShow() {},
 		methods: {
+			go(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
 			// 验证码相关
 			codeChange(text) {
 				this.tips = text;
@@ -383,6 +394,108 @@
 
 			}
 		}
-
+     .body-app{
+     	margin-top: 204rpx !important;
+     	padding: 0 64rpx;
+     	overflow: hidden;
+     
+     	.welcomeText {
+     		margin-top: 48rpx;
+     		font-size: 48rpx;
+     		font-weight: 800;
+     		text-align: center;
+     	}
+     
+     	.signInText {
+     		font-size: 32rpx;
+     		text-align: center;
+     		color: #A2A0A8;
+     	}
+     
+     	.form {
+     		font-size: 32rpx;
+     		margin-top: 48rpx;
+     
+     		.input-item {
+     			height: 112rpx;
+     			line-height: 112rpx;
+     			background: #211F32;
+     			margin-bottom: 48rpx;
+     			border-radius: 32rpx;
+     
+     			.icon {
+     				margin: 0 24rpx;
+     			}
+     
+     			/deep/.u-form-item__body {
+     				padding: 0;
+     			}
+     
+     			.input {
+     				height: 112rpx;
+     			}
+     		}
+     
+     		.vCode {
+     
+     			.getVCodeBtn {
+     				// position: absolute;
+     				width: 154rpx;
+     				height: 56rpx;
+     				right: 28rpx;
+     				// top: 14px;
+     				border-radius: 8px;
+     				line-height: 56rpx;
+     				font-size: 24rpx;
+     				color: #00E8A2 !important;
+     				padding: 0;
+     			}
+     		}
+     	}
+     
+     	.agree {
+     		font-size: 28rpx;
+     
+     		.check {
+     			display: inline-block;
+     			vertical-align: top;
+     			margin-right: 32rpx;
+     		}
+     
+     		.text {
+     			display: inline-block;
+     			width: 542rpx;
+     		}
+     
+     		span {
+     			cursor: pointer;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     
+     		}
+     	}
+     
+     	.button {
+     		margin-top: 64rpx;
+     		height: 112rpx;
+     		line-height: 112rpx;
+     		border-radius: 32rpx;
+     		font-size: 32rpx;
+     		color: #15141F !important;
+     	}
+     
+     	.signUp {
+     		margin: 48rpx 0;
+     		text-align: center;
+     		font-size: 32rpx;
+     
+     		.navigator {
+     			display: inline;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     		}
+     
+     	}
+     }
 	}
 </style>
diff --git a/pages/login/useragreement.vue b/pages/login/useragreement.vue
new file mode 100644
index 0000000..c07b9ac
--- /dev/null
+++ b/pages/login/useragreement.vue
@@ -0,0 +1,290 @@
+<template>
+	<view class="main">
+		<navigation>{{ content.title }}</navigation>
+		
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
+			<view class="content" v-html="content.content">
+				
+			</view>
+
+
+	</view>
+	</view>
+</template>
+
+<script>
+	import UButton from '../../uview-ui/components/u-button/u-button.vue'
+	import api from '@/utils/api'
+	import md5 from 'js-md5'
+	export default {
+		name: "register",
+		data() {
+			return {
+			 content:{}
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("login");
+			},
+		},
+		onLoad() {
+		this.agreement()
+		},
+		watch: {
+			
+		},
+		onShow() {},
+		methods: {
+			// 服务协议
+			agreement() {
+					api.agreement({
+						type:'useragreement'
+					}).then(res => {
+						 this.content=res
+					})
+
+			},
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		margin-top: 50rpx;
+		text-align: left;
+		padding-bottom: 60rpx;
+		// 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;
+	}
+	.main {
+
+		.body {
+			margin-top: 204rpx;
+			padding: 0 40rpx;
+			overflow: hidden;
+
+			.welcomeText {
+				margin-top: 48rpx;
+				font-size: 48rpx;
+				font-weight: 800;
+				text-align: center;
+			}
+
+			.signInText {
+				font-size: 32rpx;
+				text-align: center;
+				color: #A2A0A8;
+			}
+
+			.form {
+				font-size: 32rpx;
+				margin-top: 48rpx;
+
+				.input-item {
+					height: 112rpx;
+					line-height: 112rpx;
+					background: #211F32;
+					margin-bottom: 48rpx;
+					border-radius: 32rpx;
+
+					.icon {
+						margin: 0 24rpx;
+					}
+
+					/deep/.u-form-item__body {
+						padding: 0;
+					}
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+				.vCode {
+
+					.getVCodeBtn {
+						// position: absolute;
+						width: 154rpx;
+						height: 56rpx;
+						right: 28rpx;
+						// top: 14px;
+						border-radius: 8px;
+						line-height: 56rpx;
+						font-size: 24rpx;
+						color: #00E8A2 !important;
+						padding: 0;
+					}
+				}
+			}
+
+			.agree {
+				font-size: 28rpx;
+
+				.check {
+					display: inline-block;
+					vertical-align: top;
+					margin-right: 32rpx;
+				}
+
+				.text {
+					display: inline-block;
+					width: 542rpx;
+				}
+
+				span {
+					cursor: pointer;
+					color: #00E8A2;
+					padding: 0 10rpx;
+
+				}
+			}
+
+			.button {
+				margin-top: 64rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 32rpx;
+				color: #15141F !important;
+			}
+
+			.signUp {
+				margin: 48rpx 0;
+				text-align: center;
+				font-size: 32rpx;
+
+				.navigator {
+					display: inline;
+					color: #00E8A2;
+					padding: 0 10rpx;
+				}
+
+			}
+		}
+     .body-app{
+     	margin-top: 204rpx !important;
+     	padding: 0 40rpx;
+     	overflow: hidden;
+     
+     	.welcomeText {
+     		margin-top: 48rpx;
+     		font-size: 48rpx;
+     		font-weight: 800;
+     		text-align: center;
+     	}
+     
+     	.signInText {
+     		font-size: 32rpx;
+     		text-align: center;
+     		color: #A2A0A8;
+     	}
+     
+     	.form {
+     		font-size: 32rpx;
+     		margin-top: 48rpx;
+     
+     		.input-item {
+     			height: 112rpx;
+     			line-height: 112rpx;
+     			background: #211F32;
+     			margin-bottom: 48rpx;
+     			border-radius: 32rpx;
+     
+     			.icon {
+     				margin: 0 24rpx;
+     			}
+     
+     			/deep/.u-form-item__body {
+     				padding: 0;
+     			}
+     
+     			.input {
+     				height: 112rpx;
+     			}
+     		}
+     
+     		.vCode {
+     
+     			.getVCodeBtn {
+     				// position: absolute;
+     				width: 154rpx;
+     				height: 56rpx;
+     				right: 28rpx;
+     				// top: 14px;
+     				border-radius: 8px;
+     				line-height: 56rpx;
+     				font-size: 24rpx;
+     				color: #00E8A2 !important;
+     				padding: 0;
+     			}
+     		}
+     	}
+     
+     	.agree {
+     		font-size: 28rpx;
+     
+     		.check {
+     			display: inline-block;
+     			vertical-align: top;
+     			margin-right: 32rpx;
+     		}
+     
+     		.text {
+     			display: inline-block;
+     			width: 542rpx;
+     		}
+     
+     		span {
+     			cursor: pointer;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     
+     		}
+     	}
+     
+     	.button {
+     		margin-top: 64rpx;
+     		height: 112rpx;
+     		line-height: 112rpx;
+     		border-radius: 32rpx;
+     		font-size: 32rpx;
+     		color: #15141F !important;
+     	}
+     
+     	.signUp {
+     		margin: 48rpx 0;
+     		text-align: center;
+     		font-size: 32rpx;
+     
+     		.navigator {
+     			display: inline;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     		}
+     
+     	}
+     }
+	}
+</style>
diff --git a/pages/markets/kLine.vue b/pages/markets/kLine.vue
index 1ac6af1..a42c0dc 100644
--- a/pages/markets/kLine.vue
+++ b/pages/markets/kLine.vue
@@ -59,7 +59,7 @@
 			</view>
 			<!-- 买卖挂牌表 -->
 			<view class="MarketTrades">
-				<view class="headTitle">Market trades</view>
+				<view class="headTitle"> {{ i18n.Markettrades }}</view>
 				<view class="table">
 					<view class="box">
 						<view class="title">
diff --git a/pages/me/donateRecord.vue b/pages/me/donateRecord.vue
index eedbb71..0b71ebf 100644
--- a/pages/me/donateRecord.vue
+++ b/pages/me/donateRecord.vue
@@ -2,7 +2,12 @@
 	<view class="main">
 		<!-- nav -->
 		<navigation>{{ i18n.DonateRecord }}</navigation>
-		<view class="body">
+			<!-- #ifdef APP-PLUS -->
+			<view class="body-app">
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="body">
+					<!-- #endif -->
 			<view class="card" v-for="(item, index) in userInfoObj" :key="index">
 				<u-icon class="icon" :name="'../../static/me/img_donate.png'" size="64rpx" width="64rpx"></u-icon>
 				<view class="content">
@@ -150,6 +155,57 @@
 			}
 
 		}
+		
+		.body-app{
+			overflow: hidden;
+			margin-top: 200rpx !important;
+			padding: 0 32rpx;
+		
+			.card {
+				height: 148rpx;
+				position: relative;
+				background: #211F32;
+				border-radius: 32rpx;
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 32rpx;
+		
+				.icon {
+					margin: -20rpx 12rpx 0 20rpx;
+					border-radius: 20rpx;
+				}
+		
+				.content {
+					width: 558rpx;
+		
+					.title {
+						width: 558rpx;
+						height: 36rpx;
+						line-height: 36rpx;
+						margin-top: 32rpx;
+						font-size: 28rpx;
+		
+						/deep/.u-text__value {
+							font-weight: 600 !important;
+						}
+		
+					}
+		
+					.date {
+						width: 558rpx;
+						height: 36rpx;
+						line-height: 36rpx;
+						font-size: 28rpx;
+						margin-top: 12rpx;
+						color: #A1A0A8;
+					}
+				}
+		
+		
+		
+			}
+		
+		}
 
 	}
 </style>
diff --git a/pages/me/language.vue b/pages/me/language.vue
index d4ea430..ee8b245 100644
--- a/pages/me/language.vue
+++ b/pages/me/language.vue
@@ -2,7 +2,13 @@
     <view class="main">
         <!-- nav -->
         <navigation>{{ i18n.Language }}</navigation>
-        <view class="body">
+			<!-- #ifdef APP-PLUS -->
+			<view class="body-app">
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="body">
+					<!-- #endif -->
+			
             <radio-group class="radioGroup" @change="changeLanguage" v-model="language">
                 <label class="checkBox" v-for="(item, index) in languageData" :key="index">
                     <view class="name">{{ item.title }}</view>
@@ -97,6 +103,44 @@ export default {
         }
 
     }
+.body-app{
+        overflow: hidden;
+        margin-top: 200rpx !important;
+
+        .radioGroup {
+            margin-top: 60rpx;
+            height: 432rpx;
+            padding: 0 48rpx;
+
+            .checkBox {
+                position: relative;
+                height: 112rpx;
+                line-height: 112rpx;
+                display: flex;
+                align-items: center;
+                border-bottom: 2rpx solid #323045;
+                font-size: 32rpx;
+
+                .radio {
+                    position: absolute;
+                    right: 0;
+                }
+
+                /deep/.uni-radio-input {
+                    // width: 48rpx;
+                    // height: 48rpx;
+                    // border-radius: 48rpx;
+                    background: transparent;
+                }
+
+                // /deep/.uni-radio-input-checked::before {
+                //     font-size: 36rpx;
+                // }
+            }
+
+        }
+
+    }
 
 }
 </style>
diff --git a/pages/me/myTeam.vue b/pages/me/myTeam.vue
index b03a414..a434dfe 100644
--- a/pages/me/myTeam.vue
+++ b/pages/me/myTeam.vue
@@ -2,7 +2,12 @@
 	<view class="main">
 		<!-- nav -->
 		<navigation>{{ i18n.MyTeam }}</navigation>
-		<view class="body">
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
 			<view class="top flex">
 				<view class="item">
 					<view class="t1">
@@ -332,6 +337,56 @@
 			}
 
 		}
+		
+		.body-app{
+			overflow: hidden;
+			margin-top: 200rpx !important;
+		
+			.userItem {
+				position: relative;
+				background: #211F32;
+				border-radius: 32rpx;
+				display: flex;
+				flex-wrap: wrap;
+				margin-top: 32rpx;
+		
+				.icon {
+					height: 160rpx;
+					margin-left: 20rpx;
+					margin-right: 26rpx;
+				}
+		
+				.email {
+					width: 520rpx;
+					height: 52rpx;
+					line-height: 52rpx;
+					margin-top: 28rpx;
+					font-size: 32rpx;
+				}
+		
+				.date {
+					width: 180rpx;
+					height: 52rpx;
+					line-height: 52rpx;
+					font-size: 28rpx;
+				}
+		
+				.button {
+					position: absolute;
+					top: 72rpx;
+					right: 32rpx;
+					width: 120rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					font-size: 28rpx;
+					color: #15141F !important;
+					margin-left: 200rpx;
+					margin-top: 20rpx;
+					border-radius: 16rpx;
+				}
+			}
+		
+		}
 
 	}
 </style>
diff --git a/pages/me/transfer.vue b/pages/me/transfer.vue
index 9b1c810..b05d35a 100644
--- a/pages/me/transfer.vue
+++ b/pages/me/transfer.vue
@@ -21,7 +21,7 @@
 				<!-- form地址选择框 -->
 				<view class="text">{{ i18n.From }}</view>
 				<view class="input-item">
-					<u-input class="input" v-model="transCoinInfo.fromWays" color="#fff" fontSize="32rpx" border="none"
+					<u-input class="input" v-model="i18fromWays" color="#fff" fontSize="32rpx" border="none"
 						:placeholder="i18n.OptionAccount" :disabled="true">
 					</u-input>
 					<view class="downSelect" @click="accountPopupShow = true"></view>
@@ -29,7 +29,7 @@
 				<!-- to地址选择框 -->
 				<view class="text">{{ i18n.To }}</view>
 				<view class="input-item">
-					<u-input class="input" v-model="transCoinInfo.toWays" color="#fff" fontSize="32rpx" border="none"
+					<u-input class="input" v-model="i18toWays" color="#fff" fontSize="32rpx" border="none"
 						:placeholder="i18n.TradingAccount" :disabled="true">
 					</u-input>
 					<view class="downSelect" @click="accountPopupShowTo = true"></view>
@@ -95,11 +95,11 @@
 						<radio-group class="radioGroup" >
 							<!-- v-for="(item, index) in 3" :key="index" -->
 							<label class="checkBox" @click="getAccount('exchange','form')">
-								<view class="name">Balance account</view>
+								<view class="name">{{i18n.Balanceaccount}}</view>
 								<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>
+								<view class="name">{{i18n.Contractaccount}}</view>
 								<radio color="#00E8A2" shape="square" :checked="transCoinInfo.fromWays=='Contract account'"></radio>
 							</label>
 						</radio-group>
@@ -120,11 +120,11 @@
          			<radio-group class="radioGroup" >
          				<!-- v-for="(item, index) in 3" :key="index" -->
 						<label class="checkBox" @click="getAccount('contract','to')">
-							<view class="name">Contract account</view>
+							<view class="name">{{i18n.Contractaccount}}</view>
 							<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>
+         					<view class="name">{{i18n.Balanceaccount}}</view>
          					<radio color="#00E8A2" shape="square" :checked="transCoinInfo.toWays=='Balance account'"></radio>
          				</label>
          			
@@ -149,6 +149,9 @@
 		name: "transfer",
 		data() {
 			return {
+				i18toWays:null,
+				i18fromWays:null,
+				
 				type:'',
 				coinWayInfo:{},
 				transCoinInfo:{
@@ -209,15 +212,20 @@
 				if(type=='form'){
 					if(e=='exchange'){
 						this.transCoinInfo.fromWays='Balance account'
+						this.i18fromWays=this.$t("me").Balanceaccount
 					}else{
+						console.log(123456)
 						this.transCoinInfo.fromWays='Contract account'
+						this.i18fromWays=this.$t("me").Contractaccount
 					}
 					this.coinInfo.fromWays=e
 				}else{
 					if(e=='exchange'){
 						this.transCoinInfo.toWays='Balance account'
+						this.i18toWays=this.$t("me").Balanceaccount
 					}else{
 						this.transCoinInfo.toWays='Contract account'
+						this.i18toWays=this.$t("me").Contractaccount
 					}
 					this.coinInfo.toWays=e
 				}
@@ -278,7 +286,10 @@
 					this.coinInfo.fromWays='exchange';
 					this.coinInfo.toWays='contract';
 					this.transCoinInfo.fromWays='Balance account';
+					this.i18fromWays=this.$t("me").Balanceaccount
+					
 					this.transCoinInfo.toWays='Contract account';
+					this.i18toWays=this.$t("me").Contractaccount
 				})
 			},
 			USDTRadioChange(e) {},
diff --git a/pages/me/walletHistory.vue b/pages/me/walletHistory.vue
index 84a9dcb..dfb6912 100644
--- a/pages/me/walletHistory.vue
+++ b/pages/me/walletHistory.vue
@@ -28,9 +28,14 @@
 					:fontColor="`${item.isIncome=='yes'? '#00E8A2' : '#F4506A'}`">
 				</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.Status"
+					
+					 :value="item.status=='fail'?i18n.fail:item.status=='success'?i18n.Success:
+					 item.status=='processing'?i18n.Processing:i18n.Failed"
+					 
+					 ></key-value-row>
 					<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
-					<view class="text">Postscript : {{item.witType}}
+					<view class="text">{{i18n.Postscript}} : {{item.witType}}
 					</view>
 				</view>
 
@@ -44,7 +49,7 @@
 				<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.timestr"></key-value-row>
-					<view class="text">Postscript : {{item.witType}}
+					<view class="text">{{i18n.Postscript}}  : {{item.witType}}
 					</view>
 				</view>
 
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index 83624de..3e84bee 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -15,8 +15,8 @@
 				<view class="right">
 					<view class="title">{{item.name}}</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
+						{{i18n.Everytimelock}} {{item.baseAmount}}{{item.baseCoin}}, {{i18n.Lock}} {{item.day}}{{i18n.daysMinepoolLock}},{{i18n.toproduce}} {{item.profitAmount}}
+						{{item.profitCoin}} {{per1day}}
 					</view>
 				</view>
 				<u-button class="button" @click="gotoDetails(item,index)" color="#00E8A2" throttleTime="500" :disabled="item.status!='open'">
diff --git a/pages/mine/mineRecord.vue b/pages/mine/mineRecord.vue
index de457ff..168d2de 100644
--- a/pages/mine/mineRecord.vue
+++ b/pages/mine/mineRecord.vue
@@ -1,7 +1,7 @@
 <template>
     <view class="main">
         <!-- nav -->
-        <navigation>{{ i18n.MinePool }}</navigation>
+        <navigation>{{ i18n.MineRecord }}</navigation>
 		    <u-empty :show="userInfoObj.length === 0"  :text="i18n.NoData" textColor="#818197"
 		            textSize="36rpx" icon="../../static/mine/img_data.png"></u-empty>
         <!-- 列表 -->
diff --git a/pages/recharge/recharge.vue b/pages/recharge/recharge.vue
index d15a68d..d9b71e8 100644
--- a/pages/recharge/recharge.vue
+++ b/pages/recharge/recharge.vue
@@ -191,8 +191,15 @@
 				console.log(e);
 				this.coin = e.enname
 				this.coinCode = e.code
-				this.message = this.i18n.message.replace('{rechargeMinAmount}', e.rechargeMinAmount).replaceAll('{enname}',
-					e.enname)
+				//#ifdef H5	
+				this.message = this.i18n.message.replace('{rechargeMinAmount}', e.rechargeMinAmount).replaceAll('{enname}',e.enname)
+					console.log(this.message)
+					console.log(this.i18n.message.replace('{rechargeMinAmount}', e.rechargeMinAmount))
+				//#endif
+				//#ifdef APP-PLUS
+				let message1 = this.i18n.message.replace('{rechargeMinAmount}', e.rechargeMinAmount)
+				this.message = message1.replace('{enname}',e.enname)
+				//#endif
 				if (!e.address) {
 					let coinInfo = {
 						coinCode: e.code
@@ -201,8 +208,6 @@
 					api.rechargeAddress(coinInfo).then(res => {
 						this.coinAddress = res.address
 						this.qr = QR.createQrCodeImg(this.coinAddress)
-
-
 					})
 				} else {
 					this.coinAddress = e.address
diff --git a/pages/recharge/rechargeRecord.vue b/pages/recharge/rechargeRecord.vue
index e7755f1..36d83ed 100644
--- a/pages/recharge/rechargeRecord.vue
+++ b/pages/recharge/rechargeRecord.vue
@@ -3,82 +3,83 @@
 		<!-- nav -->
 		<navigation>{{ i18n.RechargeRecord }}</navigation>
 		<!-- headBtn -->
-			<!-- #ifdef APP-PLUS -->
-			  <view class="head">
-				<!-- #endif -->
+		<!-- #ifdef APP-PLUS -->
+		<view class="head">
+			<!-- #endif -->
 			<!-- #ifdef H5 -->
-			  <view class="head" style="margin-top: 100rpx;">
+			<view class="head" style="margin-top: 100rpx;">
 				<!-- #endif -->
-			<view class="headItem" @click="form.type = 'crypto',getList()"
-				:class="{ select: form.type === 'crypto' }">
-				{{ i18n.CoinRecharge }}
-			</view>
-			<view class="headItem" @click="form.type = 'online',getList()"
-				:class="{ select:form.type === 'online' }">
-				{{ i18n.CashRecharge }}
+				<view class="headItem" @click="form.type = 'crypto',getList()"
+					:class="{ select: form.type === 'crypto' }">
+					{{ i18n.CoinRecharge }}
+				</view>
+				<view class="headItem" @click="form.type = 'online',getList()"
+					:class="{ select:form.type === 'online' }">
+					{{ i18n.CashRecharge }}
+				</view>
 			</view>
-		</view>
 
-		<view class="cardList">
-			<view class="card" v-for="(item, index) in userInfoObj" :key="index">
-				<!-- 卡片条件渲染 -->
-				<!-- balance -->
-			<!-- 	<card-header v-if="form.type === 'crypto'" iconName="../../static/recharge/money-recive.png"
+			<view class="cardList">
+				<view class="card" v-for="(item, index) in userInfoObj" :key="index">
+					<!-- 卡片条件渲染 -->
+					<!-- balance -->
+					<!-- 	<card-header v-if="form.type === 'crypto'" iconName="../../static/recharge/money-recive.png"
 					:title="'904.29483230ACTA'" rightName="Succeed" fontColor="#00E8A2">
 				</card-header> -->
-				<card-header v-if="form.type === 'crypto'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
-					:title="item.tranAmt+item.coinCode" 
-					:rightName="item.orderStatus=='pay_unpaid'?'Unpaid':item.orderStatus=='pay_success'?'Success':
-					item.orderStatus=='pay_failure'?'Failed':item.orderStatus=='pay_processing'?'Paying':'Closed'"			 
-					 :fontColor="item.orderStatus=='pay_unpaid'?'#F2FE8D':item.orderStatus=='pay_success'?'#00E8A2':
+					<card-header v-if="form.type === 'crypto'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
+						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='pay_unpaid'?i18n.Unpaid:item.orderStatus=='pay_success'?i18n.Success:
+					item.orderStatus=='pay_failure'?i18n.Failed:item.orderStatus=='pay_processing'?i18n.Paying:i18n.Closed"
+						:fontColor="item.orderStatus=='pay_unpaid'?'#F2FE8D':item.orderStatus=='pay_success'?'#00E8A2':
 					item.orderStatus=='pay_failure'?'#F4506A':item.orderStatus=='pay_processing'?'#00D1FF':'#A1A0A8'">
-				</card-header>
-				<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-item.realAmount)+item.coinCode"></key-value-row>
-						<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
-					</view>
-					<view class="digitalShowMore" style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
-						<show-more>
-							<key-value-row :keyName="i18n.Address" :value="item.toAddress"></key-value-row>
-							<key-value-row :keyName="i18n.Hash" :value="item.txid"></key-value-row>
-						</show-more>
+					</card-header>
+					<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-item.realAmount)+item.coinCode">
+							</key-value-row>
+							<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
+						</view>
+						<view class="digitalShowMore"
+							style="border-top: 2rpx solid #323045;padding:0rpx 32rpx; margin-bottom: 20rpx;">
+							<show-more>
+								<key-value-row :keyName="i18n.Address" :value="item.toAddress"></key-value-row>
+								<key-value-row :keyName="i18n.Hash" :value="item.txid"></key-value-row>
+							</show-more>
+						</view>
 					</view>
-				</view>
 
 
-				<!-- contarct -->
-				<card-header v-if="form.type === 'online'" iconName="../../static/recharge/money-recive.png"
-					:title="item.tranAmt+item.coinCode" 
-					:rightName="item.orderStatus=='pay_unpaid'?'Unpaid':item.orderStatus=='pay_success'?'Success':
-					item.orderStatus=='pay_failure'?'Failed':item.orderStatus=='pay_processing'?'Paying':'Closed'"			 
-					 :fontColor="item.orderStatus=='pay_unpaid'?'#F2FE8D':item.orderStatus=='pay_success'?'#00E8A2':
+					<!-- contarct -->
+					<card-header v-if="form.type === 'online'" iconName="../../static/recharge/money-recive.png"
+						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='pay_unpaid'?i18n.Unpaid:item.orderStatus=='pay_success'?i18n.Success:
+						 item.orderStatus=='pay_failure'?i18n.Failed:item.orderStatus=='pay_processing'?i18n.Paying:i18n.Closed"
+						:fontColor="item.orderStatus=='pay_unpaid'?'#F2FE8D':item.orderStatus=='pay_success'?'#00E8A2':
 					item.orderStatus=='pay_failure'?'#F4506A':item.orderStatus=='pay_processing'?'#00D1FF':'#A1A0A8'">
-				</card-header>
-				<view class="dataBody" v-if="form.type === 'online'">
-					<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-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;">
-						<show-more>
-							<key-value-row :keyName="i18n.USDTRate" :value="item.usdtRate"></key-value-row>
-							<key-value-row :keyName="i18n.USDT" :value="item.usdtAmount"></key-value-row>
-						</show-more>
-					</view>
+					</card-header>
+					<view class="dataBody" v-if="form.type === 'online'">
+						<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-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;">
+							<show-more>
+								<key-value-row :keyName="i18n.USDTRate" :value="item.usdtRate"></key-value-row>
+								<key-value-row :keyName="i18n.USDT" :value="item.usdtAmount"></key-value-row>
+							</show-more>
+						</view>
 
-				</view>
+					</view>
 
 
 
+				</view>
 			</view>
+			<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0"></u-empty>
+			<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
+				:nomore-text="nomoreText" v-if="userInfoObj.length" height="80" />
 		</view>
-		<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0"></u-empty>
-		<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
-			:nomore-text="nomoreText" v-if="userInfoObj.length" height="80" />
-	</view>
 </template>
 
 <script>
@@ -96,7 +97,7 @@
 		name: "rechargeRecord",
 		data() {
 			return {
-				baseURL:'',
+				baseURL: '',
 				pageState: 'coinRecharge',
 				isLoadMore: false, //是否加载中
 				loadStatus: 'loadmore',
@@ -106,7 +107,7 @@
 				form: {
 					pageNumber: 1,
 					pageSize: 20,
-					type:'crypto',
+					type: 'crypto',
 				},
 				userInfoObj: [],
 			};
@@ -132,10 +133,10 @@
 				console.log(e);
 			},
 			getList() {
-				this.form.pageNumber=1
-				this.form.pageSize=20
-				this.userInfoObj=[],
-				this.isLoadMore = true
+				this.form.pageNumber = 1
+				this.form.pageSize = 20
+				this.userInfoObj = [],
+					this.isLoadMore = true
 				api.rechargeList(this.form).then(res => {
 					if (res.content.length) {
 						if (this.form.pageNumber > 1) {
@@ -175,11 +176,12 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .digitalShowMore .KeyValueRow .value{
+	/deep/ .digitalShowMore .KeyValueRow .value {
 		position: static !important;
-		word-break: break-all !important;  
+		word-break: break-all !important;
 		line-height: 38rpx !important;
 	}
+
 	.main {
 
 		.head {
diff --git a/pages/subscription/details.vue b/pages/subscription/details.vue
index 51feaa5..5973242 100644
--- a/pages/subscription/details.vue
+++ b/pages/subscription/details.vue
@@ -2,7 +2,13 @@
 	<view class="main">
 		<!-- nav -->
 		<navigation>{{ i18n.Subscription }}</navigation>
-		<view class="body">
+		
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
 			<!-- 倒计时 -->
 			<view class="countDown">
 				<view class="item">
@@ -61,7 +67,7 @@
 			<view class="content">{{i18n.FullNameOfToken+deinfo.sysCoinInfo.fullName}}</view>
 			<view class="content">{{i18n.TotalCirculation+deinfo.sysCoinInfo.issueAmount}}</view>
 			<view class="content">{{i18n.ICOPrice+deinfo.sysCoinInfo.initalPrice}} USDT</view>
-			<view class="content">{{i18n.ICOTime+":"+deinfo.sysCoinInfo.initialReleasePhase}}</view>
+			<view class="content">{{i18n.ICOTime+""+deinfo.sysCoinInfo.initialReleasePhase}}</view>
 			<video class="video" v-show="videoShow" id="video" :enable-progress-gesture="false" autoplay="true"
 				:src="videoUrl" controls x5-video-player-type="h5-page" @fullscreenchange="ifStopVideo"></video>
 		</view>
@@ -380,6 +386,159 @@
 
 
 		}
+		
+		
+		.body-app{
+			overflow: hidden;
+			margin-top: 200rpx !important;
+			padding: 0 48rpx;
+		
+			.countDown {
+				margin-top: 60rpx;
+				height: 248rpx;
+				background-image: url(../../static/subscription/RoundedRectangle.png);
+				background-repeat: no-repeat;
+				background-size: 654rpx 248rpx;
+				color: #15141F;
+				padding: 36rpx 28rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				box-sizing: border-box;
+		
+				.item {
+					// width: 140rpx;
+					height: 174rpx;
+					font-weight: bold;
+		
+		
+					.title {
+						font-size: 32rpx;
+						text-align: center;
+					}
+		
+					.value {
+						margin-top: 10rpx;
+						font-size: 96rpx;
+						text-align: center;
+					}
+				}
+		
+			}
+		
+			.input-item {
+				position: relative;
+				overflow: hidden;
+				height: 124rpx;
+				line-height: 124rpx;
+				background: #323045;
+				margin: 32rpx 0;
+				border-radius: 32rpx;
+				padding: 0 40rpx;
+		
+				/deep/.u-form-item__body {
+					padding: 0;
+				}
+		
+				.input {
+					width: 80%;
+					height: 124rpx;
+					    background: #323045 !important;
+				}
+		
+				.selectCoin {
+					position: absolute;
+					width: 150rpx;
+					height: 54rpx;
+					top: 36rpx;
+					right: 0rpx;
+					line-height: 56rpx;
+					font-size: 36rpx;
+					padding: 0;
+					color: #fff;
+				}
+			}
+		
+			.button {
+				margin-top: 38rpx;
+				margin-bottom: 48rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 32rpx;
+				color: #15141F !important;
+				font-weight: bold;
+			}
+		
+			.contentTitle {
+				position: relative;
+				margin-bottom: 32rpx;
+		
+				.ProjectDetails {
+					font-size: 32rpx;
+					color: #fff;
+				}
+		
+				.videoBtn {
+					position: absolute;
+					top: 0;
+					right: 184rpx;
+					width: 134rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					background: #F2FE8D;
+					border-radius: 8rpx;
+					text-align: right;
+					color: #15141F;
+					font-size: 24rpx;
+					font-weight: bold;
+					box-sizing: border-box;
+					padding: 0 16rpx;
+		
+					&::before {
+						display: block;
+						position: absolute;
+						content: '';
+						background-image: url(../../static/subscription/ic_play.png);
+						background-repeat: no-repeat;
+						background-size: 32rpx;
+						width: 32rpx;
+						height: 32rpx;
+						top: 8rpx;
+						left: 10rpx;
+					}
+				}
+		
+				.whiteBook {
+					position: absolute;
+					top: 0;
+					right: 0rpx;
+					width: 164rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					background: #F2FE8D;
+					border-radius: 8rpx;
+					text-align: center;
+					color: #15141F;
+					font-size: 24rpx;
+					font-weight: bold;
+					box-sizing: border-box;
+				}
+			}
+		
+		
+			.content {
+				font-size: 24rpx;
+				color: #A1A0A8;
+				margin-bottom: 48rpx;
+				line-height: 40rpx;
+			}
+		
+		
+		
+		
+		}
+		
 
 	}
 </style>
diff --git a/pages/subscription/index.vue b/pages/subscription/index.vue
index d7f51a4..3c4a4b3 100644
--- a/pages/subscription/index.vue
+++ b/pages/subscription/index.vue
@@ -1,98 +1,107 @@
 <template>
 	<view class="main">
 		<!-- nav -->
-			
-			<!-- #ifdef APP-PLUS -->
-			<view class="nav-head">
-				<!-- #endif -->
+
+		<!-- #ifdef APP-PLUS -->
+		<view class="nav-head">
+			<!-- #endif -->
 			<!-- #ifdef H5 -->
 			<view class="nav-head-H5">
 				<!-- #endif -->
-			<view class="navItem" @click="pageState = 'product',getInfo('product')"
-				:class="{ select: pageState === 'product' }">
-				{{ i18n.Product }}
-			</view>
-			<view class="navItem" @click="pageState = 'pending',getInfo('pending')"
-				:class="{ select: pageState === 'pending' }">
-				{{ i18n.Pending }}
-			</view>
-			<view class="navItem" @click="pageState = 'complete',getInfo('complete')"
-				:class="{ select: pageState === 'complete' }">
-				{{ i18n.Complete }}
+				<view class="navItem" @click="pageState = 'product',getInfo('product')"
+					:class="{ select: pageState === 'product' }">
+					{{ i18n.Product }}
+				</view>
+				<view class="navItem" @click="pageState = 'pending',getInfo('pending')"
+					:class="{ select: pageState === 'pending' }">
+					{{ i18n.Pending }}
+				</view>
+				<view class="navItem" @click="pageState = 'complete',getInfo('complete')"
+					:class="{ select: pageState === 'complete' }">
+					{{ i18n.Complete }}
+				</view>
 			</view>
-		</view>
-			
+
 			<!-- #ifdef APP-PLUS -->
 			<view class="cardList">
 				<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<view class="cardListH5">
-				<!-- #endif -->
-			
-			<view class="card" v-for="(item, index) in info" :key="index" @click="gotoDetails(item,index)"
-				v-if="pageState === 'product'">
-				<!-- 卡片条件渲染 -->
-				<!-- product -->
-				<card-header v-if="pageState === 'product'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
-					: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+'USDT'">
-					</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=='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+'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>
+				<!-- #ifdef H5 -->
+				<view class="cardListH5">
+					<!-- #endif -->
+
+					<view class="card" v-for="(item, index) in info" :key="index" @click="gotoDetails(item,index)"
+						v-if="pageState === 'product'">
+						<!-- 卡片条件渲染 -->
+						<!-- product -->
+						<card-header v-if="pageState === 'product'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
+							:title="item.coinCode"
+							:rightName="item.status=='open'?i18n.open:item.status=='close'?i18n.close:i18n.unstart"
+							: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+'USDT'">
+							</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=='undone'?i18n.Reviewing:item.status=='cancel'?i18n.Rejected:i18n.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+'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=='undone'?i18n.Reviewing:item.status=='cancel'?i18n.Rejected:i18n.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+'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="item.baseAmount+item.baseSymbol">
+							</key-value-row>
+							<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT"
+								:value="item.realAmount+item.baseSymbol" :leftColor="'#F2FE8D'" :rightColor="'#F2FE8D'">
+							</key-value-row>
+							<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
+
+						</view>
+					</view>
 				</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=='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+'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="item.baseAmount+item.baseSymbol"></key-value-row>
-				<key-value-row :keyName="i18n.CheckTheNumberoOfUSDT" :value="item.realAmount+item.baseSymbol" :leftColor="'#F2FE8D'"
-					:rightColor="'#F2FE8D'">
-				</key-value-row>
-				<key-value-row :keyName="i18n.Time" :value="item.timestr"></key-value-row>
+				<u-empty :text="i18n.Dataisempty" mode="data" v-if="info.length==0&&pageState=='product'"></u-empty>
+				<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
+					:nomore-text="nomoreText" v-if="info.length&&pageState=='product'" height="80" />
 
+				<!-- 申购记录的为空提示 -->
+				<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0"
+					v-show="pageState=='pending'||pageState=='complete'"></u-empty>
+				<u-loadmore :status="loadStatus2" :loading-text="loadingText2" :loadmore-text="loadmoreText2"
+					:nomore-text="nomoreText2" v-if="userInfoObj.length" height="80" />
+
+				<!-- tabBar -->
+				<tab-bar :selectActive="4"></tab-bar>
 			</view>
-			</view>
-		</view>
-		<u-empty :text="i18n.Dataisempty" mode="data" v-if="info.length==0&&pageState=='product'"></u-empty>
-		<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
-			:nomore-text="nomoreText" v-if="info.length&&pageState=='product'" height="80" />
-			
-		<!-- 申购记录的为空提示 -->
-			<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0" v-show="pageState=='pending'||pageState=='complete'"></u-empty>
-			<u-loadmore :status="loadStatus2" :loading-text="loadingText2" :loadmore-text="loadmoreText2"
-				:nomore-text="nomoreText2" v-if="userInfoObj.length" height="80" />
-			
-		<!-- tabBar -->
-		<tab-bar :selectActive="4"></tab-bar>
-	</view>
 </template>
 
 <script>
@@ -144,8 +153,8 @@
 		methods: {
 			//看是获取用户申购记录还是申购列表  product 是获取申购列表  其它两个是获取记录
 			getInfo(e) {
-				this.info=[];
-				this.userInfoObj=[]
+				this.info = [];
+				this.userInfoObj = []
 				if (e == 'product') {
 					this.getGoods()
 				}
@@ -202,14 +211,14 @@
 					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.formatyymmddhhmm(this.info[
-							i].startDate)
-					}
-					if (this.info[i].initalDate) {
-						this.info[i].timestrIntital = this.$index.formatyymmddhhmm(this.info[
-							i].initalDate)
-					}
+						if (this.info[i].startDate) {
+							this.info[i].timestr = this.$index.formatyymmddhhmm(this.info[
+								i].startDate)
+						}
+						if (this.info[i].initalDate) {
+							this.info[i].timestrIntital = this.$index.formatyymmddhhmm(this.info[
+								i].initalDate)
+						}
 					}
 				})
 			},
@@ -271,7 +280,7 @@
 
 		}
 
-	.nav-head-H5{
+		.nav-head-H5 {
 			overflow: hidden;
 			position: fixed;
 			top: 0rpx;
@@ -323,7 +332,7 @@
 
 
 
-		.cardListH5{
+		.cardListH5 {
 			margin-top: 142rpx;
 
 			.card {
diff --git a/pages/withdrawal/withdrawalRecord.vue b/pages/withdrawal/withdrawalRecord.vue
index c0f09fb..b149119 100644
--- a/pages/withdrawal/withdrawalRecord.vue
+++ b/pages/withdrawal/withdrawalRecord.vue
@@ -3,91 +3,88 @@
 		<!-- nav -->
 		<navigation>{{ i18n.WithdrawalRecord }}</navigation>
 		<!-- headBtn -->
-			<!-- #ifdef H5 -->
-			<view class="head" style="margin-top: 100rpx;">
+		<!-- #ifdef H5 -->
+		<view class="head" style="margin-top: 100rpx;">
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="head">
 				<!-- #endif -->
-				<!-- #ifdef APP-PLUS -->
-				<view class="head">
-					<!-- #endif -->
-			
-			<view class="headItem" @click="getType('crypto')"
-				:class="{ select: form.type === 'crypto' }">
-				{{ i18n.DigitalCurrency }}
-			</view>
-			<view class="headItem" @click="getType('online')" :class="{ select:form.type=== 'online' }">
-				{{ i18n.OnLine }}
+
+				<view class="headItem" @click="getType('crypto')" :class="{ select: form.type === 'crypto' }">
+					{{ i18n.DigitalCurrency }}
+				</view>
+				<view class="headItem" @click="getType('online')" :class="{ select:form.type=== 'online' }">
+					{{ i18n.OnLine }}
+				</view>
 			</view>
-		</view>
 
-		<view class="cardList">
-			<view class="card" v-for="(item, index) in userInfoObj" :key="index">
-				<!-- 卡片条件渲染 -->
-				<!-- balance -->
-				<card-header v-if="form.type === 'crypto'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
-					:title="item.tranAmt+item.coinCode" 
-					:rightName="item.orderStatus=='processreview'?'Underreview':item.orderStatus=='processsuccess'?'Success':
-					item.orderStatus=='processing'?'Processing':item.orderStatus=='processfailed'?'Failed':'Failed'"			 
-					 :fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
+			<view class="cardList">
+				<view class="card" v-for="(item, index) in userInfoObj" :key="index">
+					<!-- 卡片条件渲染 -->
+					<!-- balance -->
+					<card-header v-if="form.type === 'crypto'" :iconName="baseURL+'/coins/'+item.coinCode+'.png'"
+						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='processreview'?i18n.Underreview:item.orderStatus=='processsuccess'?i18n.Success:
+					item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.Failed:i18n.Failed"
+						:fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
 					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#A1A0A8'">
-				</card-header>
-				<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.tranFee+''+item.coinCode"></key-value-row>
-						<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
-					</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>
-							<!-- <view class="text">Postscript : ontact customer service on the top-left corner for identity
+					</card-header>
+					<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.tranFee+''+item.coinCode"></key-value-row>
+							<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
+						</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>
+								<!-- <view class="text">Postscript : ontact customer service on the top-left corner for identity
 								verific
 							</view> -->
-						</show-more>
-					</view>
+							</show-more>
+						</view>
 
-				</view>
+					</view>
 
 
-				<!-- contarct -->
-			<!-- 	<card-header v-if="form.type === 'online'" iconName="../../static/withdrawal/money-send.png"
+					<!-- contarct -->
+					<!-- 	<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 === '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'"			 
-					 :fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
+					<card-header v-if="form.type === 'online'" iconName="../../static/withdrawal/money-send.png"
+						:title="item.tranAmt+item.coinCode" :rightName="item.orderStatus=='processreview'?i18n.Underreview:item.orderStatus=='processsuccess'?i18n.Success:
+						 item.orderStatus=='processing'?i18n.Processing:item.orderStatus=='processfailed'?i18n.Failed:i18n.Failed"
+						:fontColor="item.orderStatus=='processreview'?'#F2FE8D':item.orderStatus=='processsuccess'?'#00E8A2':
 					item.orderStatus=='processfailed'?'#F4506A':item.orderStatus=='processing'?'#00D1FF':'#A1A0A8'">
-				</card-header>
-				<view class="dataBody" v-if="form.type === 'online'">
-					<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.tranFee+''+item.coinCode"></key-value-row>
-						<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
-					</view>
-					<show-more class="onLineShowMore" style="border-top: 2rpx solid #323045;margin-bottom: 20rpx;">
+					</card-header>
+					<view class="dataBody" v-if="form.type === 'online'">
 						<view style="padding:20rpx 32rpx;">
-							<key-value-row :keyName="i18n.USDTRate" :value="item.usdtRate"></key-value-row>
-							<key-value-row :keyName="i18n.USDT" :value="item.usdtAmount"></key-value-row>
+							<key-value-row :keyName="i18n.OrderID" :value="item.orderNo"></key-value-row>
+							<key-value-row :keyName="i18n.Fees" :value="item.tranFee+''+item.coinCode"></key-value-row>
+							<key-value-row :keyName="i18n.Time" :value="item.addTimeStr"></key-value-row>
 						</view>
-						<view style="border-top: 2rpx solid #323045;padding:20rpx 32rpx;">
-							<key-value-row :keyName="i18n.CardNo" :value="item.acctId">
-							</key-value-row>
-							<key-value-row :keyName="i18n.Bank" :value="item.bankName"></key-value-row>
-							<key-value-row :keyName="i18n.Payee" :value="item.acctName"></key-value-row>
-						<!-- 	<view class="text">Postscript ：ontact customer service on the top-left corner for identity
+						<show-more class="onLineShowMore" style="border-top: 2rpx solid #323045;margin-bottom: 20rpx;">
+							<view style="padding:20rpx 32rpx;">
+								<key-value-row :keyName="i18n.USDTRate" :value="item.usdtRate"></key-value-row>
+								<key-value-row :keyName="i18n.USDT" :value="item.usdtAmount"></key-value-row>
+							</view>
+							<view style="border-top: 2rpx solid #323045;padding:20rpx 32rpx;">
+								<key-value-row :keyName="i18n.CardNo" :value="item.acctId">
+								</key-value-row>
+								<key-value-row :keyName="i18n.Bank" :value="item.bankName"></key-value-row>
+								<key-value-row :keyName="i18n.Payee" :value="item.acctName"></key-value-row>
+								<!-- 	<view class="text">Postscript ：ontact customer service on the top-left corner for identity
 								verific
 							</view> -->
-						</view>
-					</show-more>
+							</view>
+						</show-more>
 
+					</view>
+				</view>
+				<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0"></u-empty>
+				<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
+					:nomore-text="nomoreText" v-if="userInfoObj.length" height="80" />
 				</view>
-			</view>
-			<u-empty :text="i18n.Dataisempty" mode="data" v-if="userInfoObj.length==0"></u-empty>
-			<u-loadmore :status="loadStatus" :loading-text="loadingText" :loadmore-text="loadmoreText"
-				:nomore-text="nomoreText" v-if="userInfoObj.length" height="80" />
-		</view>
 	</view>
 </template>
 
@@ -139,8 +136,8 @@
 		onShow() {},
 		methods: {
 			// 获取类型
-			getType(e){
-				this.userInfoObj=[]
+			getType(e) {
+				this.userInfoObj = []
 				this.form.type = e
 				this.getList()
 			},
@@ -188,10 +185,11 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .digitalShowMore .KeyValueRow .value{
+	/deep/ .digitalShowMore .KeyValueRow .value {
 		position: static !important;
-		word-break: break-all !important;  
+		word-break: break-all !important;
 	}
+
 	.main {
 
 		.head {
diff --git a/utils/api.js b/utils/api.js
index 63ee4c3..f7ca84c 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -81,6 +81,7 @@ const api = {
    
  //--------------------------------- 个人中心 ---------------------------------
    register: (params) => Vue.prototype.$axios.post('/api/index/register',params),//注册
+   agreement: (params) => Vue.prototype.$axios.post('/api/index/agreement',params),//服务协议隐私政策
    login: (params) => Vue.prototype.$axios.post('/api/user/login',params),//登录
    aboutus: (params) => Vue.prototype.$axios.post('/api/index/aboutus',params),//关于我们
    loginOut: (params) => Vue.prototype.$axios.post('/api/user/loginOut',params),//退出登录
diff --git a/utils/constant.js b/utils/constant.js
index f834123..82370c1 100644
--- a/utils/constant.js
+++ b/utils/constant.js
@@ -1,5 +1,5 @@
 
-const IS_TEST = false;
+const IS_TEST = true;
 const H5_BASE_URL = '/api';
 const BASE_URL = IS_TEST?'https://sapi.payairs.com':'https://api.gream.ltd';
 const H5_MARKET_URL = '/market';
diff --git a/utils/language.zip b/utils/language.zip
new file mode 100644
index 0000000..1c940b0
Binary files /dev/null and b/utils/language.zip differ
diff --git a/utils/language/en_US.js b/utils/language/en_US.js
index 291c70d..1837911 100644
--- a/utils/language/en_US.js
+++ b/utils/language/en_US.js
@@ -74,6 +74,9 @@ export default {
 
 	// 首页相关页面
 	home: {
+		// 漏掉的国际化
+		OK: 'OK',
+		
 		// 公共字段
 		HOME: 'HOME',
 		// home首页
@@ -92,6 +95,15 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		// 漏掉的国际化
+		undone:'unsettled',
+		opened:'open position',
+		revoked:'rescinded',
+		closed:'closed position',
+		StopLimit:'Stop/Limit',
+		Markettrades:'Market trades',
+		Target:'Target:',
+		
 		// markets
 		Succeeded:'Succeeded',
 		Dataisempty:'Data is empty',
@@ -160,6 +172,13 @@ export default {
 
 	// recharge
 	recharge: {
+		// 漏掉的国际化
+		Unpaid:'Unpaid',
+		Success:'Success',
+		Failed:'Failed',
+		Paying:'Paying',
+		Closed:'Closed',
+		
 		Dataisempty:'Data is empty',
 		Recharge: 'Recharge',
 		Record: 'Record',
@@ -190,6 +209,14 @@ export default {
 
 	//mine
 	mine: {
+		// 漏掉的
+		Everytimelock:'Every time lock',
+		Lock:'Lock',
+		daysMinepoolLock:'days Mine poolLock',
+		toproduce:'to produce',
+		per1day:'per 1 day',
+		
+		MineRecord:'Mining record',
 		MinePool: 'Mine pool',
 		OpenMine: 'Open mine',
 		MineDetails: 'Mine details',
@@ -217,6 +244,14 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		
+		// 漏掉的国际化
+		Underreview:'Underreview',
+		Success:'Success',
+		Processing:'Processing',
+		processfailed:'Failed',
+		
+		
 		Pleasechoose:'Please choose withdrawl address',
 		Dataisempty:'Data is empty',
 		Withdrawal: 'Withdrawal',
@@ -288,6 +323,18 @@ export default {
 
 	// 申购页面相关 subscription
 	subscription: {
+		
+		// 漏掉的国际化
+		open:"Subscribe",
+		close:"Ended",
+		unstart:"Coming",
+		
+		
+		Reviewing:"Reviewing",
+		Rejected:"Rejected",
+		Completed:"Completed",
+		
+		
 		Subcompleted:'Subscription has been completed',
 		Substarted:'Subscription has not started',
 		Dataisempty:'Data is empty',
@@ -301,7 +348,7 @@ export default {
 		ComingSoon: 'Coming soon',
 		STLTotalCirculation: 'Total circulation',
 		PrivateSalePrice: 'Private sale price',
-		ICOTime: 'ICO Time',
+		ICOTime: 'ICO Time:',
 		// Pending //Complete
 		HeaderPending: 'Pending',
 		HeaderComplete: 'Complete',
@@ -330,6 +377,17 @@ export default {
 
 	//me
 	me: {
+		
+		// 漏掉的
+		Balanceaccount:'Balance account',
+		Contractaccount:'Contract account',
+		Postscript:'Postscript',
+		// 漏掉的国际化
+		Success:'Success',
+		Processing:'Processing',
+		Failed:'Failed',
+		
+		
 		Rebateamount:'Amount',
 		pamount:'Please enter amount',
 		Incomerecord:'Income record',
diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js
index efee0bb..838ce5f 100644
--- a/utils/language/vi_VN.js
+++ b/utils/language/vi_VN.js
@@ -74,6 +74,7 @@ export default {
 
 	// 首页相关页面
 	home: {
+		OK: 'xác định',
 		// 公共字段
 		HOME: 'trang đầu',
 		// home首页
@@ -92,6 +93,16 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		
+		// 漏掉的国际化
+		undone:'Không',
+		opened:'Vị trí mở',
+		revoked:'hủy',
+		closed:'Vị trí khép',
+		StopLimit:'Dừng lợi nhuận/ dừng lỗ',
+		Markettrades:'Buôn bán',
+		Target:'Mục:',
+				
 		// markets
 		Succeeded: 'thành công',
 		Dataisempty: 'dữ liệu trống',
@@ -160,6 +171,13 @@ export default {
 
 	// recharge
 	recharge: {
+		
+		Unpaid:'Chưa trả',
+		Success:'Thành công',
+		Failed:'Lỗi',
+		Paying:'Để thanh toán',
+		Closed:'Đóng',
+		
 		Dataisempty: 'dữ liệu trống',
 		Recharge: 'nạp điện',
 		Record: 'Ghi lại',
@@ -190,6 +208,14 @@ export default {
 
 	//mine
 	mine: {
+		
+		Everytimelock:'Mọi ổ khóa',
+		Lock:'Khóa',
+		daysMinepoolLock:'Khóa hồ Thiên Sơn',
+		toproduce:'Sản',
+		per1day:'mỗi ngày',
+		
+		MineRecord:'Vẽ lưới',
 		Numberofclionts: 'số lượng khách hàng',
 		MinePool: 'nhóm khai thác',
 		OpenMine: 'Khai thác mỏ',
@@ -218,6 +244,13 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		
+		// 漏掉的国际化
+		Underreview:'Đang xem xét',
+		Success:'Thành công',
+		Processing:'Đang tiến hành',
+		processfailed:'Lỗi',
+		
 		Pleasechoose: 'Vui lòng chọn địa chỉ rút tiền',
 		Dataisempty: 'dữ liệu trống',
 		Withdrawal: 'rút',
@@ -289,6 +322,15 @@ export default {
 
 	// 申购页面相关 subscription
 	subscription: {
+		
+		// 漏掉的国际化
+		open:"Đăng ký đang được ký",
+		close:"Xong",
+		unstart:"Chưa bắt đầu",
+		Reviewing:"Đang xem xét",
+		Rejected:"Loại",
+		Completed:"Hoàn",
+		
 		Subcompleted: 'Đăng ký đã hoàn thành',
 		Substarted: 'Đăng ký chưa bắt đầu',
 		Dataisempty: 'dữ liệu trống',
@@ -302,7 +344,7 @@ export default {
 		ComingSoon: 'Sắp có',
 		STLTotalCirculation: 'tổng lưu hành',
 		PrivateSalePrice: 'Giá thuê bao',
-		ICOTime: 'Thời gian ICO',
+		ICOTime: 'Thời gian ICO:',
 		// Pending //Complete
 		HeaderPending: 'Xử lý',
 		HeaderComplete: 'hoàn thành',
@@ -331,6 +373,14 @@ export default {
 
 	//me
 	me: {
+		
+		Balanceaccount:'Tài khoản tùy chọn',
+		Contractaccount:'Hợp đồng',
+		Postscript:'hậu',
+		Success:'Thành công',
+		Processing:'Đang tiến hành',
+		processfailed:'Lỗi',
+		
 		Rebateamount: 'số lượng',
 		Incomerecord: 'Bản ghi giảm giá',
 		Myclient: 'lời mời của tôi',
diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js
index 96883e7..bdf42dc 100644
--- a/utils/language/zh_TW.js
+++ b/utils/language/zh_TW.js
@@ -74,6 +74,8 @@ export default {
 
 	// 首页相关页面
 	home: {
+		OK: '確定',
+		
 		// 公共字段
 		HOME: '首頁',
 		// home首页
@@ -92,6 +94,16 @@ export default {
 
 	// 合约页面相关
 	markets: {
+		// 漏掉的国际化
+		undone:'未成交',
+		opened:'已開倉',
+		revoked:'已撤銷',
+		closed:'已平倉',
+		StopLimit:'止盈/止損',
+		Markettrades:'市場交易',
+		Target:'目標：',
+		
+		
 		// markets
 		Succeeded:'成功',
 		Dataisempty:'數據為空',
@@ -160,6 +172,13 @@ export default {
 
 	// recharge
 	recharge: {
+		
+		Unpaid:'未支付',
+		Success:'已成功',
+		Failed:'已失敗',
+		Paying:'支付中',
+		Closed:'已關閉',
+		
 		Dataisempty:'數據為空',
 		Recharge: '充值',
 		Record: '記錄',
@@ -190,6 +209,14 @@ export default {
 
 	//mine
 	mine: {
+		
+		Everytimelock:'每次鎖定',
+		Lock:'鎖定',
+		daysMinepoolLock:'天礦池鎖',
+		toproduce:'生產',
+		per1day:'每一天',
+		
+		MineRecord:'挖礦記錄',
 		Numberofclionts:'客戶數量',
 		MinePool: '礦池',
 		OpenMine: '開礦',
@@ -218,6 +245,15 @@ export default {
 
 	// withdrawal
 	withdrawal: {
+		
+		// 漏掉的国际化
+		Underreview:'審查中',
+		Success:'已成功',
+		Processing:'進行中',
+		processfailed:'已失敗',
+		
+		
+		
 		Pleasechoose:'請選擇提現地址',
 		Dataisempty:'數據為空',
 		Withdrawal: '提現',
@@ -289,6 +325,15 @@ export default {
 
 	// 申购页面相关 subscription
 	subscription: {
+		// 漏掉的国际化
+		open:"正在申購",
+		close:"已結束",
+		unstart:"未開始",
+		
+		Reviewing:"覆核中",
+		Rejected:"已駁回",
+		Completed:"已完成",
+		
 		Subcompleted:'申購已完成',
 		Substarted:'申購尚未開始',
 		Dataisempty:'數據為空',
@@ -302,7 +347,7 @@ export default {
 		ComingSoon: '快來了',
 		STLTotalCirculation: '總發行量',
 		PrivateSalePrice: '申購價格',
-		ICOTime: 'ICO時間',
+		ICOTime: 'ICO時間：',
 		// Pending //Complete
 		HeaderPending: '處理中',
 		HeaderComplete: '已完成',
@@ -331,6 +376,14 @@ export default {
 
 	//me
 	me: {
+		
+		Balanceaccount:'期權賬戶',
+		Contractaccount:'合約帳戶',
+		Postscript:'後記',
+		Success:'已成功',
+		Processing:'進行中',
+		processfailed:'已失敗',
+		
 		Rebateamount:'金額',
 		Incomerecord:'返佣記錄',
 		Myclient:'我的邀請',