From ac0a1de620956718a372dbb5fa60e218bcbec573 Mon Sep 17 00:00:00 2001
From: shike <1284707383@qq.com>
Date: Thu, 23 Jul 2020 16:37:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=8F=A3=E4=B9=B0=E5=85=A5=E5=8D=96?=
 =?UTF-8?q?=E5=87=BA/=E8=B5=84=E4=BA=A7=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=A7=A3=E5=B0=81=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/coincoin_assets.vue           | 18 +++++++++++++++++-
 src/views/coincoin/components/trade_depth.vue  | 10 +++++-----
 src/views/release/components/release_deal.vue  | 17 +++++------------
 src/views/release/components/release_depth.vue |  8 ++++----
 .../release/components/release_pair_list.vue   |  1 +
 5 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/src/views/assets/coincoin_assets.vue b/src/views/assets/coincoin_assets.vue
index 8fade3f..2daedd4 100644
--- a/src/views/assets/coincoin_assets.vue
+++ b/src/views/assets/coincoin_assets.vue
@@ -76,6 +76,15 @@
 									</span> -->
 								</div>
 							</th>
+							<th>
+								<div class="cell">
+									{{$t('解封账户')}}
+									<!-- <span class="caret-wrapper">
+										<i class="sort-caret ascending active"></i>
+										<i class="sort-caret descending"></i>
+									</span> -->
+								</div>
+							</th>
 							<th class="is-right">{{$t('操作')}}</th>
 						</tr>
 					</thead>
@@ -95,13 +104,20 @@
 								<div class="cell">{{item.freezeAmount}}</div>
 							</td>
 							<td>
-								<div class="cell">0.0000</div>
+								<div class="cell">
+									{{item.customAssetsTypes[0].assetsType == 'A_I_T_EXPERIENCE' ? item.customAssetsTypes[0].amount : item.customAssetsTypes[1].assetsType == 'A_I_T_EXPERIENCE' ? item.customAssetsTypes[1].amount : 0}}
+								</div>
 							</td>
 							<td>
 								<div class="cell">
 									{{item.customAssetsTypes[0].assetsType == 'A_I_T_LOCK_UP' ? item.customAssetsTypes[0].amount : item.customAssetsTypes[1].assetsType == 'A_I_T_LOCK_UP' ? item.customAssetsTypes[1].amount : 0}}
 								</div>
 							</td>
+							<td>
+								<div class="cell">
+									{{item.customAssetsTypes[0].assetsType == 'A_I_T_UNSEAL' ? item.customAssetsTypes[0].amount : item.customAssetsTypes[1].assetsType == 'A_I_T_UNSEAL' ? item.customAssetsTypes[1].amount : 0}}
+								</div>
+							</td>
 							<td class="is-right">
 								<div class="cell">
 									<ul class="operation-ul nav-dropdown">
diff --git a/src/views/coincoin/components/trade_depth.vue b/src/views/coincoin/components/trade_depth.vue
index dac96d4..5b72922 100644
--- a/src/views/coincoin/components/trade_depth.vue
+++ b/src/views/coincoin/components/trade_depth.vue
@@ -19,8 +19,8 @@
 					<div class="deal-list">
 						<ul v-for="(item, index) of buyDepth" :key="index">
 							<li><span class="red-text">{{item.price}}</span></li>
-							<li><span>{{item.deal}}</span></li>
-							<li><span>1.44</span></li>
+							<li><span>{{item.remain}}</span></li>
+							<li><span>{{item.amount}}</span></li>
 						</ul>
 					</div>
 				</div>
@@ -40,8 +40,8 @@
 					<div class="deal-list">
 						<ul v-for="(item, index) of sellDepth" :key="index">
 							<li><span class="green-text">{{item.price}}</span></li>
-							<li><span>{{item.deal}}</span></li>
-							<li><span>1.44</span></li>
+							<li><span>{{item.remain}}</span></li>
+							<li><span>{{item.amount}}</span></li>
 						</ul>
 					</div>
 				</div>
@@ -114,7 +114,7 @@
 						list.push(item)
 					}
 				});
-				
+				console.log(JSON.stringify(list)+'卖卖卖')
 				return list;
 			},
 		},
diff --git a/src/views/release/components/release_deal.vue b/src/views/release/components/release_deal.vue
index 28be07f..eb3a906 100644
--- a/src/views/release/components/release_deal.vue
+++ b/src/views/release/components/release_deal.vue
@@ -15,18 +15,11 @@
 				</div>
 
 				<div class="deal-folder">
-					<div class="deal-list">
+					<div class="deal-list" v-for="(item,index) of transactions.data" :key="index">
 						<ul>
-							<li><span>10:52:08</span></li>
-							<li><span class="red-text">4784.10</span></li>
-							<li><span>0.4528</span></li>
-						</ul>
-					</div>
-					<div class="deal-list">
-						<ul>
-							<li><span>10:52:08</span></li>
-							<li><span class="red-text">4786.55</span></li>
-							<li><span>0.51865</span></li>
+							<li><span>{{item.date | dateFormat('HH:mm:ss')}}</span></li>
+							<li><span class="red-text">{{item.price}}</span></li>
+							<li><span>{{item.amount}}</span></li>
 						</ul>
 					</div>
 				</div>
@@ -40,7 +33,7 @@
 	export default {
 		name: 'tradeDeal',
 		computed: {
-			...mapState('trend', ['currentPair']),
+			...mapState('trend', ['currentPair','transactions']),
 		},
 	}
 </script>
diff --git a/src/views/release/components/release_depth.vue b/src/views/release/components/release_depth.vue
index dac96d4..aa705d1 100644
--- a/src/views/release/components/release_depth.vue
+++ b/src/views/release/components/release_depth.vue
@@ -19,8 +19,8 @@
 					<div class="deal-list">
 						<ul v-for="(item, index) of buyDepth" :key="index">
 							<li><span class="red-text">{{item.price}}</span></li>
-							<li><span>{{item.deal}}</span></li>
-							<li><span>1.44</span></li>
+							<li><span>{{item.remain}}</span></li>
+							<li><span>{{item.amount}}</span></li>
 						</ul>
 					</div>
 				</div>
@@ -40,8 +40,8 @@
 					<div class="deal-list">
 						<ul v-for="(item, index) of sellDepth" :key="index">
 							<li><span class="green-text">{{item.price}}</span></li>
-							<li><span>{{item.deal}}</span></li>
-							<li><span>1.44</span></li>
+							<li><span>{{item.remain}}</span></li>
+							<li><span>{{item.amount}}</span></li>
 						</ul>
 					</div>
 				</div>
diff --git a/src/views/release/components/release_pair_list.vue b/src/views/release/components/release_pair_list.vue
index 248ec13..fc427a3 100644
--- a/src/views/release/components/release_pair_list.vue
+++ b/src/views/release/components/release_pair_list.vue
@@ -219,6 +219,7 @@
 			// },
 			choosePair(item) { //选择交易对
 				this.$store.dispatch('trend/getNewPair', item);
+				this.$store.dispatch('trend/getTransactions');
 				this.$emit('updateOrder');
 			},