diff --git a/dist.zip b/dist.zip index ac3bf11..f6cb3da 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/scss/module/_contact-us.css b/src/assets/scss/module/_contact-us.css index 026d938..f6da79f 100644 --- a/src/assets/scss/module/_contact-us.css +++ b/src/assets/scss/module/_contact-us.css @@ -2,4 +2,5 @@ background: #cfd6df url("~@/assets/img/concat_us.png"); background-size: cover; max-width: 700px; + height: 210px; } diff --git a/src/assets/scss/module/_contact-us.min.css b/src/assets/scss/module/_contact-us.min.css index 8cd73c2..a38e604 100644 --- a/src/assets/scss/module/_contact-us.min.css +++ b/src/assets/scss/module/_contact-us.min.css @@ -1 +1,2 @@ -.contact-us-page .form-content{background:#cfd6df url("~@/assets/img/concat_us.png");background-size:cover;max-width:700px} +.contact-us-page .form-content{background:#cfd6df url("~@/assets/img/concat_us.png");background-size:cover;max-width:700px; + height: 210px;} diff --git a/src/components/SecondaryNav.vue b/src/components/SecondaryNav.vue index eb967c1..c915df3 100644 --- a/src/components/SecondaryNav.vue +++ b/src/components/SecondaryNav.vue @@ -51,10 +51,11 @@ export default { { url: `/wallet/funding`, label: this.$t('common.rechargeWithdraw') - },{ - url: `/wallet/address`, - label: this.$t('common.addressManagement'), } + // ,{ + // url: `/wallet/address`, + // label: this.$t('common.addressManagement'), + // } ]; }, diff --git a/src/i18n/de.json b/src/i18n/de.json index 58610b2..515b3f7 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -793,9 +793,11 @@ "startSubscription":"Abonnement starten", "endOfSubscription":"Schließen Sie das Abonnement", "announceResults":"Veröffentlichen von Ergebnissen", + "ListedTraded": "Gelistet und gehandelt", "projectCetails":"Details des Projekts", "useOrNot":"Verwenden oder nicht", "subscribe":"für den Kauf", + "SubscriptionPrice":"Einschreibegebühr", "prompt":"Tipps", "subscribeSuccess":"Erfolgreicher Kauf" }, diff --git a/src/i18n/en.json b/src/i18n/en.json index 70bd9b1..9c86b6c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -893,9 +893,11 @@ "startSubscription": "Apply start", "endOfSubscription": "Apply close", "announceResults": "Results release", + "ListedTraded": "Listed and traded", "projectCetails": "Project details", "useOrNot": "Using?", "subscribe": "Apply", + "SubscriptionPrice":"Subscription price", "prompt": "Tips", "subscribeSuccess": "Apply Success" }, diff --git a/src/i18n/fra.json b/src/i18n/fra.json index c30692b..05959d8 100644 --- a/src/i18n/fra.json +++ b/src/i18n/fra.json @@ -793,9 +793,11 @@ "startSubscription":"Début de la souscription", "endOfSubscription":"Clôture de la souscription", "announceResults":"Publication des résultats", + "ListedTraded": "Coté et négocié", "projectCetails":"Détails du projet", "useOrNot":"Oui Non", "subscribe":"Abonnement", + "SubscriptionPrice":"Prix ​​de l'abonnement", "prompt":"Conseils", "subscribeSuccess":"Souscription réussie" }, diff --git a/src/i18n/it.json b/src/i18n/it.json index 6aa93c9..584d672 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -793,9 +793,11 @@ "startSubscription":"Avvia sottoscrizione", "endOfSubscription":"Chiudi l'abbonamento", "announceResults":"Pubblica i risultati", + "ListedTraded": "Quotato e scambiato", "projectCetails":"Dettagli del progetto", "useOrNot":"Uso o no", "subscribe":"domanda per l'acquisto", + "SubscriptionPrice":"Prezzo dell'abbonamento", "prompt":"Suggerimenti", "subscribeSuccess":"Acquisto riuscito" }, diff --git a/src/i18n/jp.json b/src/i18n/jp.json index 8935714..6e2f441 100644 --- a/src/i18n/jp.json +++ b/src/i18n/jp.json @@ -792,9 +792,11 @@ "startSubscription":"申し込みを開始する", "endOfSubscription":"申し込みを終了する", "announceResults":"結果を公表する", + "ListedTraded": "上場および取引される", "projectCetails":"プロジェクトの詳細", "useOrNot":"使用するかどうか", "subscribe":"購入を申請する", + "SubscriptionPrice":"定期購入価格", "prompt":"ヒント", "subscribeSuccess":"申し込み成功" }, diff --git a/src/i18n/kor.json b/src/i18n/kor.json index dc324b6..bfae4ed 100644 --- a/src/i18n/kor.json +++ b/src/i18n/kor.json @@ -792,9 +792,11 @@ "startSubscription":"구 매 신청 을 시작 하 다", "endOfSubscription":"구 매 신청 을 마감 하 다", "announceResults":"결 과 를 발표 하 다", + "ListedTraded": "상장 및 거래", "projectCetails":"프로젝트 정보", "useOrNot":"사용 여부", "subscribe":"구입 을 신청 하 다.", + "SubscriptionPrice":"구독 가격", "prompt":"제시 하 다.", "subscribeSuccess":"구 매 신청 성공" }, diff --git a/src/i18n/pt.json b/src/i18n/pt.json index d8120e2..c297f90 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -793,9 +793,11 @@ "startSubscription":"Início da subscrição", "endOfSubscription":"Fim da subscrição", "announceResults":"Publicação dos resultados", + "ListedTraded": "Listado e negociado", "projectCetails":"Pormenores do projecto", "useOrNot":"São utilizados", "subscribe":"subscrição", + "SubscriptionPrice":"Preço da assinatura", "prompt":"dica", "subscribeSuccess":"O pedido foi aceite." }, diff --git a/src/i18n/spa.json b/src/i18n/spa.json index 52a17a4..5151b19 100644 --- a/src/i18n/spa.json +++ b/src/i18n/spa.json @@ -793,9 +793,11 @@ "startSubscription":"Inicio de la compra", "endOfSubscription":"Cierre de la suscripción", "announceResults":"Publicación de los resultados", + "ListedTraded": "Listado y negociado", "projectCetails":"Detalles del proyecto", "useOrNot":"Usar o no", "subscribe":"Suscripción", + "SubscriptionPrice":"Precio de suscripción", "prompt":"Prompt", "subscribeSuccess":"éxito de la compra" }, diff --git a/src/i18n/tr.json b/src/i18n/tr.json index d0e2891..e857422 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -793,9 +793,11 @@ "startSubscription":"Satın almaya başla", "endOfSubscription":"Aboneliğin sonu", "announceResults":"Sonuçları duyurun", + "ListedTraded": "Listelendi ve işlem gördü", "projectCetails":"Proje detayları", "useOrNot":"kullan ya da kullanma", "subscribe":"Abone ol", + "SubscriptionPrice":"Abonelik ücreti", "prompt":"Komut istemi", "subscribeSuccess":"Başarılı abonelik" }, diff --git a/src/i18n/tw.json b/src/i18n/tw.json index b66d45f..aa893c5 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -835,9 +835,11 @@ "startSubscription": "開始申購", "endOfSubscription": "結束申購", "announceResults": "公佈結果", + "ListedTraded": "上市交易", "projectCetails": "項目詳情", "useOrNot": "是否使用", "subscribe": "申購", + "SubscriptionPrice":"申購價格", "prompt": "提示", "subscribeSuccess": "申購成功" }, diff --git a/src/views/contactUs/index.vue b/src/views/contactUs/index.vue index 5abbe7d..5205281 100644 --- a/src/views/contactUs/index.vue +++ b/src/views/contactUs/index.vue @@ -38,22 +38,22 @@ -->
-
+ +
{{$t('contact.customerService')}}:
-
{{contacts.service}}
+
{{contacts.contact}}
-
+
@@ -121,4 +121,8 @@ export default { diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue index 6fa5a41..7d9641b 100644 --- a/src/views/contract/handicap.vue +++ b/src/views/contract/handicap.vue @@ -146,14 +146,14 @@ export default { }, props: { symbol: { - default: "", - type: String, - required: false + default: "", + type: String, + required: false }, wsUrl: { - default: "", - type: String, - required: true + default: "", + type: String, + required: true }, ws: {} }, @@ -215,8 +215,10 @@ export default { } bus.$on('collapse', msg => { // +字符串转数字 - this.newPriceObj.price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3)); - this.$emit("input", this.newPriceObj); + // this.newPriceObj.price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3)); + // 上面的代码会导致最新价格在几个币种之间跳动 + // let price = +(this.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3)); + // this.$emit("input", price); }); }, // 获取盘口 @@ -286,8 +288,8 @@ export default { this.tradeList.unshift(data); this.tradeList.pop(); // console.info(this.tradeList, 2222222) - // this.newPriceObj = data; - // this.$emit("input", this.newPriceObj); + this.newPriceObj = data; + this.$emit("input", this.newPriceObj); } else if (type == "ping" ||cmd == "ping") { this.ws.send({ cmd: "pong" diff --git a/src/views/contract/hold-position.vue b/src/views/contract/hold-position.vue index 530a4dc..49a5752 100644 --- a/src/views/contract/hold-position.vue +++ b/src/views/contract/hold-position.vue @@ -30,8 +30,8 @@ {{ $t("contract.i3") }} - {{ $t("contract.g9") }} - {{ $t("contract.g3") }} + {{ $t("contract.g9") }} + {{ $t("contract.g3") }} {{ $t("contract.a6") }} {{ $t("contract.h0") }} @@ -48,8 +48,8 @@ {{ item.side == 1 ? $t("contract.i4") : $t("contract.i5") }} - {{ item.avg_price * 1 }} - {{ item.realtimePrice }} + {{ item.avg_price * 1 }} + {{ item.realtimePrice }} {{ (parseFloat(item.unRealProfit)).toFixed(2) }} {{ item.profitRate }} diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index cd75d8e..e69f806 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -166,7 +166,7 @@ class="w-7/24 " :class="item.increase < 0 ? 'decreace' : 'increase'" > - {{ item.price }} + {{ item.close }} { - this.activeContract.price =this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3); - this.holdPositionList.map(item=>{ - if(item.symbol==this.activeContract.symbol) item.realtimePrice=this.activeContract.price - }) - }); + // bus.$on('collapse', msg => { + // // this.activeContract.price =this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3); + // // 上面的代码会导致最新价格在几个币种之间跳动 + // let price = +this.activeContract.symbol=='BTC'? (msg.close).toFixed(1):(msg.close).toFixed(3); + // this.holdPositionList.map(item=>{ + // if(item.symbol==this.activeContract.symbol) item.realtimePrice=price; + // }) + // }); + }, //三秒更新一次数据 mounted: function () { - setInterval(() => { - this.holdPosition(); - }, 2000) + // setInterval(() => { + // this.holdPosition(); + // }, 2000) }, methods: { ispopover1(item){ diff --git a/src/views/exchange/book-trades.vue b/src/views/exchange/book-trades.vue index b8b7869..d3eeb97 100644 --- a/src/views/exchange/book-trades.vue +++ b/src/views/exchange/book-trades.vue @@ -1,5 +1,5 @@