Merge branch 'master' of http://git.liuniu946.com/lhl/nzhbsr

pages/heyue/heyue.vue

@@ -160,7 +160,7 @@
 						持倉
 					</view>
 				</view>
-				<view class="rightBottom flex">
+				<view class="rightBottom flex" @click="navto('/pages/heyue/tradlist')">
 					<image class="img" src="../../static/icon/hy02.png" mode="widthFix"></image>
 					<view class="more">
 						全部訂單
@@ -434,7 +434,8 @@
 							content: '掛單成功',
 							confirmText: '確認',
 							showCancel: false,
-						});
+						});
+						obj.levertadeLaverorder();
 					}).catch(() => {
 						uni.hideLoading()
 						that.upDataLoding = false;
@@ -638,16 +639,6 @@
 							return e;
 						});
 						navItem.list = arr;
-						// navItem.list = navItem.list.concat(arr);
-						// navItem.page++;
-						// if (navItem.limit == list.length) {
-						// 	//判断是否还有数据， 有改为 more， 没有改为noMore
-						// 	navItem.loadingType = 'more';
-						// 	return;
-						// } else {
-						// 	//判断是否还有数据， 有改为 more， 没有改为noMore
-						// 	navItem.loadingType = 'noMore';
-						// }
 						this.$set(navItem, 'loaded', true);
 					})
 					.catch(e => {
@@ -678,6 +669,16 @@
 				item.limit = 10;
 				item.loaded = false;
 				this.levertadeLaverorder();
+			},
+			navto(url) {
+				uni.navigateTo({
+					url,
+					fail() {
+						uni.switchTab({
+							url
+						})
+					}
+				})
 			}
 		}
 	}

pages/heyue/tradlist.vue

@@ -40,8 +40,8 @@
 								開倉時間：{{item.addtime}}
 							</text>
 						</view>
-						<view class="flex">
-							<view v-if="item.direction==1" class="tipList">
+						<view class="flex" style="flex-wrap: wrap;justify-content: flex-start;">
+							<view v-if="current == 0" class="tipList">
 								<view class="nameTip">
 									限價
 								</view>
@@ -49,7 +49,7 @@
 									{{item.wt_price}}
 								</view>
 							</view>
-							<view v-if="item.direction==2" class="tipList">
+							<view v-if="current != 0" class="tipList">
 								<view class="nameTip">
 									開倉單價
 								</view>
@@ -58,17 +58,17 @@
 								</view>
 							</view>
 
-							<view class="tipList">
+							<view class="tipList" v-if="current == 2">
 								<view class="nameTip">
-									保證金
+									平倉單價
 								</view>
 								<view class="text">
-									{{item.bond}}
+									{{item.pc_price}}
 								</view>
 							</view>
 							<view class="tipList">
 								<view class="nameTip">
-									交易個數
+									{{current == 0?'委托手數': '交易個數'}}
 								</view>
 								<view class="text">
 									{{item.num}}
@@ -82,6 +82,51 @@
 									{{item.ggan}}
 								</view>
 							</view>
+							<template v-if="current == 1">
+								<view class="tipList">
+									<view class="nameTip">
+										止盈單價
+									</view>
+									<view class="text">
+										{{item.zyprice}}
+									</view>
+								</view>
+								<view class="tipList">
+									<view class="nameTip">
+										止損單價
+									</view>
+									<view class="text">
+										{{item.zsprice}}
+									</view>
+								</view>
+							</template>
+							<view class="tipList" v-if="current != 0">
+								<view class="nameTip">
+									手續費
+								</view>
+								<view class="text">
+									{{item.fee}}
+								</view>
+							</view>
+							<template v-if="current == 2">
+								<view class="tipList" >
+									<view class="nameTip">
+										盈虧狀態
+									</view>
+									<view class="text" :style="{'color': item.yk_status == 1?'#5DC887':'#dd524d'}">
+										{{item.yk_status == 1?'盈利':'虧損'}}
+									</view>
+								</view>
+								<view class="tipList">
+									<view class="nameTip">
+										盈虧金額
+									</view>
+									<view class="text" :style="{'color': item.yk_status == 1?'#5DC887':'#dd524d'}">
+										{{item.yk_status == 1?'+':'-'}}{{item.ylmoney}}
+									</view>
+								</view>
+							</template>
+							
 						</view>
 					</view>
 				</scroll-view>
@@ -181,6 +226,7 @@
 						list
 					}) => {
 						// uni.hideLoading()
+						console.log(list,'list+++++++')
 						let arr = list.map(e => {
 							e.direction = +e.direction;
 							e.bond = +e.bond
@@ -284,7 +330,7 @@
 	.usdtList {
 		color: #707A8A;
 		border-bottom: 1px solid $border-color-light;
-	
+		
 		.name {
 			font-size: $font-lg;
 			font-weight: bold;
@@ -307,7 +353,10 @@
 		.tipList {
 			font-size: $font-sm;
 			text-align: center;
-	
+			width: 25%;
+			max-width: 33%;
+			padding-top: 20rpx;
+			flex-grow: 1;
 			.nameTip {
 				padding-bottom: 20rpx;
 			}

pages/user/coininfo.vue

@@ -80,7 +80,7 @@
 			<view class="btnbox_b " @click="navto('/pages/transaction/tbdetail?type=' + id)">
 				提幣
 			</view>
-			<view class="btnbox_b " v-if="info.name == 'Wallets-USDT'" @click="navto('/pages/transaction/transfer')">
+			<view class="btnbox_b " v-if="id == 4" @click="navto('/pages/transaction/transfer')">
 				劃轉
 			</view>
 		</view>

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>GRAYSCALE</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d3a37645.js></script><script src=/index/static/js/index.b36ed55a.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d3a37645.js></script><script src=/index/static/js/index.8598c7bb.js></script></body></html>