13，14，15

components/KeyValueRow/KeyValueRow.vue

@@ -11,7 +11,7 @@
         <view class="value"
             :style="{ color: rightColor, fontSize: size || rightSize, lineHeight: lineHeight || lineHeightValue }">{{
                     value
-            }}</view>
+            }} USDT</view>
     </view>
 </template>
 

pages/markets/kLine.vue

@@ -183,10 +183,10 @@
 
 			},
 			onChangeType(type) {
-				this.websock.unSubKline(this.type,this.symbol.symbol);
+				this.websock.unSubKline(this.type, this.symbol.symbol);
 				this.type = type
-				this.websock.subKHistory(this.type,this.symbol.symbol);
+				this.websock.subKHistory(this.type, this.symbol.symbol);
-				this.websock.subKline(this.type,this.symbol.symbol);
+				this.websock.subKline(this.type, this.symbol.symbol);
 			},
 
 			formateDate(time) {
@@ -207,14 +207,22 @@
 				// }
 
 				// return time;
-				var time;
				time=this.$index.formatyymmddhhmmss(parseInt(time * 1000))
				if (this.type === '1mon' ) {
					time =  time.split(' ')[0];
					time=time.substring(time.indexOf('/')+1,time.length)
				} else if (this.type === '1day' || this.type === '1week') {
					time =  time.split(' ')[0];
				}
				return time;
+				var time;
+				time = this.$index.formatyymmddhhmmss(parseInt(time * 1000))
+				if (this.type === '1mon') {
+					time = time.split(' ')[0];
+					time = time.substring(time.indexOf('/') + 1, time.length)
+				} else if (this.type === '1day' || this.type === '1week') {
+					time = time.split(' ')[0];
+				}
+				return time;
 			},
 			getBboList() {
 				const bboList = this.$api.bboList({
 					"symbol": this.symbol.symbol
 				});
 				bboList.then(res => {
-					console.log(9999999,res)
+						console.log(9999999, res)
 						this.bboList = res
 						this.statisticsSum();
 					})
@@ -258,8 +266,8 @@
 						that.websock.setId(data.data);
 						that.websock.subBbo(that.symbol.symbol)
 						that.websock.subDetail(that.symbol.symbol)
-						that.websock.subKHistory(that.type,that.symbol.symbol)
+						that.websock.subKHistory(that.type, that.symbol.symbol)
-						that.websock.subKline(that.type,that.symbol.symbol)
+						that.websock.subKline(that.type, that.symbol.symbol)
 
 					} else if (data.channel === 'market.pairsgroup') {
 						that.symbolList = data.data.USDT;
@@ -333,7 +341,7 @@
 				});
 			},
 			btnClick(type) {
-				uni.setStorageSync('orderType',type);
+				uni.setStorageSync('orderType', type);
 				// #ifdef H5
 				history.back()
 				// #endif
@@ -410,21 +418,21 @@
 				if (!this.is) {
 					console.log("this.is11111111", this.is)
 					this.myChart = echarts.init(chartDom);
-					if(this.kdata.categoryData.length<100){
+					if (this.kdata.categoryData.length < 100) {
-						this.start=50
+						this.start = 50
-						this.end=100
+						this.end = 100
-					}else if(this.kdata.categoryData.length<200){
+					} else if (this.kdata.categoryData.length < 200) {
-						this.start=85
+						this.start = 85
-						this.end=100
+						this.end = 100
-					}else{
+					} else {
-						this.start=98
+						this.start = 98
-						this.end=100
+						this.end = 100
-					}
+					}
-					
+
-				}else{
+				} else {
 					console.log(this.myChart.getModel().option.dataZoom[0].start)
-					this.start=this.myChart.getModel().option.dataZoom[0].start
+					this.start = this.myChart.getModel().option.dataZoom[0].start
-					this.end=this.myChart.getModel().option.dataZoom[0].end
+					this.end = this.myChart.getModel().option.dataZoom[0].end
 				}
 
 
@@ -747,7 +755,7 @@
 			}
 		}
 
-		.headerH5{
+		.headerH5 {
 			background: #000000;
 			margin-top: 122rpx;
 			padding: 0 32rpx;
@@ -852,6 +860,7 @@
 					flex: 1;
 					overflow: hidden;
 					height: 450rpx;
+					margin-bottom: 132rpx;
 
 					.title {
 						display: flex;
@@ -932,7 +941,11 @@
 
 		.btn {
 			display: flex;
-			margin: 96rpx 32rpx;
+			z-index: 999;
+			position: fixed;
+			bottom: 16rpx;
+			left: 2%;
+			width: 96%;
 
 			.button {
 				flex: 1;

pages/recharge/rechargeRecord.vue

@@ -59,7 +59,7 @@
 				<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-(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;">