luyisha 3 years ago
parent
commit
9eddfcce80
  1. 3
      assets/scss/app.scss
  2. 6
      assets/scss/vant.scss
  3. 1
      components/lb-picker/index.vue
  4. 3
      components/lb-picker/style/picker.scss
  5. 3
      i18n/lang/de.json
  6. 3
      i18n/lang/en.json
  7. 3
      i18n/lang/fin.json
  8. 3
      i18n/lang/fra.json
  9. 3
      i18n/lang/it.json
  10. 3
      i18n/lang/jp.json
  11. 3
      i18n/lang/kor.json
  12. 3
      i18n/lang/pl.json
  13. 3
      i18n/lang/pt.json
  14. 3
      i18n/lang/spa.json
  15. 3
      i18n/lang/swe.json
  16. 3
      i18n/lang/tr.json
  17. 3
      i18n/lang/ukr.json
  18. 3
      i18n/lang/zh-CN.json
  19. 3
      i18n/lang/zh-TW.json
  20. 181
      pages/base/home.vue
  21. 3
      pages/exchange/exchange-transaction.vue
  22. 3
      pages/exchange/open-position.vue
  23. 22
      pages/exchange/symbol-list.vue
  24. 2
      pages/login/index.vue
  25. 2
      pages/reg/index.vue

3
assets/scss/app.scss

@ -695,9 +695,6 @@ $i: 1;
background-size: 100% 102px; background-size: 100% 102px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.lb-picker-action-confirm-text {
color: $green !important;
}
.app-nav { .app-nav {
height: $status-bar; height: $status-bar;

6
assets/scss/vant.scss

@ -112,7 +112,8 @@
background-color: #fafafa; background-color: #fafafa;
} }
.van-popup--left { .van-popup--left {
background: $bg; // background: $bg;
background: #fff;
} }
.van-field__input { .van-field__input {
color: $light; color: $light;
@ -188,7 +189,8 @@
} }
.van-search__action, .van-search__action,
.van-cell { .van-cell {
color: $light; // color: $light;
color: #000;
} }
.van-button--default { .van-button--default {
.van-button__text { .van-button__text {

1
components/lb-picker/index.vue

@ -4,6 +4,7 @@
<!-- 默认插槽 --> <!-- 默认插槽 -->
<view v-if="!inline" <view v-if="!inline"
class="lb-picker-default-slot" class="lb-picker-default-slot"
style="color:#F7D558;"
@tap="show"> @tap="show">
<slot></slot> <slot></slot>
</view> </view>

3
components/lb-picker/style/picker.scss

@ -134,7 +134,8 @@
.lb-picker-action-confirm-text { .lb-picker-action-confirm-text {
font-size: 16px; font-size: 16px;
color: #007aff; // color: #007aff;
color:#F7D558!important;
} }
.lb-picker-content { .lb-picker-content {

3
i18n/lang/de.json

@ -117,7 +117,8 @@
"e4": "Konto des Vertrags", "e4": "Konto des Vertrags",
"e5": "Umwandlung von Verträgen", "e5": "Umwandlung von Verträgen",
"e6": "Klasse der Bergleute", "e6": "Klasse der Bergleute",
"e7": "Mineral" "e7": "Mineral",
"e8": "Währung"
}, },
"accountSettings": { "accountSettings": {
"a0": "Einstellungen des Kontos", "a0": "Einstellungen des Kontos",

3
i18n/lang/en.json

@ -158,7 +158,8 @@
"e4": "Derivatives Account", "e4": "Derivatives Account",
"e5": "Contract conversion", "e5": "Contract conversion",
"e6": "Miner Level", "e6": "Miner Level",
"e7": "Miner" "e7": "Miner",
"e8": "Currency"
}, },
"accountSettings": { "accountSettings": {
"a0": "Account Settings", "a0": "Account Settings",

3
i18n/lang/fin.json

@ -115,7 +115,8 @@
"e4":"Sopimusta koskeva tili", "e4":"Sopimusta koskeva tili",
"e5":"Sopimusten muuntaminen", "e5":"Sopimusten muuntaminen",
"e6":"Mineraanien luokka", "e6":"Mineraanien luokka",
"e7":"kaivosmies" "e7":"kaivosmies",
"e8": "valuutta"
}, },
"accountSettings": { "accountSettings": {
"a0":"Tilin asetukset", "a0":"Tilin asetukset",

3
i18n/lang/fra.json

@ -117,7 +117,8 @@
"e4": "Comptes contractuels", "e4": "Comptes contractuels",
"e5": "Conversion contractuelle", "e5": "Conversion contractuelle",
"e6": "Classe de mineur", "e6": "Classe de mineur",
"e7": "Mineurs" "e7": "Mineurs",
"e8": "Monnaie"
}, },
"accountSettings": { "accountSettings": {
"a0": "Configuration du compte", "a0": "Configuration du compte",

3
i18n/lang/it.json

@ -117,7 +117,8 @@
"e4": "Conto contrattuale", "e4": "Conto contrattuale",
"e5": "Conversione contrattuale", "e5": "Conversione contrattuale",
"e6": "Classe di minerali", "e6": "Classe di minerali",
"e7": "miner" "e7": "miner",
"e8": "valuta"
}, },
"accountSettings": { "accountSettings": {
"a0": "Impostazioni account", "a0": "Impostazioni account",

3
i18n/lang/jp.json

@ -117,7 +117,8 @@
"e4": "契約口座", "e4": "契約口座",
"e5": "契約が折衷する", "e5": "契約が折衷する",
"e6": "鉱夫階級", "e6": "鉱夫階級",
"e7": "鉱夫" "e7": "鉱夫",
"e8": "通貨#ツウカ#"
}, },
"accountSettings": { "accountSettings": {
"a0": "アカウントの設定", "a0": "アカウントの設定",

3
i18n/lang/kor.json

@ -117,7 +117,8 @@
"e4":"계약 계좌", "e4":"계약 계좌",
"e5":"계약 을 절충 하 다", "e5":"계약 을 절충 하 다",
"e6":"광부 등급", "e6":"광부 등급",
"e7":"광부" "e7":"광부",
"e8": "화폐 종류"
}, },
"accountSettings": { "accountSettings": {
"a0":"계 정 설정", "a0":"계 정 설정",

3
i18n/lang/pl.json

@ -115,7 +115,8 @@
"e4":"Konto kontraktowe", "e4":"Konto kontraktowe",
"e5":"Przetwarzanie umów", "e5":"Przetwarzanie umów",
"e6":"Klasa górnicza", "e6":"Klasa górnicza",
"e7":"miner" "e7":"miner",
"e8": "waluta"
}, },
"accountSettings": { "accountSettings": {
"a0":"Ustawienia konta", "a0":"Ustawienia konta",

3
i18n/lang/pt.json

@ -117,7 +117,8 @@
"e4":"Conta de contrato", "e4":"Conta de contrato",
"e5":"Conversão contratual", "e5":"Conversão contratual",
"e6":"Classe de mineiros", "e6":"Classe de mineiros",
"e7":"Mineiro" "e7":"Mineiro",
"e8": "moeda"
}, },
"accountSettings": { "accountSettings": {
"a0":"Configuração Da Conta", "a0":"Configuração Da Conta",

3
i18n/lang/spa.json

@ -117,7 +117,8 @@
"e4":"Cuentas contractuales", "e4":"Cuentas contractuales",
"e5":"Conversión de contratos", "e5":"Conversión de contratos",
"e6":"Grado minero", "e6":"Grado minero",
"e7":"Minero" "e7":"Minero",
"e8": "Moneda"
}, },
"accountSettings": { "accountSettings": {
"a0":"Configuración de la cuenta", "a0":"Configuración de la cuenta",

3
i18n/lang/swe.json

@ -115,7 +115,8 @@
"e4":"Kontraktskonto", "e4":"Kontraktskonto",
"e5":"Omräkning av kontrakt", "e5":"Omräkning av kontrakt",
"e6":"Klassificering av mineraler", "e6":"Klassificering av mineraler",
"e7":"gruvarbetare" "e7":"gruvarbetare",
"e8": "valuta"
}, },
"accountSettings": { "accountSettings": {
"a0":"Inställningar av konto", "a0":"Inställningar av konto",

3
i18n/lang/tr.json

@ -117,7 +117,8 @@
"e4": "Kontrat Hesabı", "e4": "Kontrat Hesabı",
"e5": "Sözleşme dönüştürme", "e5": "Sözleşme dönüştürme",
"e6": "Madenci Seviyesi", "e6": "Madenci Seviyesi",
"e7": "Madenci" "e7": "Madenci",
"e8": "para"
}, },
"accountSettings": { "accountSettings": {
"a0": "Hesap Ayarları", "a0": "Hesap Ayarları",

3
i18n/lang/ukr.json

@ -115,7 +115,8 @@
"e4": "Контрактний рахунок", "e4": "Контрактний рахунок",
"e5": "Конвертація договору", "e5": "Конвертація договору",
"e6": "Майнерський рівень", "e6": "Майнерський рівень",
"e7": "шахтар" "e7": "шахтар",
"e8": "валюта"
}, },
"accountSettings": { "accountSettings": {
"a0": "Налаштування аккаунта", "a0": "Налаштування аккаунта",

3
i18n/lang/zh-CN.json

@ -117,7 +117,8 @@
"e4": "合约账户", "e4": "合约账户",
"e5": "合约折合", "e5": "合约折合",
"e6": "矿工等级", "e6": "矿工等级",
"e7": "矿工" "e7": "矿工",
"e8": "币种"
}, },
"accountSettings": { "accountSettings": {
"a0": "账号设置", "a0": "账号设置",

3
i18n/lang/zh-TW.json

@ -158,7 +158,8 @@
"e4": "合約賬戶", "e4": "合約賬戶",
"e5": "合約折合", "e5": "合約折合",
"e6": "礦工等級", "e6": "礦工等級",
"e7": "礦工" "e7": "礦工",
"e8": "幣種"
}, },
"accountSettings": { "accountSettings": {
"a0": "賬號設置", "a0": "賬號設置",

181
pages/base/home.vue

@ -46,7 +46,7 @@
marketList = []; marketList = [];
indexData(); indexData();
"></v-lang> "></v-lang>
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> <i class="iconfont m-l-xs fn-sm" style="color: #F7D558!important;">&#xe6e9;</i>
</span> </span>
</view> </view>
@ -396,7 +396,7 @@
<view class="head_info m-y-xl"> <view class="head_info m-y-xl">
<view class=" d-flex justify-between align-center p-x-xs p-t-lg bor5 p-b-xs"> <view class=" d-flex justify-between align-center p-x-xs p-t-lg bor5 p-b-xs">
<view class="d-flex"> <view class="d-flex">
<text class="m-x-xs fn-center" @click="active=0" :class="active==0?'fn-bold fn-15 p-b-xs bor5-active color-dark':''">{{ $t("first.b5") }}</text> <text class="fn-center" @click="active=0" :class="active==0?'fn-bold fn-15 p-b-xs color-dark':''" style="margin-left: 20px;">{{ $t("base.e8") }}</text>
<!-- <text class="m-x-xs fn-center" @click="active=1" :class="active==1?'fn-bold fn-15 p-b-xs bor5-active color-dark':''">現貨指數</text> --> <!-- <text class="m-x-xs fn-center" @click="active=1" :class="active==1?'fn-bold fn-15 p-b-xs bor5-active color-dark':''">現貨指數</text> -->
</view> </view>
</view> </view>
@ -422,7 +422,7 @@
<view class="fn-left w-6/12"> <view class="fn-left w-6/12">
<view class="d-flex align-center"> <view class="d-flex align-center">
<text class="fn-bold fn-16 color-dark">{{ item.pair_name }}</text> <text class="fn-bold fn-16 color-dark">{{ item.pair_name }}</text>
<text class="color-dark fn-14 m-l-xs">{{ $t("first.b8") }}</text> <!-- <text class="color-dark fn-14 m-l-xs">{{ $t("first.b8") }}</text> -->
</view> </view>
<view class="d-flex align-center fn-12 m-t-xs"> <view class="d-flex align-center fn-12 m-t-xs">
24H{{ $t("first.b3") }} {{ omitTo(item.vol,0) }} 24H{{ $t("first.b3") }} {{ omitTo(item.vol,0) }}
@ -461,106 +461,6 @@
<!-- </scroll-view> --> <!-- </scroll-view> -->
<!-- bottom section -->
<div class="footer">
<!-- <div class="footer-info-logo">
<img src="../../assets/img/banner-logo.png" alt="" />
</div> -->
<!-- <div class="footer-info-list d-flex"> -->
<!-- service -->
<!-- <div class="footer-info-service">
<h4>{{ $t("common.service") }}</h4>
<ul> -->
<!-- <li v-for="item in college" :key="item.id">
<router-link :to="item.url">{{
item.name
}}</router-link>
</li> -->
<!-- <li>
<v-link to="/pages/list/list?isSearch=1" class="">{{$t("common.User protocol")}}
</v-link>
</li>
<li>
<v-link to="/pages/list/list?isSearch=1" class="">{{$t("common.Privacy policy")}}
</v-link>
</li>
<li>
<v-link to="/pages/list/list?isSearch=1" class="">{{$t("common.Legal declaration")}}
</v-link>
</li>
<li>
<v-link to="/pages/list/list?isSearch=1" class="">{{$t("common.About us")}}
</v-link>
</li>
</ul>
</div> -->
<!-- <div class="footer-info-college">
<h4>{{ $t("base.a7") }}</h4>
<ul>
<li v-for="item in college" :key="item.id"> -->
<!-- <router-link :to="item.url">{{
item.name
}}</router-link> -->
<!-- <v-link to="item.url" class="">{{$t(`common.${item.name}`)}}
</v-link>
</li> -->
<!-- <li>
<v-link
to="/pages/list/list?isSearch=1"
class=""
>Beginner's course
</v-link>
</li>
<li>
<v-link
to="/pages/list/list?isSearch=1"
class=""
>Trading strategy
</v-link>
</li>
<li>
<v-link
to="/pages/list/list?isSearch=1"
class=""
>Industry research
</v-link>
</li>
<li>
<v-link
to="/pages/list/list?isSearch=1"
class=""
>Market dynamics
</v-link>
</li> -->
<!-- </ul>
</div>
</div> -->
<!-- lang change -->
<!-- <div class="footer-lang d-flex">
<div class="footer-lang-type">English</div>
<div class="footer-lang-btn">
<img src="../../assets/img/icon/langdown.svg" alt="" />
</div>
</div> -->
<!-- <view class="footer-lang per-bot p-y-md p-x-sm d-flex align-center" style="color: #fff;"> -->
<!-- <img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" /> -->
<!-- <span class="color-light">
<v-lang></v-lang>
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
</span>
</view> -->
<!-- 版权 -->
<!-- <div class="footer_rights" >
{{$t("common.Rights")}}.
</div> -->
</div>
</view> </view>
<!-- 个人主页弹出层 --> <!-- 个人主页弹出层 -->
@ -1480,81 +1380,6 @@
} }
} }
.footer {
width: 100%;
border-top: 1px solid rgba(33,33,33,1);
.footer-info-logo {
margin: 40px auto;
width: 203px;
height: 50px;
img {
width: 100%;
height: 100%;
}
}
.footer-info-list {
padding: 0 14px;
justify-content: center;
align-items: center;
.footer-info-service {
margin-right: 100px;
}
.footer-info-service,
.footer-info-college {
line-height: 36px;
color: rgba(156, 163, 192, 1);
h4 {
font-size: 20px;
color: #fff;
}
}
}
.footer-lang {
margin: 20px auto;
width: 231px;
height: 44px;
border-radius: 10px;
background-color: rgba(18, 19, 24, 1);
align-items: center;
justify-content: center;
.footer-lang-type {
color: rgba(255, 255, 255, 1);
font-size: 16px;
}
.footer-lang-btn {
width: 14px;
height: 14px;
margin-left: 21px;
img {
width: 100%;
height: 100%;
}
}
}
.footer_rights {
width: 100%;
height: 54px;
line-height: 54px;
text-align: center;
color: #fff;
font-size: 14px;
background-color: #000;
border-top: 1px solid rgba(33,33,33,1);
}
}
// //
.dot-box { .dot-box {

3
pages/exchange/exchange-transaction.vue

@ -1136,4 +1136,7 @@ export default {
.bor5-active { .bor5-active {
border-bottom: 4px solid $theme-2; border-bottom: 4px solid $theme-2;
} }
.bg-panel-2{
background-color: #ebebeb;
}
</style> </style>

3
pages/exchange/open-position.vue

@ -1989,4 +1989,7 @@ export default {
/deep/ .van-stepper{ /deep/ .van-stepper{
background-color: #F5F5F5 !important; background-color: #F5F5F5 !important;
} }
.bg-panel-2{
background-color: #ebebeb;
}
</style> </style>

22
pages/exchange/symbol-list.vue

@ -1,7 +1,7 @@
<template> <template>
<view class="symbol-list"> <view class="symbol-list">
<view class="w-max" style="height: var(--status-bar-height)"></view> <view class="w-max" style="height: var(--status-bar-height)"></view>
<view class="title fn-18 p-md color-light">{{ title||$t("exchange.f5") }}</view> <view class="title fn-18 p-md color-dark">{{ title||$t("exchange.f5") }}</view>
<van-search <van-search
background="transparent" background="transparent"
:value="filterText" :value="filterText"
@ -19,15 +19,15 @@
<table class="w-max"> <table class="w-max">
<thead v-if="heyue==0"> <thead v-if="heyue==0">
<tr class="fn-sm"> <tr class="fn-sm">
<th class="p-l-md p-y-xs fn-left">{{ $t("exchange.f7") }}</th> <th class="p-l-md p-y-xs fn-left color-dark">{{ $t("exchange.f7") }}</th>
<th class="fn-left">{{ $t("exchange.f8") }}</th> <th class="fn-left color-dark">{{ $t("exchange.f8") }}</th>
<th class="p-r-md p-y-xs fn-right">{{ $t("exchange.f9") }}</th> <th class="p-r-md p-y-xs fn-right color-dark">{{ $t("exchange.f9") }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr <tr
class="p-y-md" class="p-y-md"
:class="symbols==item.coin_name&&heyue==1?'bg-panel':''" :class="symbols==item.coin_name&&heyue==1?'bg-F5':''"
v-for="item in parentItem.marketInfoList" v-for="item in parentItem.marketInfoList"
:key="item.symbol" :key="item.symbol"
v-show="isShow(item.pair_name)" v-show="isShow(item.pair_name)"
@ -35,13 +35,13 @@
> >
<td class="p-l-md p-y-md w-40"> <td class="p-l-md p-y-md w-40">
<template v-if="parentItem.isCollect"> <template v-if="parentItem.isCollect">
<span class="color-light">{{ item.pair_name }}</span> <span class="color-dark">{{ item.pair_name }}</span>
</template> </template>
<template v-else> <template v-else>
<span class="color-light">{{ item.coin_name||item.symbol }}/{{ parentItem.coin_name }}</span> <span class="color-dark">{{ item.coin_name||item.symbol }}/{{ parentItem.coin_name }}</span>
</template> </template>
</td> </td>
<td class="w-30 fn-center"> <td class="w-30 fn-center color-dark">
<template v-if="heyue==0" :class="item.increase < 0 ? 'color-sell' : 'color-buy'"> <template v-if="heyue==0" :class="item.increase < 0 ? 'color-sell' : 'color-buy'">
{{ item.price }} {{ item.price }}
</template> </template>
@ -148,6 +148,9 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// .symbol-list{
// color: #666;
// }
.table-list { .table-list {
tr:nth-of-type(2n-1) { tr:nth-of-type(2n-1) {
td { td {
@ -174,4 +177,7 @@ border-collapse:collapse
.w-30{ .w-30{
width: 30%; width: 30%;
} }
/deep/ .van-field__input{
color: #666;
}
</style> </style>

2
pages/login/index.vue

@ -8,7 +8,7 @@
<v-lang <v-lang
></v-lang> ></v-lang>
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> <i class="iconfont m-l-xs fn-sm" style="color: #F7D558!important;">&#xe6e9;</i>
</span> </span>
</view> </view>
</template> </template>

2
pages/reg/index.vue

@ -11,7 +11,7 @@
marketList = []; marketList = [];
" "
></v-lang> ></v-lang>
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i> <i class="iconfont m-l-xs fn-sm" style="color: #F7D558!important;">&#xe6e9;</i>
</span> </span>
</view> </view>
</template> </template>

Loading…
Cancel
Save