diff --git a/src/App.vue b/src/App.vue index 7a5cbd4..1425bd4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,8 +58,10 @@ export default { getLogo() { Member.getLogo().then(res => { // console.info(res) - this.setAppConfig(res); - this.setConfig(); + if(res){ + this.setAppConfig(res); + this.setConfig(); + } }); }, // 设置应用配置 diff --git a/src/assets/img/icon/tishi.png b/src/assets/img/icon/tishi.png new file mode 100644 index 0000000..7b45fff Binary files /dev/null and b/src/assets/img/icon/tishi.png differ diff --git a/src/assets/img/icon/zhuanzan.png b/src/assets/img/icon/zhuanzan.png new file mode 100644 index 0000000..a85dbd5 Binary files /dev/null and b/src/assets/img/icon/zhuanzan.png differ diff --git a/src/components/KLine.vue b/src/components/KLine.vue index 94de585..b9792de 100644 --- a/src/components/KLine.vue +++ b/src/components/KLine.vue @@ -311,7 +311,7 @@ export default { this.model.subscribe([ { cmd: "sub", - msg: `Kline_${this.symbol}_${this.interval}min` + msg: `Kline_${this.symbol}_1day` } ]); // console.log(this.lang) diff --git a/src/components/SecondaryNav.vue b/src/components/SecondaryNav.vue index dfe7e1f..721492a 100644 --- a/src/components/SecondaryNav.vue +++ b/src/components/SecondaryNav.vue @@ -50,11 +50,16 @@ export default { // }, { url: `/wallet/funding`, - label: this.$t('common.rechargeWithdraw') + // label: this.$t('common.rechargeWithdraw') + label: this.$t('common.c19') },{ url: `/wallet/address`, label: this.$t('common.addressManagement'), - } + }, + { + url: `/wallet/withdrawal`, + label: this.$t('common.c16'), + } ]; }, diff --git a/src/i18n/en.json b/src/i18n/en.json index b9631da..a47f052 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -35,7 +35,8 @@ "c6": "Time of issue", "c7": "White paper address", "c8": "Official website address", - "c9": "brief introduction" + "c9": "brief introduction", + "rejection":"Reason for rejection" }, "common": { "a3": "Purchase records", @@ -188,7 +189,21 @@ "c12": "Rejection Information", "c13": "Withdrawal password", "c14": "Please fill in the withdrawal password", - "c15": "Reset withdrawal password" + "c15": "Reset withdrawal password", + "c16": "Send", + "c17": "Transfer Address", + "c18": "Transfer Amount", + "c19": "Recharge/Transfer", + "c20": "Contact Customer Service", + "c21": "Select Currency", + "c22": "Password and Email Verification Code", + "c23": "Estimated arrival time", + "c24": "Received quantity", + "c25": "Withdrawal", + "c26": "The transfer quantity cannot be greater than {name}", + "c27": "Transfer Records", + "c28": "confirm", + "c29": "Please check your withdrawal address carefully and make sure it is filled in correctly. If you miss or fill in the wrong information, you may lose your assets." }, "exchange": { "search": "Search", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index e1c07ef..d24b42b 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -35,7 +35,8 @@ "c6": "發行時間", "c7": "白皮書地址", "c8": "官網地址", - "c9": "簡介" + "c9": "簡介", + "rejection":"拒絕理由" }, "common": { "a3": "申購記錄", @@ -189,7 +190,21 @@ "c12": "駁回信息", "c13": "提款密碼", "c14": "請填写提款密碼", - "c15": "重置提款密碼" + "c15": "重置提款密碼", + "c16": "轉移", + "c17": "轉移地址", + "c18": "轉移金額", + "c19": "充值/轉移", + "c20": "聯絡客服", + "c21": "選擇幣種", + "c22": "密碼及邮箱驗證碼", + "c23": "預計到帳時間", + "c24": "到帳數量", + "c25": "提現", + "c26": "轉移數量不能大於{name}", + "c27": "轉移記錄", + "c28": "確認", + "c29": "請認真核對您的提幣地址，務必檢查是否正確填寫。如果您漏添或填錯，將有可能對您的資產造成損失" }, "exchange": { "search": "蒐索", diff --git a/src/index.html b/src/index.html index abf4024..7372cd7 100644 --- a/src/index.html +++ b/src/index.html @@ -27,11 +27,14 @@ } } } - if (localStorage.appConfig) { - var config = JSON.parse(localStorage.appConfig); - document.getElementById('appTitle').innerText = config.name - document.getElementById('appIcon').href = config.titles_logo - } + if(!localStorage.token){ + localStorage.clear(); + } + if (localStorage.appConfig&&localStorage.appConfig!==undefined) { + var config = JSON.parse(localStorage.appConfig); + document.getElementById('appTitle').innerText = config.name + document.getElementById('appIcon').href = config.titles_logo + } {{$t('contract.b9')}} @@ -28,6 +29,7 @@ {{item.avg_price||'--'}}/{{ item.entrust_price || "--" }} {{ item.margin * 1 }} {{ item.fee * 1 }} + {{ item.profitRate }} {{item.profit||'--'}} diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 236d99c..083c818 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -47,7 +47,7 @@
{{ item.symbol }}/{{ parent.coin_name }}
- {{ item.price }} + {{item.symbol == activeSymbol ? price1 : item.price}} {{ item.increaseStr }} @@ -60,7 +60,8 @@
-
{{ activeContract.price }}$
+ + {{price1}}$
{{ activeContract.increaseStr }}
@@ -198,7 +199,9 @@ export default { symbolDetail:{}, currentIcon: '', imge:[], - Liste:[] + Liste:[], + price1:0, + intervalId:'' }; }, computed: { @@ -245,6 +248,7 @@ export default { if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price }) }); + this.startWatchingPrice(); }, //三秒更新一次数据 mounted: function () { @@ -254,6 +258,12 @@ export default { }, 2000) }, methods: { + startWatchingPrice(){ + this.intervalId = setInterval(() => { + let newPrice = localStorage.getItem('price'); + this.price1 = newPrice; + }, 10); // 每秒检查一次 + }, ispopover1(item){ this.activeSymbol=item; this.getMarketList(); diff --git a/src/views/profile/certification.vue b/src/views/profile/certification.vue index c350ed9..f63e4e0 100644 --- a/src/views/profile/certification.vue +++ b/src/views/profile/certification.vue @@ -172,7 +172,7 @@
  • 3. {{$t('profile.fileFormat')}}：pdf./ gif./ jpeg./jpg./png.
  • 4. {{$t('profile.maximumFileSize')}}：5 MB
    • - {{$t('profile.clickUpload')}} - - --> + + + + +
    {{$t('profile.positive')}}-{{$t('profile.dragHere')}}{{$t('profile.clickUpload')}}
    +     + + + +
    {{$t('profile.theOtherSide')}}-{{$t('profile.dragHere')}}{{$t('profile.clickUpload')}}
    +     + + :disabled="item.is_withdraw==0">{{$t('wallet.recharge')}} - +
    + +
    +
    {{item.remark}}
    +
    + @@ -149,6 +156,8 @@ + + + \ No newline at end of file diff --git a/static/css/bootstrap.min.css b/static/css/bootstrap.min.css index 3721757..5266405 100644 --- a/static/css/bootstrap.min.css +++ b/static/css/bootstrap.min.css @@ -646,7 +646,8 @@ pre code { .container-md, .container-sm, .container-xl { - max-width: 1140px + /* max-width: 1140px */ + max-width: 1340px } }