diff --git a/src/api/server/index.js b/src/api/server/index.js
index 538e41b..fa7119c 100644
--- a/src/api/server/index.js
+++ b/src/api/server/index.js
@@ -84,7 +84,8 @@ const exclude = [
`getUserCoinBalance`,
`getKline`,
`getEntrustTradeRecord`,
- `floor`
+ `floor`,
+ `subscribeRecords`
];
let loading = null;
diff --git a/src/api/wallet.js b/src/api/wallet.js
index 14ed412..0e08861 100644
--- a/src/api/wallet.js
+++ b/src/api/wallet.js
@@ -152,4 +152,4 @@ class Wallet {
}
}
-export default Wallet;
\ No newline at end of file
+export default Wallet;
diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue
index 162f20b..0d077c8 100644
--- a/src/components/CommonFooter.vue
+++ b/src/components/CommonFooter.vue
@@ -242,6 +242,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: center;
+ padding: 0 15px;
.item_p{
font-size: 16px;
}
diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue
index 61260e8..2e98ddf 100644
--- a/src/components/CommonHeader.vue
+++ b/src/components/CommonHeader.vue
@@ -177,6 +177,7 @@ export default {
data() {
return {
isDark: false,
+ setp:0,
home: {
label: this.$t("common.homepage"),
url: "/home"
@@ -468,7 +469,22 @@ export default {
Profile.getUserInfo({}).then(res => {
this.userInfo = res
});
- }
+ },
+ // 获取实名信息
+ getAuthInfo() {
+ Profile.getAuthInfo().then(res => {
+ this.detail = res;
+ // 展示页面
+ if (res.primary_status == 0) {
+ this.setp = 0;
+ return;
+ } else if (res.status == 0) {
+ this.setp = 1;
+ } else {
+ this.setp = 2;
+ }
+ }).catch(res => {});
+ },
},
created() {
diff --git a/src/i18n/cn.json b/src/i18n/cn.json
index 208ad39..8ee96d7 100644
--- a/src/i18n/cn.json
+++ b/src/i18n/cn.json
@@ -909,7 +909,8 @@
"k9":"请输入认购码",
"l1":"涨幅比例",
"l2":"保证金",
- "l3":"倍"
+ "l3":"倍",
+ "l4":"当前估值"
},
"otc": {
"a0": "请选择交易类型",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index aa4894b..5a986ee 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -973,7 +973,8 @@
"k8": "Please log in first to apply",
"k9":"Please enter the subscription code",
"l1":"Proportion of increase",
- "l2":"Cost"
+ "l2":"Cost",
+ "l4":"Current valuation"
},
"otc": {
"a0": "Please select transaction type",
diff --git a/src/views/contract/account.vue b/src/views/contract/account.vue
index 3f576fb..db75aeb 100644
--- a/src/views/contract/account.vue
+++ b/src/views/contract/account.vue
@@ -33,7 +33,9 @@
{{accountInfo.unRealProfit}}
-->
-
{{$t('contract.a7')}}(USDT)
+
{{$t('contract.a7')}}
+
+
{{ accountInfo.riskRate || "0%" }}
{{$t('profile.verState')}}:
diff --git a/src/views/purchase/index.vue b/src/views/purchase/index.vue
index 16eb2f6..af84755 100644
--- a/src/views/purchase/index.vue
+++ b/src/views/purchase/index.vue
@@ -7,7 +7,9 @@
{{ detail.coin_name }}
{{ $t("purchase.sendPrice") }}
- 1 {{ detail.coin_name }} = {{ detail.issue_price }} USDT
+ 1 {{ detail.coin_name }} = {{issue_price}}
+
+ USDT
-
+
+
{{ $t("wallet.availableBalance") }}:{{ activeCoin.usable_balance }}
- 1 {{ activeCoin.coin_name }} ≈
- {{ activeCoin.proportion_amount | omitTo(5) }}
+ 1
+
+ USDT
+ ≈
+ {{ 1 / detail.issue_price | omitTo(4)}}
+
{{ detail.coin_name }}
- {{ num || 0 }} {{ activeCoin.coin_name }} ≈ {{ total }}
+ {{ num || 0 }} {{ activeCoin.coin_name }} ≈
+ {{(activeCoin.CurrentPrice/ detail.issue_price)*num | omitTo(4)}}
+
{{ detail.coin_name }}
-->
-
+
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index 12a6509..a29e957 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -117,13 +117,14 @@
- | # |
- {{$t('wallet.assets')}} |
- {{$t('wallet.totalAssets')}} |
- {{$t('wallet.availableBalance')}} |
- {{$t('wallet.fee')}} |
- USD{{$t('wallet.valuation')}} |
- {{$t('wallet.operating')}} |
+ # |
+ {{$t('wallet.assets')}} |
+
+ {{$t('wallet.availableBalance')}} |
+ {{$t('wallet.fee')}} |
+ USD{{$t('wallet.valuation')}} |
+
+ {{$t('wallet.operating')}} |
@@ -133,7 +134,7 @@
{{ item.coin_name }}
- {{ item.freeze_balance|add(item.usable_balance) }} |
+
{{item.usable_balance}} |
{{item.freeze_balance}} |
{{item.usd_estimate}} |
diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue
index ac36dac..52016ea 100644
--- a/src/views/wallet/funding.vue
+++ b/src/views/wallet/funding.vue
@@ -46,7 +46,7 @@
| {{$t('wallet.assets')}} |
{{$t('wallet.date')}} |
- {{$t('wallet.address')}}/{{$t('wallet.hash')}} |
+
{{$t('wallet.num')}} |
{{$t('wallet.progress')}} |
{{$t('wallet.status')}} |
@@ -59,7 +59,7 @@
{{item.coin_name}}
{{item.datetime|parseTime}} |
- {{item.address}} |
+
{{item.amount}} |
-/- |
|