luyisha 3 years ago
parent
commit
1ec09d7e88
  1. BIN
      dist.zip
  2. 25
      src/assets/js/tvStyle.js
  3. 4
      src/i18n/cn.json
  4. 4
      src/i18n/de.json
  5. 4
      src/i18n/en.json
  6. 4
      src/i18n/fin.json
  7. 4
      src/i18n/fra.json
  8. 4
      src/i18n/it.json
  9. 4
      src/i18n/jp.json
  10. 4
      src/i18n/kor.json
  11. 4
      src/i18n/pl.json
  12. 4
      src/i18n/pt.json
  13. 4
      src/i18n/spa.json
  14. 4
      src/i18n/swe.json
  15. 4
      src/i18n/tr.json
  16. 4
      src/i18n/tw.json
  17. 4
      src/i18n/ukr.json
  18. 53
      src/views/contract/exchange-store.vue
  19. 348
      src/views/contract/index.vue
  20. 3
      src/views/exchange/book-trades.vue
  21. 4
      src/views/exchange/index.vue
  22. 2
      src/views/exchange/make-deal.vue
  23. 20
      src/views/exchange/order-list.vue
  24. 49
      src/views/home/index.vue
  25. 6
      static/Kline/datafeeds/socket/wsconfig.js

BIN
dist.zip

Binary file not shown.

25
src/assets/js/tvStyle.js

@ -1,16 +1,25 @@
// let light={
// // "paneProperties.background": "#ffffff",
// // "paneProperties.vertGridProperties.color": "#dcdee0",
// // "paneProperties.horzGridProperties.color": "#dcdee0",
// // "scalesProperties.backgroundColor": "#ffffff",
// // "scalesProperties.textColor" : "#333"
// }
let light={ let light={
// "paneProperties.background": "#ffffff", "paneProperties.background": "#FAFAFA",
// "paneProperties.vertGridProperties.color": "#dcdee0", "paneProperties.vertGridProperties.color": "#ffffff",
// "paneProperties.horzGridProperties.color": "#dcdee0", "paneProperties.horzGridProperties.color": "#ffffff",
// "scalesProperties.backgroundColor": "#ffffff", "scalesProperties.backgroundColor": "#222e3d",
// "scalesProperties.textColor" : "#333" "scalesProperties.textColor" : "#7b9ca7"
} }
let dark = { let dark = {
// "paneProperties.background": "#222e3d", // "paneProperties.background": "#222e3d",
"paneProperties.background": "#FAFAFA", "paneProperties.background": "#FAFAFA",
"paneProperties.vertGridProperties.color": "#646566", // "paneProperties.vertGridProperties.color": "#646566",
"paneProperties.horzGridProperties.color": "#646566", "paneProperties.vertGridProperties.color": "#ffffff",//修改生效
// "paneProperties.horzGridProperties.color": "#646566",
"paneProperties.horzGridProperties.color": "#ffffff",
"scalesProperties.backgroundColor": "#222e3d", "scalesProperties.backgroundColor": "#222e3d",
"scalesProperties.textColor" : "#7b9ca7" "scalesProperties.textColor" : "#7b9ca7"
} }

4
src/i18n/cn.json

@ -1203,6 +1203,8 @@
"a100":"向账户充值", "a100":"向账户充值",
"a101":"初级认证", "a101":"初级认证",
"c0":"关于我们", "c0":"关于我们",
"c1":"用户支持" "c1":"用户支持",
"c3":"24小时成交量",
"c4":"合约列表"
} }
} }

4
src/i18n/de.json

@ -1141,6 +1141,8 @@
"a101":"Primärzertifizierung", "a101":"Primärzertifizierung",
"c0":"über uns", "c0":"über uns",
"c1":"Benutzer-Support", "c1":"Benutzer-Support",
"c2":"Die auf dieser Website bereitgestellten Informationen stellen keine Anlageberatung, Finanzberatung, Handelsberatung oder andere Arten von Beratung dar, und Sie sollten die Inhalte dieser Website nicht als solche betrachten. Kryptowährungsinvestitionen sind volatil und äußerst riskant. Investieren Sie nicht mehr, als Sie sich leisten können, zu verlieren." "c2":"Die auf dieser Website bereitgestellten Informationen stellen keine Anlageberatung, Finanzberatung, Handelsberatung oder andere Arten von Beratung dar, und Sie sollten die Inhalte dieser Website nicht als solche betrachten. Kryptowährungsinvestitionen sind volatil und äußerst riskant. Investieren Sie nicht mehr, als Sie sich leisten können, zu verlieren.",
"c3":"24-Stunden-Handelsvolumen",
"c4":"Vertragsliste"
} }
} }

4
src/i18n/en.json

@ -1258,6 +1258,8 @@
"a101":" Primary Certification ", "a101":" Primary Certification ",
"c0":"About us", "c0":"About us",
"c1":"User Support", "c1":"User Support",
"c2":"Information provided on this site does not constitute investment advice, financial advice, trading advice or other types of advice, and you should not regard any content on this site as such. Cryptocurrency investments are volatile and highly risky. Do not invest more than you can afford to lose." "c2":"Information provided on this site does not constitute investment advice, financial advice, trading advice or other types of advice, and you should not regard any content on this site as such. Cryptocurrency investments are volatile and highly risky. Do not invest more than you can afford to lose.",
"c3":"24 hours trading volume",
"c4":"contract list"
} }
} }

4
src/i18n/fin.json

@ -1137,7 +1137,9 @@
"a99":" Et ole suorittanut oikean nimen todennusta, ", "a99":" Et ole suorittanut oikean nimen todennusta, ",
"b99":"siirry todentamiseen ", "b99":"siirry todentamiseen ",
"a100":" Lataa tili uudelleen ", "a100":" Lataa tili uudelleen ",
"a101":" Ensisijainen sertifiointi " "a101":" Ensisijainen sertifiointi ",
"c3":"",
"c4":""
} }
} }

4
src/i18n/fra.json

@ -1141,6 +1141,8 @@
"a101": "Certification primaire", "a101": "Certification primaire",
"c0":"à propos de nous", "c0":"à propos de nous",
"c1":"assistance aux utilisateurs", "c1":"assistance aux utilisateurs",
"c2":"Les informations fournies sur ce site ne constituent pas des conseils en investissement, des conseils financiers, des conseils commerciaux ou d'autres types de conseils, et vous ne devez pas considérer le contenu de ce site comme tel. Les investissements en crypto-monnaie sont volatils et très risqués. N'investissez pas plus que vous ne pouvez vous permettre de perdre." "c2":"Les informations fournies sur ce site ne constituent pas des conseils en investissement, des conseils financiers, des conseils commerciaux ou d'autres types de conseils, et vous ne devez pas considérer le contenu de ce site comme tel. Les investissements en crypto-monnaie sont volatils et très risqués. N'investissez pas plus que vous ne pouvez vous permettre de perdre.",
"c3":"Volume de transactions sur 24 heures",
"c4":"liste des contrats"
} }
} }

4
src/i18n/it.json

@ -1141,7 +1141,9 @@
"a101": " Certificazione primaria ", "a101": " Certificazione primaria ",
"c0":"chi siamo", "c0":"chi siamo",
"c1":"supporto all'utente", "c1":"supporto all'utente",
"c2":"Le informazioni fornite su questo sito non costituiscono consulenza di investimento, consulenza finanziaria, consulenza commerciale o altri tipi di consulenza e non dovresti considerare alcun contenuto di questo sito come tale. Gli investimenti in criptovalute sono volatili e altamente rischiosi. Non investire più di quanto puoi permetterti di perdere." "c2":"Le informazioni fornite su questo sito non costituiscono consulenza di investimento, consulenza finanziaria, consulenza commerciale o altri tipi di consulenza e non dovresti considerare alcun contenuto di questo sito come tale. Gli investimenti in criptovalute sono volatili e altamente rischiosi. Non investire più di quanto puoi permetterti di perdere.",
"c3":"Volume di scambi di 24 ore",
"c4":"lista dei contratti"
} }
} }

4
src/i18n/jp.json

@ -1140,6 +1140,8 @@
"a101":"一次認証", "a101":"一次認証",
"c0":"私たちに関しては", "c0":"私たちに関しては",
"c1":"ユーザーサポート", "c1":"ユーザーサポート",
"c2":"このサイトで提供される情報は、投資アドバイス、財務アドバイス、取引アドバイス、またはその他の種類のアドバイスを構成するものではなく、このサイトのコンテンツをそのようにみなすべきではありません。 暗号通貨への投資は不安定で、非常にリスクが高くなります。 損失を許容できる以上に投資しないでください。" "c2":"このサイトで提供される情報は、投資アドバイス、財務アドバイス、取引アドバイス、またはその他の種類のアドバイスを構成するものではなく、このサイトのコンテンツをそのようにみなすべきではありません。 暗号通貨への投資は不安定で、非常にリスクが高くなります。 損失を許容できる以上に投資しないでください。",
"c3":"24時間の取引高",
"c4":"契約一覧"
} }
} }

4
src/i18n/kor.json

@ -1140,7 +1140,9 @@
"a101":" 기본 인증 ", "a101":" 기본 인증 ",
"c0":"회사 소개", "c0":"회사 소개",
"c1":"사용자 지원", "c1":"사용자 지원",
"c2":"이 사이트에서 제공되는 정보는 투자 조언, 재정 조언, 거래 조언 또는 기타 유형의 조언을 구성하지 않으며 이 사이트의 어떤 내용도 그러한 것으로 간주해서는 안 됩니다. 암호화폐 투자는 변동성이 크고 매우 위험합니다. 감당할 수 있는 손실 이상으로 투자하지 마십시오." "c2":"이 사이트에서 제공되는 정보는 투자 조언, 재정 조언, 거래 조언 또는 기타 유형의 조언을 구성하지 않으며 이 사이트의 어떤 내용도 그러한 것으로 간주해서는 안 됩니다. 암호화폐 투자는 변동성이 크고 매우 위험합니다. 감당할 수 있는 손실 이상으로 투자하지 마십시오.",
"c3":"24시간 거래량",
"c4":"계약 목록"
} }
} }

4
src/i18n/pl.json

@ -1137,6 +1137,8 @@
"a99":"Nie ukończyłeś uwierzytelniania prawdziwego nazwiska, ", "a99":"Nie ukończyłeś uwierzytelniania prawdziwego nazwiska, ",
"b99":"przejdź do uwierzytelniania ", "b99":"przejdź do uwierzytelniania ",
"a100":" Doładuj konto", "a100":" Doładuj konto",
"a101":" Podstawowa certyfikacja" "a101":" Podstawowa certyfikacja",
"c3":"24-godzinny wolumen obrotu",
"c4":""
} }
} }

4
src/i18n/pt.json

@ -1141,7 +1141,9 @@
"a101":" Certificação Primária ", "a101":" Certificação Primária ",
"c0":"sobre nós", "c0":"sobre nós",
"c1":"Suporte ao usuário", "c1":"Suporte ao usuário",
"c2":"As informações fornecidas neste site não constituem consultoria de investimento, consultoria financeira, consultoria comercial ou outros tipos de consultoria, e você não deve considerar nenhum conteúdo deste site como tal. Os investimentos em criptomoedas são voláteis e altamente arriscados. Não invista mais do que você pode perder." "c2":"As informações fornecidas neste site não constituem consultoria de investimento, consultoria financeira, consultoria comercial ou outros tipos de consultoria, e você não deve considerar nenhum conteúdo deste site como tal. Os investimentos em criptomoedas são voláteis e altamente arriscados. Não invista mais do que você pode perder.",
"c3":"Volume de negociação de 24 horas",
"c4":"lista de contratos"
} }
} }

4
src/i18n/spa.json

@ -1141,7 +1141,9 @@
"a101": " Certificación Primaria ", "a101": " Certificación Primaria ",
"c0":"sobre nosotros", "c0":"sobre nosotros",
"c1":"soporte al usuario", "c1":"soporte al usuario",
"c2":"La información proporcionada en este sitio no constituye asesoramiento de inversión, asesoramiento financiero, asesoramiento comercial u otro tipo de asesoramiento, y no debe considerar ningún contenido de este sitio como tal. Las inversiones en criptomonedas son volátiles y altamente riesgosas. No invierta más de lo que puede permitirse perder." "c2":"La información proporcionada en este sitio no constituye asesoramiento de inversión, asesoramiento financiero, asesoramiento comercial u otro tipo de asesoramiento, y no debe considerar ningún contenido de este sitio como tal. Las inversiones en criptomonedas son volátiles y altamente riesgosas. No invierta más de lo que puede permitirse perder.",
"c3":"Volumen de negociación de 24 horas",
"c4":"lista de contratos"
} }
} }

4
src/i18n/swe.json

@ -1137,6 +1137,8 @@
"a99":" Du har inte slutfört autentiseringen med riktiga namn, " , "a99":" Du har inte slutfört autentiseringen med riktiga namn, " ,
"b99":"gå till autentiseringen ", "b99":"gå till autentiseringen ",
"a100":" Ladda om kontot ", "a100":" Ladda om kontot ",
"a101":" Primär certifiering " "a101":" Primär certifiering ",
"c3":"24 timmars handelsvolym",
"c4":""
} }
} }

4
src/i18n/tr.json

@ -1141,6 +1141,8 @@
"a101":" Birincil Sertifika ", "a101":" Birincil Sertifika ",
"c0":"Hakkımızda", "c0":"Hakkımızda",
"c1":"Kullanıcı desteği", "c1":"Kullanıcı desteği",
"c2":"Bu sitede verilen bilgiler yatırım tavsiyesi, finansal tavsiye, alım satım tavsiyesi veya diğer türden tavsiyeler teşkil etmez ve bu sitedeki hiçbir içeriği bu şekilde değerlendirmemelisiniz. Kripto para yatırımları değişken ve oldukça risklidir. Kaybetmeyi göze alabileceğinizden daha fazla yatırım yapmayın." "c2":"Bu sitede verilen bilgiler yatırım tavsiyesi, finansal tavsiye, alım satım tavsiyesi veya diğer türden tavsiyeler teşkil etmez ve bu sitedeki hiçbir içeriği bu şekilde değerlendirmemelisiniz. Kripto para yatırımları değişken ve oldukça risklidir. Kaybetmeyi göze alabileceğinizden daha fazla yatırım yapmayın.",
"c3":"24 saatlik işlem hacmi",
"c4":"sözleşme listesi"
} }
} }

4
src/i18n/tw.json

@ -1204,6 +1204,8 @@
"a101":"初級認證", "a101":"初級認證",
"c0":"關於我們", "c0":"關於我們",
"c1":"用戶支持", "c1":"用戶支持",
"c2":"本網站提供的信息不構成投資建議、財務建議、交易建議或其他類型的建議,你不應將本網站的任何內容視爲此類內容。加密貨幣投資具有波動性和高風險性。不要投資超過你能承受的損失。" "c2":"本網站提供的信息不構成投資建議、財務建議、交易建議或其他類型的建議,你不應將本網站的任何內容視爲此類內容。加密貨幣投資具有波動性和高風險性。不要投資超過你能承受的損失。",
"c3":"24小時成交量",
"c4":"合約列表"
} }
} }

4
src/i18n/ukr.json

@ -1137,7 +1137,9 @@
"a99":" Ви не завершили автентифікацію справжнього імені, ", "a99":" Ви не завершили автентифікацію справжнього імені, ",
"b99":"перейдіть до автентифікації ", "b99":"перейдіть до автентифікації ",
"a100":" Поповнити рахунок ", "a100":" Поповнити рахунок ",
"a101":" Первинна сертифікація " "a101":" Первинна сертифікація ",
"c3":"Обсяг торгів за 24 години",
"c4":""
} }
} }

53
src/views/contract/exchange-store.vue

@ -1,16 +1,16 @@
<template> <template>
<div class="markets-pair-list exchange-store bg-plain ex-s-p-c"> <div class="markets-pair-list exchange-store bg-plain ex-s-p-c">
<div class="nav nav-pills" style="align-items: center;width:180px;"> <div class="nav nav-pills" style="align-items: center;width:180px;" v-if="0">
<div class="nav-item" :class="{ active: tab == 1 }"> <div class="nav-item" :class="{ active: tab == 1 }">
<a class="nav-link" :class="{ active: tab == 1 }" @click="tab = 1">{{ <a class="nav-link" :class="{ active: tab == 1 }" @click="tab = 1">{{
$t("contract.d5") $t("contract.d5")
}}</a> }}</a>
</div> </div>
<!-- <div class="nav-item"> <div class="nav-item">
<a class="nav-link" :class="{ active: tab == 2 }" @click="tab = 2">{{ <a class="nav-link" :class="{ active: tab == 2 }" @click="tab = 2">{{
$t("contract.d6") $t("contract.d6")
}}</a> }}</a>
</div> --> </div>
<div class="flex-fill d-flex align-items-center"> <div class="flex-fill d-flex align-items-center">
<el-popover <el-popover
placement="bottom" placement="bottom"
@ -44,6 +44,43 @@
</div> </div>
</div> </div>
<div class="content-box"> <div class="content-box">
<div class="nav-item" :class="{ active: tab == 1 }" style="flex-shrink:0;">
<a class="nav-link" :class="{ active: tab == 1 }" @click="tab = 1">{{
$t("contract.d5")
}}</a>
</div>
<div class="d-flex align-items-center" style="flex-shrink:0;">
<el-popover
placement="bottom"
width="100"
v-model="visible"
trigger="manual"
>
<div
class="rounded border p-1 bg-black pointer"
slot="reference" style="color: #999;"
@click="visible = !visible"
>
{{ $t("contract.b0") }}
<span class="fn-16"> {{ form.lever_rate }}X </span>
<i class="el-icon-edit text-primary"></i>
</div>
<div class="list">
<div
class="el-select-dropdown__item"
@click="
selectLever(item);
visible = false;
"
v-for="item in lever_rage"
:key="item"
>
{{ item }}X
</div>
</div>
</el-popover>
</div>
<div class="line-A"></div>
<div v-if="type == 2" class="input-group my-4 input-group-sm"> <div v-if="type == 2" class="input-group my-4 input-group-sm">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text">{{ $t("contract.d7") }}</span> <span class="input-group-text">{{ $t("contract.d7") }}</span>
@ -78,6 +115,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="line-A"></div>
<div class="d-flex align-items-center px-2"> <div class="d-flex align-items-center px-2">
<div class="input-group-a"> <div class="input-group-a">
<div class="input-group-append"> <div class="input-group-append">
@ -127,6 +165,7 @@
<span class="input-group-text">{{ $t("contract.e2") }}</span> <span class="input-group-text">{{ $t("contract.e2") }}</span>
</div> --> </div> -->
</div> </div>
<div class="line-A"></div>
<div style="width:200px;margin:0px 12px;"> <div style="width:200px;margin:0px 12px;">
<div class="px-2" v-if="this.tab == 1"> <div class="px-2" v-if="this.tab == 1">
<el-slider <el-slider
@ -167,6 +206,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="line-A"></div>
<div class="exchange_button" v-if="tab == 1" style="color: #999;"> <div class="exchange_button" v-if="tab == 1" style="color: #999;">
<div class="px-2 flex-fill"> <div class="px-2 flex-fill">
<button <button
@ -523,6 +563,7 @@ export default {
.ex-s-p-c{ .ex-s-p-c{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
border-top: 1px solid; border-top: 1px solid;
padding: 10px 0px; padding: 10px 0px;
} }
@ -537,4 +578,10 @@ export default {
-ms-flex-align: stretch; -ms-flex-align: stretch;
align-items: stretch; align-items: stretch;
} }
.line-A{
width: 1px;
height: 40px;
background-color: #f5f5f5;
margin: 0px 10px;
}
</style> </style>

348
src/views/contract/index.vue

@ -8,179 +8,189 @@
<!-- </el-carousel>--> <!-- </el-carousel>-->
<!-- </div>--> <!-- </div>-->
<div class="page-top d-flex pt-2"> <div class="page-top d-flex pt-2">
<!-- 左边侧边栏 -->
<div> <div class="flex-fill">
<template v-for="parent in contractList"> <!-- 左边盒子顶部 -->
<!-- <div class="px-3 text-primary" :key="parent.coin_name"> <div class="d-flex">
{{ parent.coin_name }} <!-- 左侧边栏 -->
</div> --> <div>
<table class="table" :key="parent.coin_name + 1"> <template v-for="parent in contractList">
<thead> <!-- <div class="px-3 text-primary" :key="parent.coin_name">
<tr class="text-secondary"> {{ parent.coin_name }}
<th class="w-10/24 tr-text">{{ $t("contract.h5") }}</th> </div> -->
<!-- <th class="w-7/24 tr-text">{{ $t("contract.g3") }}</th> --> <table class="table" :key="parent.coin_name + 1">
<!-- <th class="w-7/24 text-right tr-text"> <thead>
{{ $t("contract.h6") }} <tr class="text-secondary">
</th> --> <th class="w-10/24 tr-text">{{ $t("xtzcoins3.c4") }}</th>
</tr> <th class="w-7/24 tr-text">{{ $t("contract.g3") }}</th>
</thead> <th class="w-7/24 text-right tr-text">
<tbody> {{ $t("contract.h6") }}
<!-- @click="activeSymbol = item.symbol" --> </th>
<tr </tr>
v-for="item in parent.marketInfoList" </thead>
:key="item.symbol" <tbody>
:class="{ active: item.symbol == activeSymbol }" <!-- @click="activeSymbol = item.symbol" -->
@click="ispopover1(item.symbol)" <tr
> v-for="item in parent.marketInfoList"
<td class="w-10/24 tr-text"> :key="item.symbol"
{{ item.symbol }}/{{ parent.coin_name }} :class="{ active: item.symbol == activeSymbol }"
</td> @click="ispopover1(item.symbol)"
<!-- <td >
class="w-7/24 " <td class="w-10/24 tr-text">
:class="item.increase < 0 ? 'decreace' : 'increase'" {{ item.symbol }}/{{ parent.coin_name }}
> </td>
{{ item.price }} <td
</td> class="w-7/24 "
<td :class="item.increase < 0 ? 'decreace' : 'increase'"
class="w-7/24" >
:class="item.increase < 0 ? 'decreace' : 'increase'" {{ item.price }}
> </td>
{{ item.increaseStr }} <td
</td> --> class="w-7/24"
</tr> :class="item.increase < 0 ? 'decreace' : 'increase'"
</tbody> >
</table> {{ item.increaseStr }}
</template> </td>
</div> </tr>
<!-- K线图上面 --> </tbody>
<div class="kline-box flex-fill mr-2"> </table>
<div </template>
class="coin-change d-flex align-items-center py-2 pl-4 heading justify-content-between" </div>
>
<div class="d-flex align-items-center"> <!-- -->
<div class="coin d-flex align-items-center" v-if="0"> <div class="kline-box flex-fill mr-2">
<el-popover <!-- K线图上面 -->
placement="bottom"
ref="popover"
width="400"
trigger="click"
>
<div slot="reference">
{{ activeContract.pair_name }}
<el-button size="mini">
<i class="el-icon-arrow-down"></i>
</el-button>
</div>
<div
class="markets-pair-list"
style="max-height:300px;overflow:auto;"
>
<template v-for="parent in contractList">
<div class="px-3 text-primary" :key="parent.coin_name">
{{ parent.coin_name }}
</div>
<table class="table" :key="parent.coin_name + 1">
<thead>
<tr class="text-secondary">
<th class="w-10/24 tr-text">{{ $t("contract.h5") }}</th>
<th class="w-7/24 tr-text">{{ $t("contract.g3") }}</th>
<th class="w-7/24 text-right tr-text">
{{ $t("contract.h6") }}
</th>
</tr>
</thead>
<tbody>
<!-- @click="activeSymbol = item.symbol" -->
<tr
v-for="item in parent.marketInfoList"
:key="item.symbol"
:class="{ active: item.symbol == activeSymbol }"
@click="ispopover1(item.symbol)"
>
<td class="w-10/24 tr-text">
{{ item.symbol }}/{{ parent.coin_name }}
</td>
<td
class="w-7/24 "
:class="item.increase < 0 ? 'decreace' : 'increase'"
>
{{ item.price }}
</td>
<td
class="w-7/24"
:class="item.increase < 0 ? 'decreace' : 'increase'"
>
{{ item.increaseStr }}
</td>
</tr>
</tbody>
</table>
</template>
</div>
</el-popover>
</div>
<div <div
class="price px-3 border-right" class="coin-change d-flex align-items-center py-2 pl-4 heading justify-content-between"
:class="{
decreace: activeContract.increase < 0,
increase: activeContract.increase >= 0
}"
> >
<span class="current">{{ activeContract.price }}$</span> <div class="d-flex align-items-center">
&nbsp; <div class="coin d-flex align-items-center" v-if="0">
<span class="zf">{{ activeContract.increaseStr }}</span> <el-popover
</div> placement="bottom"
<!-- 币种价值数据 --> ref="popover"
<div class="d-flex fn-12"> width="400"
<div class="item px-2"> trigger="click"
<div class="title mb-1 text-secondary"> >
24h {{ $t("contract.h7") }} <div slot="reference">
</div> {{ activeContract.pair_name }}
<div> <el-button size="mini">
{{ activeContract.high }} <i class="el-icon-arrow-down"></i>
</div> </el-button>
</div> </div>
<div class="item px-2"> <div
<div class="title mb-1 text-secondary"> class="markets-pair-list"
24h {{ $t("contract.h8") }} style="max-height:300px;overflow:auto;"
</div> >
<div> <template v-for="parent in contractList">
{{ activeContract.low }} <div class="px-3 text-primary" :key="parent.coin_name">
{{ parent.coin_name }}
</div>
<table class="table" :key="parent.coin_name + 1">
<thead>
<tr class="text-secondary">
<th class="w-10/24 tr-text">{{ $t("contract.h5") }}</th>
<th class="w-7/24 tr-text">{{ $t("contract.g3") }}</th>
<th class="w-7/24 text-right tr-text">
{{ $t("contract.h6") }}
</th>
</tr>
</thead>
<tbody>
<!-- @click="activeSymbol = item.symbol" -->
<tr
v-for="item in parent.marketInfoList"
:key="item.symbol"
:class="{ active: item.symbol == activeSymbol }"
@click="ispopover1(item.symbol)"
>
<td class="w-10/24 tr-text">
{{ item.symbol }}/{{ parent.coin_name }}
</td>
<td
class="w-7/24 "
:class="item.increase < 0 ? 'decreace' : 'increase'"
>
{{ item.price }}
</td>
<td
class="w-7/24"
:class="item.increase < 0 ? 'decreace' : 'increase'"
>
{{ item.increaseStr }}
</td>
</tr>
</tbody>
</table>
</template>
</div>
</el-popover>
</div> </div>
</div> <div
<div class="item px-2"> class="price px-3 border-right"
<div class="title mb-1 text-secondary"> :class="{
24h {{ $t("contract.h9") }} decreace: activeContract.increase < 0,
<!-- {{ $t("contract.e2") }} --> increase: activeContract.increase >= 0
(USDT) }"
>
<span class="current">{{ activeContract.price }}$</span>
&nbsp;
<span class="zf">{{ activeContract.increaseStr }}</span>
</div> </div>
<div> <!-- 币种价值数据 -->
{{ activeContract.vol }} <div class="d-flex fn-12">
<div class="item px-2">
<div class="title mb-1 text-secondary">
24h {{ $t("contract.h7") }}
</div>
<div>
{{ activeContract.high }}
</div>
</div>
<div class="item px-2">
<div class="title mb-1 text-secondary">
24h {{ $t("contract.h8") }}
</div>
<div>
{{ activeContract.low }}
</div>
</div>
<div class="item px-2">
<div class="title mb-1 text-secondary">
24h {{ $t("contract.h9") }}
<!-- {{ $t("contract.e2") }} -->
(USDT)
</div>
<div>
{{ activeContract.vol }}
</div>
</div>
</div> </div>
</div> </div>
<!-- <div><theme-change /></div> -->
</div> </div>
<!-- K线图 -->
<kline
:activeCoin="{ pair_name: activeContract.pair_name }"
v-if="activeContract.pair_name"
:contract="true"
:wsUrl="wsUrl"
/>
</div> </div>
<!-- <div><theme-change /></div> -->
</div> </div>
<!-- K线图 --> <!-- 左边盒子底部交易 -->
<kline
:activeCoin="{ pair_name: activeContract.pair_name }"
v-if="activeContract.pair_name"
:contract="true"
:wsUrl="wsUrl"
/>
<!-- 交易 -->
<exchange-store <exchange-store
:holdPositionList="holdPositionList" :holdPositionList="holdPositionList"
:symbol="activeSymbol" :symbol="activeSymbol"
:defaultPrice="defaultPrice" :defaultPrice="defaultPrice"
:newPriceObj="newPriceObj" :newPriceObj="newPriceObj"
:contractOpen="contractOpen" :contractOpen="contractOpen"
@accountInfo="accountInfo = $event" @accountInfo="accountInfo = $event"
@position="holdPosition" @position="holdPosition"
@getSymbolDetail="symbolDetail=$event" @getSymbolDetail="symbolDetail=$event"
/> />
</div> </div>
<!-- 盘口 --> <!-- 盘口 -->
<handicap <handicap
@input="newPriceObj = $event" @input="newPriceObj = $event"
@ -191,17 +201,6 @@
class="mr-2" class="mr-2"
ref="handicap" ref="handicap"
/> />
<!-- 交易 改到k下面去了 -->
<exchange-store v-if="0"
:holdPositionList="holdPositionList"
:symbol="activeSymbol"
:defaultPrice="defaultPrice"
:newPriceObj="newPriceObj"
:contractOpen="contractOpen"
@accountInfo="accountInfo = $event"
@position="holdPosition"
@getSymbolDetail="symbolDetail=$event"
/>
</div> </div>
<page-bottom <page-bottom
@position="holdPosition" @position="holdPosition"
@ -455,4 +454,7 @@ export default {
td.tr-text{ td.tr-text{
color: #578F45 !important; color: #578F45 !important;
} }
.table tbody tr{
cursor: pointer;
}
</style> </style>

3
src/views/exchange/book-trades.vue

@ -374,7 +374,7 @@ export default {
// flex-grow: 1; // flex-grow: 1;
// } // }
td { td {
cursor: text !important; cursor:pointer;
} }
} }
} }
@ -409,4 +409,5 @@ export default {
.ob-heading{ .ob-heading{
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
} }
</style> </style>

4
src/views/exchange/index.vue

@ -107,6 +107,7 @@ export default {
ordersHistory: { ordersHistory: {
total: 0, total: 0,
data: []
}, },
conditionOrders: { conditionOrders: {
@ -359,7 +360,6 @@ export default {
this.getConditions(); this.getConditions();
} else if (this.currentTab == "histories") { // } else if (this.currentTab == "histories") { //
this.getHistories(); this.getHistories();
} }
@ -444,7 +444,7 @@ export default {
case "exchangeMarketList": case "exchangeMarketList":
this.marketList = data; this.marketList = data;
console.log(this.marketList[0].marketInfoList[0].close, '0000------------') // console.log(this.marketList[0].marketInfoList[0].close, '0000------------')
if (!this.symbol) { // symbol if (!this.symbol) { // symbol
this.symbol = _.nth(data).marketInfoList[0].symbol; this.symbol = _.nth(data).marketInfoList[0].symbol;

2
src/views/exchange/make-deal.vue

@ -771,7 +771,7 @@ export default {
return item.pair_name.replace('/', '').toLowerCase() == this.symbol return item.pair_name.replace('/', '').toLowerCase() == this.symbol
}); });
this.activeContract = listB || {}; this.activeContract = listB || {};
console.log(this.symbol, this.activeContract, 'ex-activeContract----------------') // console.log(this.symbol, this.activeContract, 'ex-activeContract----------------')
}else if (cmd == "ping") { }else if (cmd == "ping") {
this.ws.send({ this.ws.send({
cmd: "pong" cmd: "pong"

20
src/views/exchange/order-list.vue

@ -94,7 +94,7 @@
</div> </div>
<div class="tab-pane fade" id="order-history" role="tabpanel"> <div class="tab-pane fade" id="order-history" role="tabpanel">
<table class="table" v-if="ordersHistory.total"> <table class="table" v-if="ordersHistoryNew.total">
<thead> <thead>
<tr class="text-nowrap"> <tr class="text-nowrap">
<th>{{ $t("common.created") }}</th> <th>{{ $t("common.created") }}</th>
@ -112,7 +112,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<template v-for="(item,index) in ordersHistory.data"> <template v-for="(item,index) in ordersHistoryNew.data">
<tr class="text-nowrap" :key="item.id" :name="item.entrust_type+'_'+item.id+'_'+index" slot="title" @click="handleChange(item)"> <tr class="text-nowrap" :key="item.id" :name="item.entrust_type+'_'+item.id+'_'+index" slot="title" @click="handleChange(item)">
<td>{{item.created_at}}</td> <td>{{item.created_at}}</td>
<td>{{item.symbol}}</td> <td>{{item.symbol}}</td>
@ -205,9 +205,23 @@ export default {
data() { data() {
return { return {
currentTab: "opens", currentTab: "opens",
activeItems: [] activeItems: [],
ordersHistoryNew: {}
}; };
}, },
watch: {
'ordersHistory': {
handler(nv) {
console.log(nv, 222, nv.total)
this.ordersHistoryNew = nv;
// this.$set(this.ordersHistoryNew, nv);
console.log(this.ordersHistoryNew.total);
},
immediate: true,
deep: true
}
},
methods: { methods: {
toggle(name) { toggle(name) {
this.currentTab = name; this.currentTab = name;

49
src/views/home/index.vue

@ -411,21 +411,17 @@
</div> </div>
<div style="width:25%;"> <div style="width:25%;">
<div class="th">{{ $t("xtzcoins3.a10") }}</div> <div class="th">{{ $t("xtzcoins3.a10") }}</div>
<div class="td">{{brokenLine[0].count}}</div> <div class="td" v-for="(item, index) in brokenLine" :key="index">{{item.close}}</div>
<div class="td">{{brokenLine[1].count}}</div>
<div class="td">{{brokenLine[2].count}}</div>
</div> </div>
<div style="width:25%;text-align: center;"> <div style="width:25%;text-align: center;">
<div class="th">{{ $t("xtzcoins3.a11") }}</div> <div class="th">{{ $t("xtzcoins3.a11") }}</div>
<div :class="brokenLine[0].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[0].increaseStr}}</div> <div class="td" v-for="(item, index) in brokenLine" :key="index"
<div :class="brokenLine[1].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[1].increaseStr}}</div> :class="brokenLine[0].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{item.increaseStr}}
<div :class="brokenLine[1].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[2].increaseStr}}</div> </div>
</div> </div>
<div style="width:25%;text-align: right;"> <div style="width:25%;text-align: right;">
<div class="th">{{ $t("xtzcoins3.a12") }}</div> <div class="th">{{ $t("xtzcoins3.c3") }}</div>
<div class="td">${{brokenLine[0].close}}M</div> <div class="td" v-for="(item, index) in brokenLine" :key="index">{{item.vol}}</div>
<div class="td">${{brokenLine[1].close}}M</div>
<div class="td">${{brokenLine[2].close}}M</div>
</div> </div>
</div> </div>
<div v-if="!isLogin"> <div v-if="!isLogin">
@ -436,8 +432,8 @@
<div class="section-block section-block-5 d-flex justify-content-between"> <div class="section-block section-block-5 d-flex justify-content-between">
<div> <div>
<h1 class="mb-3">{{ $t("xtzcoins3.a16") }}</h1> <h1 class="mb-3">{{ $t("xtzcoins3.a16") }}</h1>
<div class="mb-5" style="color: #6A6E74;">{{ $t("xtzcoins3.a17") }}</div> <div class="" style="color: #6A6E74;">{{ $t("xtzcoins3.a17") }}</div>
<div class="btn5"><router-link to="/college/list/18" class="target-a">{{ $t("xtzcoins3.a18") }}</router-link></div> <!-- <div class="btn5"><router-link to="/college/list/18" class="target-a">{{ $t("xtzcoins3.a18") }}</router-link></div> -->
</div> </div>
<div><img src="../../../static/images/illustration-2.png" alt="" width="550" height="310"></div> <div><img src="../../../static/images/illustration-2.png" alt="" width="550" height="310"></div>
</div> </div>
@ -453,27 +449,24 @@
<div class="d-flex justify-content-between mb-4"> <div class="d-flex justify-content-between mb-4">
<div style="width:25%;"> <div style="width:25%;">
<div class="th">{{ $t("xtzcoins3.a9") }}</div> <div class="th">{{ $t("xtzcoins3.a9") }}</div>
<div class="td">{{brokenLine[0].coin_name}}<span>{{brokenLine[0].coin_name}}</span></div> <div class="td" v-for="(item, index) in brokenLine" :key="index">
<div class="td">{{brokenLine[1].coin_name}}<span>{{brokenLine[1].coin_name}}</span></div> <img :src="item.coin_icon" style="width:30px;height:30px;" />
<div class="td">{{brokenLine[2].coin_name}}<span>{{brokenLine[2].coin_name}}</span></div> <span>{{item.coin_name}}</span>
</div>
</div> </div>
<div style="width:25%;"> <div style="width:25%;">
<div class="th">{{ $t("xtzcoins3.a10") }}</div> <div class="th">{{ $t("xtzcoins3.a10") }}</div>
<div class="td">{{brokenLine[0].count}}</div> <div class="td" v-for="(item, index) in brokenLine" :key="index">{{item.close}}</div>
<div class="td">{{brokenLine[1].count}}</div>
<div class="td">{{brokenLine[2].count}}</div>
</div> </div>
<div style="width:25%;text-align: center;"> <div style="width:25%;text-align: center;">
<div class="th">{{ $t("xtzcoins3.a11") }}</div> <div class="th">{{ $t("xtzcoins3.a11") }}</div>
<div :class="brokenLine[0].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[0].increaseStr}}</div> <div class="td" v-for="(item, index) in brokenLine" :key="index"
<div :class="brokenLine[1].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[1].increaseStr}}</div> :class="brokenLine[0].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{item.increaseStr}}
<div :class="brokenLine[1].increase < 0 ? 'td c_decreace' : 'td c_increase'">{{brokenLine[2].increaseStr}}</div> </div>
</div> </div>
<div style="width:25%;text-align: right;"> <div style="width:25%;text-align: right;">
<div class="th">{{ $t("xtzcoins3.a12") }}</div> <div class="th">{{ $t("xtzcoins3.a12") }}</div>
<div class="td">${{brokenLine[0].close}}M</div> <div class="td" v-for="(item, index) in brokenLine" :key="index">{{item.vol}}</div>
<div class="td">${{brokenLine[1].close}}M</div>
<div class="td">${{brokenLine[2].close}}M</div>
</div> </div>
</div> </div>
<div v-if="!isLogin"> <div v-if="!isLogin">
@ -569,12 +562,12 @@
</div> </div>
</div> </div>
<div class="section-block section-block-11"> <div class="section-block section-block-11">
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between ">
<h1>{{ $t("xtzcoins3.a38") }}</h1> <h1>{{ $t("xtzcoins3.a38") }}</h1>
<!-- <span>查看下载链接</span>--> <!-- <span>查看下载链接</span>-->
</div> </div>
<div style="font-size: 20px;margin-bottom: 3rem;color: #6A6E74;">{{ $t("xtzcoins3.a39") }}</div> <div style="font-size: 20px;margin-bottom: 3rem;color: #6A6E74;">{{ $t("xtzcoins3.a39") }}</div>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between" style="align-items: center;">
<img src="../../../static/images/illustration-3.png" alt="" style="height:430px;margin-right:80px;"> <img src="../../../static/images/illustration-3.png" alt="" style="height:430px;margin-right:80px;">
<div> <div>
<div class="d-flex mb-5" style="background:#FAFAFA;align-items: center;"> <div class="d-flex mb-5" style="background:#FAFAFA;align-items: center;">
@ -622,7 +615,7 @@
<img src="../../../static/images/trusted-section.png" alt="" style="height:300px;"> <img src="../../../static/images/trusted-section.png" alt="" style="height:300px;">
</div> </div>
</div> </div>
<div class="section-block section-block-13" v-if="!isLogin"> <div class="section-block section-block-13" v-if="!isLogin && 0">
<h1 class="mb-4">{{ $t("xtzcoins3.a49") }}</h1> <h1 class="mb-4">{{ $t("xtzcoins3.a49") }}</h1>
<div class="d-flex justify-content-between"> <div class="d-flex justify-content-between">
<div class="d-flex"> <div class="d-flex">
@ -647,7 +640,7 @@
</router-link> </router-link>
</div> </div>
</div> </div>
<div class="section-block section-block-14" v-if="!isLogin"> <div class="section-block section-block-14" v-if="!isLogin && 0">
<h1 class="mb-4">{{ $t("xtzcoins3.a21") }}</h1> <h1 class="mb-4">{{ $t("xtzcoins3.a21") }}</h1>
<div class="btn3"><router-link to="/sign-up" class="target-a">{{ $t("xtzcoins3.a57") }}</router-link></div> <div class="btn3"><router-link to="/sign-up" class="target-a">{{ $t("xtzcoins3.a57") }}</router-link></div>
</div> </div>

6
static/Kline/datafeeds/socket/wsconfig.js

@ -498,7 +498,8 @@ var Wsconfig = (function () {
up: "#03c087", up: "#03c087",
down: "#ff5959", down: "#ff5959",
bg: "#ffffff", bg: "#ffffff",
grid: "#f7f8fa", // grid: "#f7f8fa",
grid: "#ffffff",// 此处不生效,tvStyle.js修改生效,需清除缓存查看效果
cross: "#23283D", cross: "#23283D",
border: "#9194a4", border: "#9194a4",
text: "#9194a4", text: "#9194a4",
@ -510,7 +511,8 @@ var Wsconfig = (function () {
up: "#25bc67", up: "#25bc67",
down: "#ff5959", down: "#ff5959",
bg: "#181328", bg: "#181328",
grid: "#1f2943", // grid: "#1f2943",
grid: "#ffffff",// 此处不生效,tvStyle.js修改生效,需清除缓存查看效果
cross: "#9194A3", cross: "#9194A3",
border: "#4e5b85", border: "#4e5b85",
text: "#61688A", text: "#61688A",

Loading…
Cancel
Save