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 @@ --> + +
+ {{$t('解封账户')}} + +
+ {{$t('操作')}} @@ -95,13 +104,20 @@
{{item.freezeAmount}}
-
0.0000
+
+ {{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}} +
{{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}}
+ +
+ {{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}} +
+
@@ -40,8 +40,8 @@
@@ -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 @@
-
+
    -
  • 10:52:08
  • -
  • 4784.10
  • -
  • 0.4528
  • -
-
-
-
    -
  • 10:52:08
  • -
  • 4786.55
  • -
  • 0.51865
  • +
  • {{item.date | dateFormat('HH:mm:ss')}}
  • +
  • {{item.price}}
  • +
  • {{item.amount}}
@@ -40,7 +33,7 @@ export default { name: 'tradeDeal', computed: { - ...mapState('trend', ['currentPair']), + ...mapState('trend', ['currentPair','transactions']), }, } 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 @@
@@ -40,8 +40,8 @@
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'); },