Browse Source

更新

master
luyisha 3 years ago
parent
commit
0cf3eeda1a
  1. 26
      assets/scss/app.scss
  2. 16
      assets/scss/vant.scss
  3. 3
      components/lb-picker/index.vue
  4. 4
      components/lb-picker/style/picker-item.scss
  5. 5
      components/lb-picker/style/picker.scss
  6. BIN
      i18n/lang.zip
  7. 14
      i18n/lang/de.json
  8. 12
      i18n/lang/en.json
  9. 15
      i18n/lang/fin.json
  10. 15
      i18n/lang/fra.json
  11. 14
      i18n/lang/it.json
  12. 14
      i18n/lang/jp.json
  13. 14
      i18n/lang/kor.json
  14. 14
      i18n/lang/pl.json
  15. 14
      i18n/lang/pt.json
  16. 14
      i18n/lang/spa.json
  17. 14
      i18n/lang/swe.json
  18. 14
      i18n/lang/tr.json
  19. 14
      i18n/lang/ukr.json
  20. 14
      i18n/lang/zh-CN.json
  21. 12
      i18n/lang/zh-TW.json
  22. 24
      layout/vButton.vue
  23. 24
      layout/vDropdwon.vue
  24. 2
      layout/vScroll.vue
  25. 57
      pages/accountSettings/accountSettings.vue
  26. 20
      pages/assets/address-list.vue
  27. 16
      pages/assets/bill.vue
  28. 7
      pages/assets/coin-list.vue
  29. 54
      pages/assets/draw.vue
  30. 21
      pages/assets/recharge.vue
  31. 6
      pages/auth/index.vue
  32. 4
      pages/auth/primary.vue
  33. 406
      pages/base/home.vue
  34. 9
      pages/base/index.vue
  35. 124
      pages/base/mine.vue
  36. 23
      pages/commission/index.vue
  37. 18
      pages/exchange/contract-history.vue
  38. 372
      pages/exchange/exchange-transaction.vue
  39. 31
      pages/exchange/exchangeHis.vue
  40. 20
      pages/exchange/index.vue
  41. 4
      pages/exchange/latest-transaction.vue
  42. 151
      pages/exchange/open-position.vue
  43. 8
      pages/exchange/sale.vue
  44. 6
      pages/exchange/sell-and-buy.vue
  45. 4
      pages/help/detail.vue
  46. 95
      pages/help/index.vue
  47. 4
      pages/help/sort.vue
  48. 23
      pages/login/index.vue
  49. 2
      pages/notice/index.vue
  50. 46
      pages/reg/index.vue
  51. 24
      pages/safe/email.vue
  52. 26
      pages/safe/forget-password.vue
  53. 4
      pages/safe/index.vue
  54. 14
      pages/safe/login-password.vue
  55. 6
      pages/service/service.vue
  56. 19
      pages/transfer/index.vue
  57. 6
      store/index.js

26
assets/scss/app.scss

@ -510,8 +510,10 @@ $i: 1;
display: flex;
flex-direction: column;
height: 100vh;
background: $bg;
color: $plain !important;
// background: $bg;
background: #fff;
// color: $plain !important;
color: #000!important;
}
@ -519,7 +521,8 @@ $i: 1;
overflow: auto;
-webkit-overflow-scrolling: touch;
flex: 1;
background-color: $bg;
// background-color: $bg;
background-color: #fff;
color:$plain !important;
padding: 0 !important;
.top {
@ -671,21 +674,23 @@ $i: 1;
}
.lb-picker-header-actions {
// background-color: $panel-3;
background-color: $black;
// background-color: $black;
}
.uni-picker-view-indicator {
&::before,
&::after {
border: none !important;
}
border-top: 1px solid #e6e6e6;
border-bottom: 1px solid #e6e6e6;
}
.lb-picker-content {
// background-color: $panel-4 !important;
background-color: $black !important;
// background-color: $black !important;
}
.uni-picker-view-mask {
// background: var(--picker-mask);
background: rgba(0, 0, 0, .1);
background: rgba(0, 0, 0, .05);
background-position: top, bottom;
background-size: 100% 102px;
background-repeat: no-repeat;
@ -700,4 +705,13 @@ $i: 1;
.padding-nav {
padding-top: $status-bar;
}
.bg-F5{
background-color: #f5f5f5 !important;
}
.bg-FA{
background-color: #fafafa !important;
}
.bg-yellow2{
background-color: #F7D558 !important;
}
@import "./vant.scss";

16
assets/scss/vant.scss

@ -17,9 +17,10 @@
.van-nav-bar__left {
.van-nav-bar__arrow {
color: $text-color;
// color: $text-color;
// color:$white;
// font-weight: bold;
color: #000;
}
}
@ -92,19 +93,23 @@
}
.van-nav-bar__title {
color: $light;
// color: $light;
// color: $plain;
color: #000;
}
.van-nav-bar {
background-color: transparent;
// background-color: transparent;
background-color: #fff;
color: #000;
&.van-hairline--bottom:after {
border-bottom-width: 0;
}
}
.van-popup {
background-color: $panel-3;
// background-color: $panel-3;
background-color: #fafafa;
}
.van-popup--left {
background: $bg;
@ -187,7 +192,8 @@
}
.van-button--default {
.van-button__text {
color: $text-color;
// color: $text-color;
color: #666;
}
&.van-dialog__confirm{
.van-button__text {

3
components/lb-picker/index.vue

@ -29,7 +29,8 @@
:style="{
borderRadius: `${radius} ${radius} 0 0`,
zIndex: zIndex
}">
}"
style="background-color: #fff;">
<view v-if="showHeader"
class="lb-picker-header">

4
components/lb-picker/style/picker-item.scss

@ -9,7 +9,7 @@
flex-direction: row;
align-items: center;
justify-content: center;
background-color: #000;
// background-color: #000;
}
@ -22,6 +22,6 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #fff;
color: #666;
}

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

@ -1,6 +1,7 @@
.lb-picker {
position: relative;
color:$white;
// color:$white;
color:#000;
font-size: 16px;
}
@ -70,7 +71,7 @@
flex-direction: row;
justify-content: space-between;
flex-wrap: nowrap;
background-color: $black;
// background-color: $black;
}
/* #ifndef APP-PLUS */

BIN
i18n/lang.zip

Binary file not shown.

14
i18n/lang/de.json

@ -787,5 +787,17 @@
"b6": "De Authentifizierung",
"b7": "Kauf bestätigen",
"b8": "Bestätigen Verkauf"
}
},
"ybgcoins3":{
"a0":"Und eine digitale währung zu besitzen",
"a1": "ladegerät",
"a2": "Münzen kaufen.",
"a3": "Das kostet einen gewinn Von 100 dollar",
"a4": "12. Empfehlen sie 3 gute freunde",
"a5": "8 ustidt bekommt man als geschenkkarte",
"a6": "vermögen",
"a7": "Beantworte die frage, um einen vertrag einzulösen",
"a8": "Bevor sie eine aussage machen, müssen sie sich erst in fünf minuten fertig machen",
"a9": "Ein hit-artikel."
}
}

12
i18n/lang/en.json

@ -841,5 +841,17 @@
"b6": "De authentication",
"b7": "Confirm purchase",
"b8": "Confirm sale"
},
"ybgcoins3":{
"a0":"Own a digital currency",
"a1": "Top up",
"a2": "Buy currency",
"a3": "Sign up now to earn up to $100 in prizes",
"a4": "Recommend 3 friends",
"a5": "Receive 8 USDT as a gift card",
"a6": "assets",
"a7": "Answer the questions to open the contract",
"a8": "Before you can place your order, you have to complete the answer, which takes about five minutes",
"a9": "Hot article"
}
}

15
i18n/lang/fin.json

@ -784,5 +784,18 @@
"b6":"De autentinion",
"b7":"Vahvista osto",
"b8":"Vahvistettu myynti"
}
},
"ybgcoins3":{
"a0":"Omista summa digitaalista valuuttaa",
"a1": "ladata",
"a2": "Osta kolikoita",
"a3": "Rekisteröidy nyt ja ansaitse jopa 100 dollaria bonuksina",
"a4": "Suosittele 3 ystävää",
"a5": "Hanki 8 USDT lahjakortin muodossa",
"a6": "varat",
"a7": "Vastaa kysymyksiin avataksesi sopimuskaupan",
"a8": "Sinun on täytettävä kysymykset ennen tilauksen tekemistä, mikä vie noin viisi minuuttia",
"a9": "Suosittuja artikkeleita"
}
}

15
i18n/lang/fra.json

@ -787,5 +787,18 @@
"b6": "Pour certifier",
"b7": "Confirmer l'achat",
"b8": "Confirmation de la vente"
}
},
"ybgcoins3":{
"a0":"Avoir une monnaie numérique",
"a1": "complément",
"a2": "Acheter en",
"a3": "Inscrivez-vous maintenant et gagnez jusqu’à 100 $de bonus",
"a4": "Recommander 3 amis",
"a5": "Obtenez 8 USDT sous forme de carte-cadeau",
"a6": "Les actifs",
"a7": "Répondez aux questions pour ouvrir une transaction de contrat",
"a8": "Avant de formaliser votre commande, vous devez remplir les réponses. Cela vous prendra environ cinq minutes",
"a9": "Articles les plus populaires"
}
}

14
i18n/lang/it.json

@ -787,5 +787,17 @@
"b6": "De autenticazione",
"b7": "Conferma acquisto",
"b8": "Conferma vendita"
}
},
"ybgcoins3":{
"a0":"Avere una moneta digitale",
"a1": "complementari",
"a2": "Comprare fb",
"a3": "Registrazione immediata, guadagni fino a 100 dollari in bonus",
"a4": "Raccomandatevi 3 amici",
"a5": "), sotto forma di carta da regalo (8)",
"a6": "beni",
"a7": "Rispondere alle domande per aprire le transazioni contrattuali",
"a8": "Presidente. — l’ordine del giorno reca la discussione sulla relazione (doc",
"a9": "Articoli caldi"
}
}

14
i18n/lang/jp.json

@ -787,5 +787,17 @@
"b6": "認証に行きます",
"b7": "購入確認",
"b8": "販売の確認"
}
},
"ybgcoins3":{
"a0":"デジタル通貨を所有する",
"a1": "チャージする",
"a2": "コインを購入する",
"a3": "今すぐ登録して、最大100ドルのボーナスを獲得する",
"a4": "3人の友達を紹介する",
"a5": "ギフトカードとして8 USDTを獲得する",
"a6": "資産",
"a7": "契約取引を開始するために問題に答える必要があります",
"a8": "正式な注文を行う前に、約5分間のクイズに回答する必要があります",
"a9": "人気の記事"
}
}

14
i18n/lang/kor.json

@ -787,5 +787,17 @@
"b6":"인증 하 러 가다",
"b7":"구 매 확인",
"b8":"판매 확인"
}
},
"ybgcoins3":{
"a0":"디지털 화폐를 가지고 있습니다",
"a1": "충전",
"a2": "사 머니",
"a3": "즉시 등록하여 100달러의 상금을 벌었다",
"a4": "좋은 친구 3명을 추천합니다",
"a5": "선물 카드로 8 usdt를 받았다",
"a6": "자산",
"a7": "계약을 시작하기 위해 질문에 답하라",
"a8": "정식으로 주문을 하기 전에 너는 반드시 문제를다 풀어야 하는데, 이렇게 하려면 대략 5분 정도 시간이 걸릴 것이다",
"a9": "인기 문장"
}
}

14
i18n/lang/pl.json

@ -783,5 +783,17 @@
"b6":"De uwierzytelnianie",
"b7":"Potwierdzenie zakupu",
"b8":"Potwierdzenie sprzedaży"
}
},
"ybgcoins3":{
"a0":"Posiadaj sumę cyfrowej waluty",
"a1": "Ładowania",
"a2": "Kup monety",
"a3": "Zarejestruj się teraz i zarób do 100 $ w bonusach",
"a4": "Poleć 3 znajomych",
"a5": "Zdobądź 8 USDT w formie karty podarunkowej",
"a6": "aktywa",
"a7": "Odpowiedz na pytania, aby otworzyć transakcję kontraktową",
"a8": "Musisz wypełnić pytania przed złożeniem zamówienia, co zajmie Ci około pięciu minut",
"a9": "Popularne artykuły"
}
}

14
i18n/lang/pt.json

@ -785,5 +785,17 @@
"b6":"De autenticação",
"b7":"Confirmar compra",
"b8":"Confirmar Venda"
}
},
"ybgcoins3":{
"a0":"Tenha uma moeda digital",
"a1": "Para recarregar",
"a2": "Comprar moedas",
"a3": "Inscreva-se agora e ganhe até $100 em bônus",
"a4": "Indique 3 amigos",
"a5": "Ganhe 8 USDT em forma de cartão-presente",
"a6": "activos",
"a7": "Responda às perguntas para abrir uma negociação de contrato",
"a8": "Antes de formalizar o pedido, você deve completar as perguntas, o que levará cerca de cinco minutos",
"a9": "Artigos mais populares"
}
}

14
i18n/lang/spa.json

@ -787,5 +787,17 @@
"b6":"Descertificación",
"b7":"Confirmar la compra",
"b8":"Confirmación de la venta"
}
},
"ybgcoins3":{
"a0":"Tener una moneda digital",
"a1": "en",
"a2": "Comprar la moneda",
"a3": "Regístrese ahora y gane hasta $100 de bonificación",
"a4": "Recomienda a 3 amigos",
"a5": "Obtenga 8 USDT en forma de tarjeta de regalo",
"a6": "activos",
"a7": "Responda las preguntas para abrir el comercio de contratos",
"a8": "Antes de formalizar el pedido, debe completar las preguntas, lo que le llevará aproximadamente cinco minutos",
"a9": "Artículos más populares"
}
}

14
i18n/lang/swe.json

@ -783,5 +783,17 @@
"b6":"Verifiering av",
"b7":"Bekräfta köp",
"b8":"Bekräfta försäljning"
}
},
"ybgcoins3":{
"a0":"Äg en summa digital valuta",
"a1": "Ladda",
"a2": "Köp mynt",
"a3": "Registrera dig nu och tjäna upp till $100 i bonusar",
"a4": "Rekommendera 3 vänner",
"a5": "Få 8 USDT i form av ett presentkort",
"a6": "tillgångar",
"a7": "Svara på frågor för att öppna en kontraktshandel",
"a8": "Du måste fylla i frågorna innan du gör din beställning, vilket tar cirka fem minuter",
"a9": "Populära artiklar"
}
}

14
i18n/lang/tr.json

@ -785,5 +785,17 @@
"b6": "de authentication",
"b7": "alışveri onaylayın",
"b8": "satış doğrulaması"
}
},
"ybgcoins3":{
"a0":"Bir miktar dijital para birimine sahip olun",
"a1": "Şarj",
"a2": "Jeton satın al",
"a3": "Şimdi kaydolun ve 100 $ 'a kadar bonus kazanın",
"a4": "3 arkadaşa tavsiye et",
"a5": "Hediye kartı şeklinde 8 USDT kazanın",
"a6": "Varlık",
"a7": "Sözleşmeli bir işlem açmak için soruları yanıtlayın",
"a8": "Siparişinizi vermeden önce soruları tamamlamanız gerekir, bu da yaklaşık beş dakika sürecektir",
"a9": "Popüler makaleler"
}
}

14
i18n/lang/ukr.json

@ -783,5 +783,17 @@
"b6": "de authentication",
"b7": "підтвердити купу",
"b8": "підтвердження продажу"
}
},
"ybgcoins3":{
"a0":"Володійте сумою цифрової валюти",
"a1": "Поповнити",
"a2": "Купити монети",
"a3": "Зареєструйтеся зараз і заробляйте до $100 бонусів",
"a4": "Рекомендуйте 3 друзів",
"a5": "Отримайте 8 USDT у вигляді подарункової картки",
"a6": "Активів",
"a7": "Відповідаємо на питання по відкриттю контрактної торгівлі",
"a8": "Ви повинні заповнити питання перед розміщенням замовлення, що займе у вас близько п'яти хвилин",
"a9": "Популярні статті"
}
}

14
i18n/lang/zh-CN.json

@ -798,5 +798,17 @@
"b6": "去认证",
"b7": "确认购买",
"b8": "确认出售"
}
},
"ybgcoins3":{
"a0":"拥有一笔数字货币",
"a1": "充值",
"a2": "买币",
"a3": "立即注册,赚取高达100美元的奖金",
"a4": "推荐3位好友",
"a5": "以礼品卡形式获得8 USDT",
"a6": "資產",
"a7": "回答问题以开启合约交易",
"a8": "在正式下单前,你必须完成答题,这大约会需要你五分钟的时间",
"a9": "热门文章"
}
}

12
i18n/lang/zh-TW.json

@ -839,5 +839,17 @@
"b6": "去認證",
"b7": "確認購買",
"b8": "確認出售"
},
"ybgcoins3":{
"a0":"擁有一筆數字貨幣",
"a1": "充值",
"a2": "買幣",
"a3": "立即註冊,賺取高達100美元的獎金",
"a4": "推薦3位好友",
"a5": "以禮品卡形式獲得8 USDT",
"a6": "資產",
"a7": "回答問題以開啓合約交易",
"a8": "在正式下單前,你必須完成答題,這大約會需要你五分鐘的時間",
"a9": "熱門文章"
}
}

24
layout/vButton.vue

@ -197,4 +197,28 @@ export default {
border-radius:inherit;
}
}
.yellow2 {
::v-deep uni-button {
background: #F7D558;
color: #000!important;
border:none;
border-radius:inherit;
}
}
.green2 {
::v-deep uni-button {
background: #2EBD85;
color: #000!important;
border:none;
border-radius:inherit;
}
}
.red2 {
::v-deep uni-button {
background: #F6465D;
color: #000!important;
border:none;
border-radius:inherit;
}
}
</style>

24
layout/vDropdwon.vue

@ -1,13 +1,15 @@
<template>
<view>
<view style="position: relative;">
<view @click="showShadow" class="dropWrap p-x-ms d-flex justify-between align-center fn-bold">
<view class="" v-if="contract==0">
{{ text }}
</view>
<view class="" v-else>
{{ text }}X
</view>
<view class="sanjiao"></view></view>
<view style="width: 10px;"></view>
<view class="" v-if="contract==0">
{{ text }}
</view>
<view class="" v-else>
{{ text }}X
</view>
<view class="sanjiao"></view>
</view>
<view class="dropdown">
<view :class="showIf ? 'dropdown-mask' : 'undropdown-mask'" @click="hideShadow"></view>
<!-- <view class="ul" :style="showIf?'height:'+list.length*30+'px':''"> -->
@ -95,19 +97,19 @@ export default {
box-sizing: border-box;
width: 100%;
height: 26px;
// border: 1px solid #e8ecef;
font-size: 12px;
color: $light;
color: #333!important;
padding: 4px 8px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #F5F5F5;
.sanjiao{
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right:5px solid transparent;
border-top:5px solid $light;
border-top:5px solid #666;
border-bottom:5px solid transparent;
transform: translateY(3px);
}

2
layout/vScroll.vue

@ -15,7 +15,7 @@
{{$t('common.loadMore')}}...
</van-loading>
</view>
<view v-else-if="finished" class="fn-center p-y-xs">
<view v-else-if="finished" class="fn-center p-y-xs color-dark">
{{$t('common.notMore')}}
</view>
</scroll-view>

57
pages/accountSettings/accountSettings.vue

@ -1,36 +1,36 @@
<template>
<v-page>
<v-page style="background-color: #fff;">
<!-- 头部 -->
<v-header :title="$t('accountSettings.a0')"></v-header>
<!-- 中间 -->
<view class=" m-y-sm rounded-md m-x-lg overflow-hidden box-shadow">
<view
class="p-y-xs per-bot p-x-md h-36 border-b border-gray-7 d-flex align-center justify-between bg-panel-3 "
class="p-y-xs per-bot p-x-md h-36 border-b d-flex align-center justify-between "
>
<span class="color-light">{{$t('accountSettings.a1')}}</span>
<span class="color-dark">{{$t('accountSettings.a1')}}</span>
<view class="d-flex align-center">
<van-icon name="user-circle-o" class="color-theme-1 fn-30"/>
</view>
</view>
<view
class="per-bot p-x-md p-y-md border-b border-gray-7 d-flex align-center justify-between bg-panel-3"
class="per-bot p-x-md p-y-md border-b d-flex align-center justify-between"
>
<span class="color-light">{{$t('accountSettings.a2')}}</span>
<view class="d-flex align-center">
<span class="color-dark">{{$t('accountSettings.a2')}}</span>
<view class="d-flex align-center color-dark">
<span>{{user.username}}</span>
</view>
</view>
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between bg-panel-3">
<span class="color-light">{{$t('accountSettings.a3')}}</span>
<view class="d-flex align-center">
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between">
<span class="color-dark">{{$t('accountSettings.a3')}}</span>
<view class="d-flex align-center color-dark">
<span>{{user.account}}</span>
</view>
</view>
<!-- #ifdef APP-PLUS -->
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between bg-panel-3">
<span class="color-light">{{$t('common.c2')}}</span>
<view class="d-flex align-center">
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between">
<span class="color-dark">{{$t('common.c2')}}</span>
<view class="d-flex align-center color-dark">
<span>{{versions}}</span>
</view>
</view>
@ -40,9 +40,9 @@
<!-- <v-link
to="/pages/safe/phone"
tag="div"
class="per-bot p-x-md border-b border-gray-7 p-y-md d-flex align-center justify-between bg-panel-3 "
class="per-bot p-x-md border-b p-y-md d-flex align-center justify-between "
>
<span class="color-light">{{$t('accountSettings.a4')}}</span>
<span class="color-dark">{{$t('accountSettings.a4')}}</span>
<view class="d-flex align-center">
<span class="color-right">{{user.phone}}</span>
<span class="color-theme-1 m-l-xs" v-if="user.phone">{{$t('accountSettings.a5')}}</span>
@ -60,10 +60,10 @@
<v-link
tag="div"
to="/pages/safe/email"
class="per-bot p-x-md p-y-md d-flex align-center justify-between bg-panel-3"
class="per-bot p-x-md p-y-md d-flex align-center justify-between"
>
<span class="color-light">{{$t('accountSettings.a7')}}</span>
<view class="d-flex align-center">
<span class="color-dark">{{$t('accountSettings.a7')}}</span>
<view class="d-flex align-center color-dark">
<span>{{user.email}}</span>
<span class="color-theme-1 m-l-xs" v-if="user.email">{{$t('accountSettings.a5')}}</span>
<span class="color-theme-1 m-l-xs" v-else>{{$t('accountSettings.a6')}}</span>
@ -78,8 +78,8 @@
</v-link>
</view>
<view class="m-y-sm m-x-lg overflow-hidden rounded-md box-shadow">
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between bg-panel-3">
<view class="color-light">{{$t('accountSettings.b2')}}</view>
<view class="per-bot p-x-md p-y-md d-flex align-center justify-between">
<view class="color-dark">{{$t('accountSettings.b2')}}</view>
<view class="d-flex align-center">
<v-lang/>
<van-icon
@ -96,9 +96,9 @@
<view class="m-x-lg rounded-md overflow-hidden box-shadow">
<view
@click="outLogin"
class="per-bot p-x-md border-b border-gray-7 p-y-md d-flex align-center justify-between bg-panel-3 "
class="per-bot p-x-md border-b p-y-md d-flex align-center justify-between "
>
<span class="color-light">{{$t('accountSettings.a8')}}</span>
<span class="color-dark">{{$t('accountSettings.a8')}}</span>
<view class="d-flex align-center">
<van-icon
class="p-l-xs"
@ -112,9 +112,9 @@
<view
@click="loginOut"
class="per-bot p-x-md p-y-md d-flex align-center justify-between bg-panel-3"
class="per-bot p-x-md p-y-md d-flex align-center justify-between"
>
<span class="color-light">{{$t('accountSettings.a9')}}</span>
<span class="color-dark">{{$t('accountSettings.a9')}}</span>
<view class="d-flex align-center">
<van-icon
class="p-l-xs"
@ -137,7 +137,7 @@
@click="outLogin"
>{{$t('accountSettings.a8')}}</van-button>
<view class="m-t-md">
<v-button block class="w-max color-light" plain @click="loginOut">{{$t('accountSettings.a9')}}</v-button>
<v-button block class="w-max color-dark" plain @click="loginOut">{{$t('accountSettings.a9')}}</v-button>
</view>
</view> -->
</v-page>
@ -203,4 +203,13 @@ export default {
::v-deep .lb-picker-default-slot {
font-size: 14px !important;
}
/deep/ .van-nav-bar__left .van-nav-bar__arrow{
color: #000;
}
/deep/ .van-nav-bar__title{
color: #000;
}
.border-b::after{
border-bottom: 1px solid #e5e5e5;
}
</style>

20
pages/assets/address-list.vue

@ -9,7 +9,7 @@
</template>
</v-header>
<main class="layout-main p-t-md">
<view class="p-md fn-sm">
<view class="p-md fn-sm" style="color: #666;">
<ul>
<li class="m-b-xs">·{{ $t("assets.a1") }}</li>
<li>·API{{ $t("assets.a2", { name: "API" }) }}</li>
@ -17,10 +17,10 @@
</view>
<template v-for="parentItem in list">
<view
class="bg-panel-4 m-md rounded overflow-hidden box-shadow"
class="m-md rounded overflow-hidden box-shadow" style="background-color: #f5f5f5;"
:key="parentItem.coin_name"
>
<view class="fn-16 p-x-md p-y-md border-b color-light">{{
<view class="fn-16 p-x-md p-y-md border-b color-dark">{{
parentItem.coin_name
}}</view>
<ul class="list" v-if="query.from == 'draw'">
@ -41,11 +41,11 @@
></van-checkbox>
</view>
<view class="flex-fill" @click="selectAddress(item)">
<view class="title color-light eps-2 m-b-xs">{{
<view class="title color-dark eps-2 m-b-xs">{{
item.address_note
}}</view>
<view class="fn-sm">{{ item.address }}</view>
<view class="time fn-sm">{{ item.datetime | parseTime }}</view>
<view class="fn-sm color-dark">{{ item.address }}</view>
<view class="time fn-sm color-dark">{{ item.datetime | parseTime }}</view>
</view>
<van-icon name="arrow" />
</view>
@ -77,11 +77,11 @@
></van-checkbox>
</view>
<view class="flex-fill">
<view class="title color-light eps-2 m-b-xs">{{
<view class="title color-dark eps-2 m-b-xs">{{
item.address_note
}}</view>
<view class="fn-sm">{{ item.address }}</view>
<view class="time fn-sm">{{ item.datetime | parseTime }}</view>
<view class="fn-sm color-dark">{{ item.address }}</view>
<view class="time fn-sm color-dark">{{ item.datetime | parseTime }}</view>
</view>
<van-icon name="arrow" />
</v-link>
@ -103,7 +103,7 @@
block
@click="_router.push('/pages/assets/edit-address')"
v-else
type="blue"
type="yellow2"
>{{ $t("assets.a4") }}</v-button
>
</view>

16
pages/assets/bill.vue

@ -2,29 +2,29 @@
<div class="layout-page" :style="themeStyle">
<v-header :title="`${query.coin_name}${$t('assets.a7')}`"></v-header>
<div class="bg-panel-4 d-flex justify-between p-md fn-center">
<div class="d-flex justify-between p-md fn-center">
<div class="item">
<div class="label m-b-xs fn-sm">{{$t('assets.a8')}}{{query.coin_name}}</div>
<div class="num color-light fn-lg">{{omitTo(detail.total_assets,4)}}</div>
<div class="num color-dark fn-lg">{{omitTo(detail.total_assets,4)}}</div>
</div>
<div class="item">
<div class="label m-b-xs fn-sm">{{$t('assets.a9')}}{{query.coin_name}}</div>
<div class="num color-light fn-lg">{{omitTo(detail.usable_balance,4)}}</div>
<div class="num color-dark fn-lg">{{omitTo(detail.usable_balance,4)}}</div>
</div>
<div class="item">
<div class="label m-b-xs fn-sm">{{$t('assets.b0')}}{{query.coin_name}}</div>
<div class="num color-light fn-lg">{{omitTo(detail.freeze_balance,4)}}</div>
<div class="num color-dark fn-lg">{{omitTo(detail.freeze_balance,4)}}</div>
</div>
</div>
<!-- 币币 -->
<v-paging class="layout-main" :ajax="getWalletLogs" :data="query">
<template #box="list">
<div v-for="item in $list(list)" class="item bg-panel-4 m-x-md m-y-xs rounded-sm box-shadow" :key="item.datetime">
<div v-for="item in $list(list)" class="item m-x-md m-y-xs rounded-sm bg-FA" :key="item.datetime">
<div class="head d-flex align-center border-b p-x-md p-y-xs justify-between">
<div class="d-flex justify-between">
<div>
<div class="color-light fn-lg">{{query.coin_name}}</div>
<div class="fn-10">{{item.created_at}}</div>
<div class="color-dark fn-lg">{{query.coin_name}}</div>
<div class="fn-10 color-gray-6">{{item.created_at}}</div>
</div>
</div>
<div
@ -32,7 +32,7 @@
:class="item.amount*1<0?'color-sell':'color-buy'"
>{{item.amount*1>=0?'+':''}}{{item.amount*1}}</div>
</div>
<div class="p-x-md p-y-xs color-light">{{item.log_type_text}}</div>
<div class="p-x-md p-y-xs color-dark">{{item.log_type_text}}</div>
</div>
</template>
</v-paging>

7
pages/assets/coin-list.vue

@ -9,7 +9,7 @@
<template v-for="item in showList">
<view
v-if="item.coin_name=='USDT'||item.coin_name=='BTC'||item.coin_name=='ETH'"
class="p-y-md p-x-xs align-center justify-between d-flex link-active m-x-md border-b"
class="p-y-md p-x-xs align-center justify-between d-flex link-active m-x-md border-b color-dark"
@click="$emit('input',item.coin_name);$emit('close');$emit('imgs',item)"
>
@ -17,7 +17,7 @@
<img :src="item.image" class="h-25 m-r-xs"/>
{{item.coin_name}}
</view>
<view class="color-light">{{item.usable_balance}}</view>
<view class="color-dark">{{item.usable_balance}}</view>
</view>
</template>
</view>
@ -104,4 +104,7 @@ export default {
transform: translateY(0);
}
}
/deep/ .van-cell, /deep/ .van-search__action, /deep/ .van-field__input{
color: #666;
}
</style>

54
pages/assets/draw.vue

@ -14,14 +14,14 @@
</template>
</v-header>
<view class="layout-main">
<view class="coin border-b p-x-lg p-md d-flex justify-between m-t-md" @click="coinListShow=true">
<view class="fn-25 color-light">{{ coin }}</view>
<view class="d-flex align-center">
<view class="coin border-b p-x-lg p-md d-flex justify-between m-t-md" style="border-bottom: 2px solid #f5f5f5;" @click="coinListShow=true">
<view class="fn-25 color-dark">{{ coin }}</view>
<view class="d-flex align-center color-dark">
{{ $t('recharge.a0') }}
<van-icon name="arrow"/>
</view>
</view>
<view class="bg-panel-3" style="height: 100%;">
<view class="" style="padding-bottom: 90px;">
<view class="">
<view
class="d-flex flex-wrap justify-between align-center p-x-lg p-y-ms color-light"
@ -37,13 +37,13 @@
<view class="rounded-xs p-x-lg p-y-ms m-r-md"
size="mini"
@click="changeRechargeType(2)"
:class="rechargeType==2?'bor-active':'bg-panel-3 border'"
:class="rechargeType==2?'bor-active':'bg-F5 border color-gray-6'"
>ERC20
</view>
<view class="rounded-xs p-x-lg p-y-ms m-r-md"
size="mini"
@click="changeRechargeType(3)"
:class="rechargeType==3?'bor-active':'bg-panel-3 border'"
:class="rechargeType==3?'bor-active':'bg-F5 border color-gray-6'"
>TRC20
</view>
@ -51,8 +51,8 @@
</view>
</view>
<view class="p-x-lg d-flex justify-between flex-wrap align-center p-y-xs">
<view class="color-light d-block w-max m-y-ms color-light fn-15">{{ $t("assets.b8") }}</view>
<v-input v-model="form.address" class="bg-form-panel-3 p-sm color-light w-max fn-13 rounded-xs"
<view class="color-dark d-block w-max m-y-ms fn-15">{{ $t("assets.b8") }}</view>
<v-input v-model="form.address" class="bg-F5 p-sm color-dark w-max fn-13 rounded-xs"
:placeholder="$t('assets.b9')">
<!--<template #right>-->
<!-- &lt;!&ndash; #ifdef H5 &ndash;&gt;-->
@ -72,15 +72,15 @@
</view>
</view>
</view>
<view class="form bg-panel-3 p-x-lg">
<view class="d-flex align-center p-y-md justify-between color-light fn-15">
<span class="color-light">{{ $t("assets.c0") }}</span>
<view class="form p-x-lg">
<view class="d-flex align-center p-y-md justify-between color-dark fn-15">
<span class="color-dark">{{ $t("assets.c0") }}</span>
<span>{{ $t("assets.c1") }}{{ withdrawFee.usable_balance }}
{{ coin }}</span>
</view>
<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-sm p-x-ms">
<view class="d-flex align-end p-y-xs justify-between bg-F5 rounded-xs p-sm p-x-ms">
<v-input type="number" v-model="form.amount" :min="withdrawFee.withdrawal_min"
:max="withdrawFee.withdrawal_max" class=" w-8/12 color-light fn-13"
:max="withdrawFee.withdrawal_max" class=" w-8/12 color-dark fn-13"
:placeholder="$t('assets.c2')"></v-input>
<view class="d-flex align-end">
<span class="unit fn-16 flex-shrink">{{ coin }}</span>
@ -89,36 +89,36 @@
</view>
</view>
</view>
<view class="d-flex align-center p-y-xs justify-between fn-13">
<view class="d-flex align-center p-y-xs justify-between fn-13 color-dark">
<span>{{ $t('common.c1') }}</span>
<span class="color-light">{{ withdrawFee.withdrawal_min }} {{ coin }}</span>
<span class="color-dark">{{ withdrawFee.withdrawal_min }} {{ coin }}</span>
</view>
<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
<view class="d-flex align-center p-y-xs m-t-ms justify-between color-dark fn-15">
<span>{{ $t("assets.c4") }}</span>
<!-- <span class="color-light">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
<!-- <span class="color-dark">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
</view>
<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-y-sm">
<view class="d-flex align-end p-y-xs justify-between bg-F5 rounded-xs p-y-sm">
<v-input v-model="coin=='USDT'&&rechargeType==3?withdrawFee.trc20:withdrawFee.withdrawal_fee" disabled
class="p-x-ms color-light w-max fn-13 rounded-xs" :placeholder="$t('assets.b9')">
class="p-x-ms color-dark w-max fn-13 rounded-xs" :placeholder="$t('assets.b9')">
<template #right>
{{ coin }}
</template>
</v-input>
</view>
<view class="d-flex align-center p-y-xs m-t-ms justify-between color-light fn-15">
<view class="d-flex align-center p-y-xs m-t-ms justify-between color-dark fn-15">
<span>{{ $t("reg.a8") }}</span>
<!-- <span class="color-light">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
<!-- <span class="color-dark">{{ withdrawFee.withdrawal_fee }} {{coin}}</span> -->
</view>
<view class="d-flex align-end p-y-xs justify-between bg-form-panel-3 rounded-xs p-y-sm">
<view class="d-flex align-end p-y-xs justify-between bg-F5 rounded-xs p-y-sm">
<v-input type="password" v-model="form.password" class="p-x-ms color-light w-max fn-13 rounded-xs" :placeholder="$t('reg.a9')">
<v-input type="password" v-model="form.password" class="p-x-ms color-dark w-max fn-13 rounded-xs" :placeholder="$t('reg.a9')">
</v-input>
</view>
</view>
<view class="form bg-panel-3 p-x-lg p-y-md">
<ul class="fn-md rounded-md m-y-xs line-height-2">
<view class="form p-x-lg p-y-md">
<ul class="fn-md rounded-md m-y-xs line-height-2 color-gray-6">
<li>·{{ $t("assets.c5") }}</li>
<li>·{{ $t("assets.c6") }}</li>
<li>·{{ $t("assets.c7") }}</li>
@ -165,8 +165,8 @@
</table>
</view>
</view> -->
<view class="bot w-max bg-panel-3 p-lg box-size">
<v-button class="w-max m-y-md rounded-xs" block type="yellow" @click="toDraw" ref="btn">{{
<view class="bot w-max p-lg box-size">
<v-button class="w-max m-y-md rounded-xs" block type="yellow2" @click="toDraw" ref="btn">{{
$t("assets.b6")
}}
</v-button>

21
pages/assets/recharge.vue

@ -3,7 +3,6 @@
<v-header>
<template #title>
{{$t('assets.e5')}}
<!-- <span class="color-theme-1">{{coin}}</span> -->
</template>
<template #right>
<v-link :to="'/pages/assets/records?type='+type">
@ -12,13 +11,13 @@
</template>
</v-header>
<view class="layout-main">
<view class="coin border-b p-x-lg p-md d-flex justify-between m-t-md" @click="coinListShow=true">
<view class="fn-25 color-light">{{coin}}</view>
<view class="d-flex align-center">
<view class="coin p-x-lg p-md d-flex justify-between m-t-md" style="border-bottom: 2px solid #f5f5f5;" @click="coinListShow=true">
<view class="fn-25 color-dark">{{coin}}</view>
<view class="d-flex align-center color-dark">
{{$t('recharge.a0')}}<van-icon name="arrow" />
</view>
</view>
<view class="bg-panel-3">
<view class="">
<view class="rounded-md">
<view
class="d-flex flex-wrap justify-between align-center p-x-lg p-y-md color-light"
@ -35,12 +34,12 @@
<view class="rounded-xs p-x-lg p-y-ms m-r-md"
size="mini"
@click="changeRechargeType(2)"
:class="rechargeType==2?'bor-active':'bg-panel-3 border'"
:class="rechargeType==2?'bor-active':'bg-F5 border color-gray-6'"
>ERC20</view>
<view class="rounded-xs p-x-lg p-y-ms"
size="mini"
@click="changeRechargeType(3)"
:class="rechargeType==3?'bor-active':'bg-panel-3 border'"
:class="rechargeType==3?'bor-active':'bg-F5 border color-gray-6'"
>TRC20</view>
</view>
@ -57,14 +56,14 @@
<view class="info p-b-md rounded-md">
<view class="address p-t-xs">
<!-- <view class="label w-100">{{$t('assets.e7')}}</view> -->
<view class="border-r w-10/12 autowidth p-x-md p-y-ms address-txt p-x-xs flex-fill color-light fn-center bg-form-panel-3 rounded-xs">{{form.address}}</view>
<view class="border-r w-10/12 autowidth p-x-md p-y-ms address-txt p-x-xs flex-fill color-dark fn-center bg-F5 rounded-xs">{{form.address}}</view>
<!-- #ifndef H5 -->
<view class="w-9/12 bg-lin p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="$copy(form.address)">
<view class="w-9/12 bg-yellow2 p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="$copy(form.address)">
{{$t('recharge.a4')}}<i class="iconfont color-black m-l-xs">&#xe706;</i>
</view>
<!-- #endif -->
<!-- #ifdef H5 -->
<view class="w-9/12 bg-lin p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="copy(form.address)">
<view class="w-9/12 bg-yellow2 p-y-ms rounded-xs m-t-md autowidth color-black p-x-xs fn-16 fn-center" @click="copy(form.address)">
{{$t('recharge.a4')}}<i class="iconfont color-black m-l-xs">&#xe706;</i>
</view>
<!-- #endif -->
@ -80,7 +79,7 @@
<v-button type="theme" block class="w-max m-t-md" @click="recharge" ref="btn">{{$t('common.confirm')}}</v-button> -->
</view>
<view class="m-y-md rounded-md">
<ul class="p-md fn-sm rounded-md m-y-xs p-x-lg">
<ul class="p-md fn-sm rounded-md m-y-xs p-x-lg color-gray-6">
<li>·
<span v-if="coin=='USDT'">{{$t('common.c0',{num:'10 '+coin})}}</span>
<span v-if="coin=='BTC'">{{$t('common.c0',{num:'0.0005 '+coin})}}</span>

6
pages/auth/index.vue

@ -1,9 +1,9 @@
<template>
<view class="layout-page" :style="themeStyle">
<v-header :title="$t('auth.a0')" :leftClick="leftClick"></v-header>
<view class="rounded-md overflow-hidden m-lg bg-panel-3 box-shadow">
<view class="rounded-md overflow-hidden m-lg box-shadow">
<v-link :to="detail.primary_status==0?'/pages/auth/primary':''" class="d-flex align-center p-md border-b link-active ">
<view class="flex-fill color-light fn-lg">
<view class="flex-fill color-dark fn-lg">
{{$t('auth.a1')}}
</view>
<view class="status" v-if="detail.primary_status==0">
@ -17,7 +17,7 @@
<van-icon class="m-l-xs" name="arrow" />
</v-link>
<v-link tag="view" :to="detail.status!=2&&detail.status!=1?'/pages/auth/senior':''" class="d-flex align-center p-md border-b link-active">
<view class="flex-fill color-light fn-lg ">
<view class="flex-fill color-dark fn-lg ">
{{$t('auth.a4')}}
</view>
<view class="status " v-if="detail.status==0">

4
pages/auth/primary.vue

@ -165,10 +165,6 @@ export default {
.uni-picker-view-indicator, .uni-picker-view-mask{
background-color: rgba(255,255,255,0.5)!important;
}
// uni-datetime-picker,
/deep/.uni-picker-view-indicator, /deep/uni-resize-sensor{
background-color: #fff;
}
/deep/.uni-picker-view-mask::before, uni-picker-view-column::before{
content: ''!important;
width: 100%!important;

406
pages/base/home.vue

@ -61,26 +61,12 @@
:refresher-threshold="50"
> -->
<!-- 轮播 -->
<!-- <swiper
class="my-swipe m-x-md p-b-xs"
:autoplay="true"
indicator-dots
indicator-color="white"
>
<swiper-item
class="my_swipe_item"
v-for="(item, idx) in home"
:key="idx"
>
<img width="100%" height="100%" class="rounded-sm" fit="cover" :src="item.imgurl"/>
</swiper-item>
</swiper> -->
<div class="swiper-imgbox">
<div class="swiper-imgbox" v-if="0">
<img src="../../assets/img/bg/yb4.jpg" alt="" />
</div>
<!-- num count -->
<div class="num-count">
<div class="num-count" v-if="0">
<div class="num-top d-flex">
<div class="num-left">
<div class="num">5 {{$t("common.million")}}+</div>
@ -112,7 +98,7 @@
</div>
<!-- why you choose -->
<div class="choose" style="width: 100%; height: 560px; margin-top: 80px">
<div class="choose" style="width: 100%; height: 560px; margin-top: 80px" v-if="0">
<div class="section-choose">
<div class="section-choose-title">
<div class="text">{{$t("common.Why")}}</div>
@ -131,7 +117,7 @@
</div>
<!-- section help -->
<div class="section-help">
<div class="section-help" v-if="0">
<div class="section-help-name">
<div class="section-help-name_icon">
<img src="../../assets/img/icon/eyes.svg" alt="" />
@ -167,7 +153,7 @@
</div>
<!-- our technology -->
<div class="technology" style="width: 100%; height: 732px; margin-top: 50px">
<div class="technology" style="width: 100%; height: 732px; margin-top: 50px" v-if="0">
<div class="section-choose">
<div class="section-choose-title">{{$t("common.technology")}}</div>
<div class="dot-box d-flex">
@ -184,7 +170,7 @@
<!-- beginner's guide -->
<div class="beginner" style="width: 100%; height: 980px">
<div class="beginner" style="width: 100%; height: 980px" v-if="0">
<div class="section-choose">
<div class="section-choose-title">{{$t("common.guide")}}</div>
<div class="dot-box d-flex">
@ -247,6 +233,34 @@
</div>
</div>
<view class="btn-group1-box" v-if="isLogin">
<view class="d-flex">
<view class="txt">{{$t("ybgcoins3.a0")}}</view>
<image src="../../assets/img/bg/bg3.png" mode=""></image>
</view>
<view class="d-flex btn-group1">
<!-- <view>{{$t("ybgcoins3.a1")}}</view> -->
<navigator url="/pages/assets/recharge">{{$t("ybgcoins3.a1")}}</navigator>
<navigator class="theme-color-a" url="/pages/base/index?tel=exchange-operation">{{$t("ybgcoins3.a2")}}</navigator>
</view>
</view>
<view class="btn-group1-box" v-else>
<view class="d-flex">
<view class="txt">{{$t("ybgcoins3.a3")}}</view>
<image src="../../assets/img/bg/bg3.png" mode=""></image>
</view>
<view class="d-flex btn-group1">
<navigator url="/pages/login/index">{{$t("exchange.d0")}}</navigator>
<navigator class="theme-color-a" url="/pages/reg/index">{{$t("reg.b9")}}</navigator>
</view>
</view>
<view class="card1-box">
<view class="card1-left">
<view>{{$t("ybgcoins3.a4")}}</view>
<view class="main-txt">{{$t("ybgcoins3.a5")}}</view>
</view>
<image src="../../assets/img/bg/bg3.png" mode=""></image>
</view>
<!-- log in and register -->
<!-- <div class="log-group d-flex">
<div class="log-in log_type">{{$t('login.a4')}}</div>
@ -331,109 +345,113 @@
</view> -->
<!-- 指数 -->
<!-- <view class="stock-swipe d-flex p-x-md m-t-ms">
<view
class="swipe_right flex-fill lists"
v-for="(parentItem,index) in marketList"
v-if="index==1"
:key="parentItem.coin_name"
>
<view
v-for="(item,iindex) in parentItem.collect
? collect
: parentItem.marketInfoList"
:key="iindex"
class="stock-index item flex-fill p-y-ms rounded-xs box-size lists-1"
v-if="item.pair_name=='BTC/USDT'||item.pair_name=='ETH/USDT'||item.pair_name=='ETC/USDT'"
>
<v-link
:to="{
path: '/pages/exchange/index',
query: { code: item.pair_name },
}">
<view class="stock-index-img fn-12 color-gray-6 m-b-xs fn-center">
<view class="color-light">{{ item.pair_name }}
<text class="stock-item-3"
:class="item.increase * 1 < 0 ? 'color-sell' : 'color-buy'">
{{ item.increaseStr }}
</text>
</view>
</view>
<view class="fn-18 color-light fn-center m-b-xs"
:class="item.increase * 1 < 0 ? 'color-sell' : 'color-buy'">{{ item.close }}
</view>
<view
class="d-flex flex-col align-center fn-sm justify-center"
> -->
<!-- <view class="color-theme-6"> {{omitTo(item.close*price_cny,2)}}</view> -->
<!-- </view>
</v-link>
</view>
</view>
</view> -->
<view
class="swipe_right flex-fill lists"
v-for="(parentItem,index) in marketList"
v-if="index==1"
:key="parentItem.coin_name"
>
<view
v-for="(item,iindex) in parentItem.collect
? collect
: parentItem.marketInfoList"
:key="iindex"
class="stock-index item flex-fill p-y-ms rounded-xs box-size lists-1"
v-if="item.pair_name=='BTC/USDT'||item.pair_name=='ETH/USDT'||item.pair_name=='ETC/USDT'"
>
<v-link
:to="{
path: '/pages/exchange/index',
query: { code: item.pair_name },
}">
<view class="stock-index-img fn-12 color-gray-6 m-b-xs fn-center">
<view class="color-dark">{{ item.pair_name }}
<text class="stock-item-3"
:class="item.increase * 1 < 0 ? 'color-sell' : 'color-buy'">
{{ item.increaseStr }}
</text>
</view>
</view>
<view class="fn-18 color-dark fn-center m-b-xs"
:class="item.increase * 1 < 0 ? 'color-sell' : 'color-buy'">{{ item.close }}
</view>
<view
class="d-flex flex-col align-center fn-sm justify-center"
>
<view class="color-theme-6"> {{omitTo(item.close*price_cny,2)}}</view>
</view>
</v-link>
</view>
</view>
</view> -->
<view v-if="0" @click="_router.push('/pages/currency/index')" class="otc m-md bg-panel-3 m-t-md box-shadow rounded-lg d-flex justify-between align-center p-r-lg">
<view class="d-flex align-center">
<img width="43px" height="43px" src="static/img/b.png"/>
<view class="color-theme-2 fn-15 m-l-md d-flex align-center">{{ $t("first.b7") }}<span class="color-dark fn-12 m-l-xs">{{ $t("first.b6") }}</span></view>
</view>
<van-icon name="arrow" class="color-theme-2" />
</view>
<!-- 科创板 -->
<!-- <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">
<text class="m-x-xs fn-center" @click="active=0" :class="active==0?'fn-bold fn-15 p-b-xs bor5-active color-light':''">合約指數</text>
<text class="m-x-xs fn-center" @click="active=1" :class="active==1?'fn-bold fn-15 p-b-xs bor5-active color-light':''">現貨指數</text>
</view>
</view>
<template v-if="active==0" v-for="parentItem in (marketList)">
<view class="m-xs" :key="parentItem.coin_name" v-if="parentItem.coin_name=='USDT'">
<view v-for="item in parentItem.marketInfoList" :key="item.pair_name" class="bg-panel-3m-t-xs">
<view class="w-12/12">
<view class="fn-center w-max">
<v-link
:to="{
path: '/pages/exchange/index',
query: { code: item.pair_name },
}"
class="m-b-md m-x-xs rounded-sm bg-panel-3 box-shadow link-active d-flex justify-between align-center p-r-md p-y-md box-size p-x-xs"
v-for="item in parentItem.collect
? collect
: parentItem.marketInfoList"
:key="item.pair_name"
>
<view class="fn-left w-6/12">
<view class="d-flex align-center">
<text class="fn-bold fn-16 color-light">{{ item.pair_name }}</text>
<text class="color-default fn-14 m-l-xs">永续</text>
</view>
<view class="d-flex align-center fn-12 m-t-xs">
24H量 {{ omitTo(item.vol,0) }}
</view>
</view>
<view class="fn-left align-end w-3/12">
<view class="d-flex align-end fn-bold fn-16" :class="item.increase * 1 >0?'color-buy':'color-sell'">{{ item.close }}</view>
<view class="m-t-xs">
{{ omitTo(item.close*price_cny,2) }}
</view>
</view>
<view class="fn-right w-3/12">
<span
class="rounded-xs"
:class="
item.increase * 1 > 0 ? 'color-buy' : 'color-sell'
"
>{{ item.increaseStr }}</span
>
</view>
</v-link>
</view>
</view>
</view>
</view>
</template>
</view> -->
<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">
<text class="m-x-xs fn-center" @click="active=0" :class="active==0?'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>
<template v-if="active==0" v-for="parentItem in (marketList)">
<view class="m-xs" :key="parentItem.coin_name" v-if="parentItem.coin_name=='USDT'">
<view v-for="item in parentItem.marketInfoList" :key="item.pair_name" class="bg-panel-3m-t-xs">
<view class="w-12/12">
<view class="fn-center w-max">
<v-link
:to="{
path: '/pages/exchange/index',
query: { code: item.pair_name },
}"
class="m-b-md m-x-xs rounded-sm link-active d-flex justify-between align-center p-r-md p-y-md box-size p-x-xs"
v-for="item in parentItem.collect
? collect
: parentItem.marketInfoList"
:key="item.pair_name"
>
<view class="fn-left w-1/12">
<img :src="item.coin_icon" alt="icon" srcset="" style="width: 8vw;vertical-align: middle;">
</view>
<view class="fn-left w-6/12">
<view class="d-flex align-center">
<text class="fn-bold fn-16 color-dark">{{ item.pair_name }}</text>
<text class="color-dark fn-14 m-l-xs">永续</text>
</view>
<view class="d-flex align-center fn-12 m-t-xs">
24H量 {{ omitTo(item.vol,0) }}
</view>
</view>
<!-- <view class="fn-left align-end w-3/12">
<view class="d-flex align-end fn-bold fn-16" :class="item.increase * 1 >0?'color-buy':'color-sell'">{{ item.close }}</view>
</view> -->
<view class="fn-right w-3/12">
<span
class="rounded-xs fn-16 fn-bold"
:class="
item.increase * 1 > 0 ? 'color-buy' : 'color-sell'
"
>{{ item.increaseStr }}</span
>
<view class="m-t-xs">
{{ omitTo(item.close*price_cny,2) }}
</view>
</view>
</v-link>
</view>
</view>
</view>
</view>
</template>
</view>
<!-- $toast($t('first.b9')) -->
<!-- <view @click="_router.push('/pages/currency/index')" class="otc m-md bg-panel-3 m-t-md box-shadow rounded-lg d-flex justify-between align-center p-r-lg">
<view class="d-flex align-center">
<img width="43px" height="43px" src="static/img/b.png"/>
<view class="color-theme-2 fn-15 m-l-md d-flex align-center">{{ $t("first.b7") }}<span class="color-light fn-12 m-l-xs">{{ $t("first.b6") }}</span></view>
</view>
<van-icon name="arrow" class="color-theme-2"/>
</view> -->
<!-- <view class="m-x-md ">
<text @click="infoActive=0" class="m-r-lg" :class="infoActive==0?'fn-bold fn-16 bor5 color-light':''">{{ $t("first.b5") }}</text>
@ -546,7 +564,7 @@
</view>
<!-- 个人主页弹出层 -->
<van-popup class="personalCenter-main colbg bg-panel-4" :show="show" @close="show = false" position="left"
<van-popup class="personalCenter-main colbg" :show="show" @close="show = false" position="left"
custom-style="width:100%;height:100%">
<view style="height: var(--status-bar-height)"></view>
<view class="personalCenter-top">
@ -562,6 +580,11 @@
<img width="25px" height="25px" @click="changtTheme"
:src="theme == 'light' ? 'static/img/moon.png' : 'static/img/sun.png'" /> -->
<v-link to="/pages/accountSettings/accountSettings" tag="div">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page7.png')" alt="" class="h-20 m-r-xs" />
</view>
</v-link>
</view>
<view class="information p-l-md m-t-xl">
<!-- <img :src="logoMap.login_logo" class="h-50 w-50 d-block m-r-xs rounded-max flex-shrink" /> -->
@ -583,7 +606,7 @@
<!-- v-else -->
<view v-if="!isLogin" class="color-light" @click.stop>
<view v-if="!isLogin" class="color-dark" @click.stop>
<view class="fn-bold fn-16">
{{ $t("first.b2") }}
</view>
@ -600,7 +623,8 @@
</view>
<!-- <v-link :to="detail.status!=2?'/pages/auth/index':''" tag="div"-->
<v-link :to="detail.status!=2?'/pages/auth/index':'/pages/auth/index'" tag="div"
class="bg-form-panel-3 p-xs m-xs color-theme-1 d-flex justify-between align-center">
class="bg-form-panel-3 color-theme-1 d-flex justify-between align-center"
style="background-color: #fff;padding: 12px;">
<view class=" d-flex align-center">
<van-icon name="manager" class="fn-18" />
<text class="p-l-md fn-14">{{$t('auth.a1')}}</text>
@ -624,8 +648,7 @@
</v-link>
</view>
</view> -->
<view class="personalCenter-bottom m-t-md ">
<view class="personalCenter-bottom ">
<!-- <v-link to="/pages/commission/index" tag="div"
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="per-bot p-y-md p-x-sm d-flex align-center justify-between" @click="goMine()">
@ -654,7 +677,7 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page1.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("base.c1") }}</span>
<span class="color-dark">{{ $t("base.c1") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
@ -662,7 +685,7 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page3.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("base.c3") }}</span>
<span class="color-dark">{{ $t("base.c3") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
@ -670,7 +693,7 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page4.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("base.c4") }}</span>
<span class="color-dark">{{ $t("base.c4") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
@ -678,7 +701,7 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page5.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("base.c5") }}</span>
<span class="color-dark">{{ $t("base.c5") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
@ -686,7 +709,7 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('fill5.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("exchange.a1") }}</span>
<span class="color-dark">{{ $t("exchange.a1") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link> -->
@ -694,21 +717,21 @@
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page10.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{$t('first.a1')}}</span>
<span class="color-dark">{{$t('first.a1')}}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
<v-link to="/pages/accountSettings/accountSettings" tag="div"
<!-- <v-link to="/pages/accountSettings/accountSettings" tag="div"
class="per-bot p-y-md p-x-sm d-flex align-center justify-between">
<view class="d-flex align-center">
<img :src="$localImgUrl('Page7.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">{{ $t("base.c6") }}</span>
<span class="color-dark">{{ $t("base.c6") }}</span>
</view>
<van-icon name="arrow" class="fn-18" />
</v-link>
</v-link> -->
<!-- <view class="per-bot p-y-md p-x-sm d-flex align-center">
<img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" />
<span class="color-light">
<span class="color-dark">
<v-lang @change="
marketList = [];
indexData();
@ -716,11 +739,11 @@
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
</span>
</view> -->
<view class="h-100"></view>
<view v-if="isLogin" class="logout w-max bg-form-panel-4 fn-center color-light p-y-xs rounded-xs"
<!-- <view class="h-100"></view>
<view v-if="isLogin" class="logout w-max fn-center color-dark p-y-xs rounded-xs"
@click="loginOut">
<text class="w-max rounded-lg border-0">{{ $t("accountSettings.a9") }}</text>
</view>
</view> -->
</view>
</van-popup>
<van-toast id="van-toast" />
@ -924,6 +947,8 @@
},
//
getCollect(call) {
console.log(this.isLogin,'isLogin');
console.log(this.theme,'Theme');
if (!this.isLogin) return
Home.getCollect()
.then((res) => {
@ -1138,7 +1163,7 @@
.nav_bar {
width: 100%;
height: 50px;
background-color: #000;
background-color: #fff;
.nav-left {
width: 210px;
@ -1185,11 +1210,14 @@
}
}
.iconfont{
color: #000 !important;
}
}
.layout-main {
background-color: #000;
color: rgba(153, 153, 153, 0.8) !important;
background-color: #fff;
width: 100%;
.swiper-imgbox {
@ -1594,6 +1622,7 @@
.personalCenter-main {
.personalCenter-top {
box-sizing: border-box;
background-color: #fff;
.theme-switch {
padding: 5% 0;
@ -1708,6 +1737,10 @@
}
}
}
.personalCenter-bottom{
padding-top: 15px;
background-color: #fff;
}
}
.user-icon {
@ -1776,7 +1809,7 @@
}
.bor5-active {
border-bottom: 5px solid $theme-2;
border-bottom: 5px solid #F7D558;
}
.w-40 {
@ -1795,17 +1828,17 @@
position: relative;
}
.bor5:before {
position: absolute;
content: "";
bottom: -10px;
left: 20%;
width: 60%;
height: 2px;
border-radius: 10px;
background-color: $theme-2;
// border-bottom: 5px solid $border-color;
}
// .bor5:before {
// position: absolute;
// content: "";
// bottom: -10px;
// left: 20%;
// width: 60%;
// height: 2px;
// border-radius: 10px;
// background-color: $theme-2;
// // border-bottom: 5px solid $border-color;
// }
/deep/ .uni-swiper-dot {
width: 15px !important;
@ -1866,4 +1899,69 @@
.fn-9 {
font-size: 9px;
}
.btn-group1-box{
width: 90vw;
margin: 10px auto;
padding: 20px;
background-color: #f9f9f9;
border-radius: 12px;
.d-flex{
justify-content: space-between;
align-items: center;
}
.txt{
color: #000;
font-size: 22px;
flex: 1;
margin-right: 20px;
}
image{
width: 25vw;
height: 25vw;
}
.btn-group1{
margin-top: 20px;
view, navigator{
width: 48%;
text-align: center;
color: #000;
background-color: #eaeaea;
line-height: 40px;
border-radius: 20px;
}
.theme-color-a{
background-color: #FCD434;
}
}
}
.card1-box{
width: 90vw;
margin: 20px auto;
padding: 20px;
border: 1px solid #d6d6d6;
border-radius: 12px;
display: flex;
justify-content: space-between;
.card1-left{
font-size: 12px;
color: #999999;
flex:1;
.main-txt{
margin: 10px 10px 0px 0px;
font-size: 17px;
font-weight: bold;
color: #000;
}
}
image{
width: 20vw;
height: 20vw;
}
}
/deep/ .van-popup, /deep/ .van-popup--left{
background-color: #fff!important;
}
</style>

9
pages/base/index.vue

@ -12,7 +12,7 @@
:tabChange="tabChange"
></component>
</template>
<view class="footer d-flex p-y-xs bg-tab-nav flex-wrap fn-center">
<view class="footer d-flex p-y-xs bg-tab-nav flex-wrap fn-center" v-if="normalShow">
<view
class="item line-height-1 flex-fill"
:class="{ 'router-link-active': tab == item.tel }"
@ -113,13 +113,15 @@ export default {
tab: "",
tabShow: true,
mode: false,
normalShow: true,
}
},
methods: {
tabChange(name) {
this.tab = name
if (!this.cashViews.includes(name)) {
this.cashViews.push(name)
this.cashViews.push(name);
console.log(this.cashViews)
}
},
// #ifdef H5
@ -154,7 +156,8 @@ export default {
</script>
<style lang="scss" scoped>
.footer {
background-color: #000;
color: #ccc;
background-color: #fff;
box-shadow: $tab-nav-shadow;
position: relative;
z-index: 5;

124
pages/base/mine.vue

@ -1,65 +1,65 @@
<template>
<v-page>
<v-header :title="$t('base.d2')" :left-arrow="false"></v-header>
<!-- <view style="height: var(--status-bar-height)"></view> -->
<view
class="box-size head bg-panel-3 h-aut p-x-md m-x-md d-flex justify-between flex-wrap align-center bgb3 rounded-ms color-light"
:class="theme == 'light' ? 'bgb3-white' : ''" style="position: relative">
<v-page style="background-color: #fff;">
<!-- <v-header :title="$t('base.d2')" :left-arrow="false" style="background-color: #fff;"></v-header> -->
<view style="height: var(--status-bar-height)"></view>
<view style="height: 30px;"></view>
<!-- <view class="box-size head h-aut p-x-md m-x-md d-flex justify-between flex-wrap align-center bgb3 rounded-ms color-light"
:class="theme == 'light' ? 'bgb3-white' : ''" style="position: relative;"> -->
<view class="box-size head h-aut p-x-md m-x-md d-flex justify-between flex-wrap
align-center rounded-ms color-dark"
style="position: relative;">
<view class="d-flex p-t-md justify-center align-center w-max">
<text class="fn-16 color-default d-block">{{ $t("base.d6") }}(BTC)</text>
<text class="fn-16 d-block">{{ $t("base.d6") }}(BTC)</text>
<view class="fn-18 m-l-md d-flex" @click="setHide(!hideMoney)">
<van-icon v-if="!hideMoney" name="eye-o"/>
<van-icon v-else name="closed-eye"/>
</view>
</view>
<view class="m-t-md d-flex flex-wrap justify-center fn-center w-max">
<view class="m-t-md d-flex flex-wrap justify-center fn-center w-max" style="padding-bottom: 20px;">
<text class="fn-28 w-max">{{ filterMoney(account.total_assets_btc, true) }}</text>
<text class="fn-sm m-l-md w-max">
<!-- {{ filterMoney(account.total_assets_usd) }} USD -->
<text class="fn-sm m-t-sm w-max">
{{ filterMoney(account.total_assets_usd, false) }} USDT
</text>
</view>
<view class="m-t-ms p-b-ms w-max " style="margin-top: 10px">
<view class="m-t-ms w-max " style="margin-top: 10px;padding: 0px 0px 20px;">
<view class="d-flex justify-between align-center rounded-lg">
<v-link tag="view" to="/pages/assets/recharge" v-if="user_auth_level==1" @click="getAuthInfo"
class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center shadow-panel-4">
<!-- :class="tabActive==0?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''" -->
<v-link tag="view" to="/pages/assets/recharge" style="border: 1px solid #ececec;" v-if="user_auth_level==1" @click="getAuthInfo"
class="d-flex align-center p-y-xxs rounded-xs w-33 justify-center">
<view class="m-r-xs d-flex align-center">
<img src="static/img/13.png" alt="" class="h-25"/>
</view>
<text class="color-light fn-middle fn-ms">{{
<text class="fn-middle fn-ms">{{
$t("base.b5")
}}
</text>
</v-link>
<v-link tag="view" to="/pages/auth/primary" v-if="user_auth_level==0" @click="getAuthInfo"
class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center shadow-panel-4">
<!-- :class="tabActive==0?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''" -->
<v-link tag="view" to="/pages/auth/primary" style="border: 1px solid #ececec;" v-if="user_auth_level==0" @click="getAuthInfo"
class="d-flex align-center p-y-xxs rounded-xs w-33 justify-center">
<view class="m-r-xs d-flex align-center">
<img src="static/img/13.png" alt="" class="h-25"/>
</view>
<text class="color-light fn-middle fn-ms">{{
<text class="fn-middle fn-ms">{{
$t("base.b5")
}}
</text>
</v-link>
<v-link tag="view" to="/pages/assets/draw"
class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center shadow-panel-4">
<v-link tag="view" to="/pages/assets/draw" style="border: 1px solid #ececec;"
class="d-flex align-center p-y-xxs rounded-xs w-33 justify-center">
<view class="m-r-xs d-flex align-center">
<img src="static/img/5.png" alt="" class="h-25"/>
</view>
<text class="color-light fn-ms">{{
<text class="fn-ms">{{
$t("base.b6")
}}
</text>
</v-link>
<v-link tag="view" to="/pages/transfer/index"
class="d-flex bg-form-panel-3 align-center p-y-xxs rounded-xs w-33 justify-center shadow-panel-4">
<v-link tag="view" to="/pages/transfer/index" style="border: 1px solid #ececec;"
class="d-flex align-center p-y-xxs rounded-xs w-33 justify-center">
<view class="m-r-xs d-flex align-center">
<img src="static/img/hua.png" alt="" class="h-25"/>
</view>
<text class="color-light fn-ms">{{
<text class="fn-ms">{{
$t("base.d8")
}}
</text>
@ -68,19 +68,19 @@
</view>
</view>
<view class="layout-main">
<view class="layout-main" style="background-color: #fff;">
<scroll-view @refresherrefresh="onRefresh" :refresher-enabled="refresherEnabled&&scrollTop<50"
:refresher-triggered="refreshing" refresher-background="transparent" :refresher-threshold="50">
<!-- 头部 -->
<view class="tab m-x-md m-t-md rounded-ms d-flex justify-between bgb3 p-xs"
<view class="tab m-x-md m-t-md rounded-ms d-flex bg-FA p-xs color-gray-6"
:class="theme == 'light' ? 'bgb3-white' : ''">
<view class="w-33 fn-center p-y-xxs"
:class="tabActive==0?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''"
:class="tabActive==0?'rounded-xs color-dark':''"
@click="tabActive=0">
{{ $t('base.d7') }}
</view>
<view class="w-33 fn-center p-y-xxs m-l-xs"
:class="tabActive==1?'color-theme-1 bg-panel-3 rounded-xs shadow-panel-nei':''"
:class="tabActive==1?'rounded-xs color-dark':''"
@click="tabActive=1">
{{ $t('base.e4') }}
</view>
@ -89,43 +89,24 @@
{{$t('otc.d5')}}
</view> -->
</view>
<view class="top">
<!-- <van-tabs
:active="tabActive"
@change="changtTab"
:border="false"
v-if="show"
:line-width="30"
swipeable
animated
class="tabs-main d-flex justify-between align-center flex-col"
>
<van-tab :title="$t('base.d7')" :name="0"> -->
<view class="top" style="background-color: #fff;">
<view class="box-shadow wallet" v-if="tabActive==0">
<view class="m-x-md m-b-xs m-t-sm">
<!--bgb3 :class="theme == 'light' ? 'bgb3-white' : ''" -->
<!-- <view class="shadow-panel-nei p-xs p-x-md rounded-ms"-->
<view class="bgb3 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
<view class="bg-yellow2 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
style="position: relative">
<text class="fn-20 d-block color-light m-t-xs">
<!-- {{ filterMoney(account.funds_account_usd) }} -->
<text class="fn-20 d-block color-dark m-t-xs">
{{ (account.funds_account_usd).toFixed(2) }}
</text>
<text class="fn-sm d-block color-gray-6 m-t-xs">{{ $t("base.d6") }}(USDT)</text>
<!-- <text class="fn-20 d-block color-light m-t-md"
>{{ filterMoney(account.funds_account_btc) }} BTC</text
> -->
<!-- fn-sm d-block m-t-xs color-gray-6 -->
</view>
</view>
<view class="h-30 p-x-xs d-flex justify-between align-center">
<van-field :value="searchText" @input="searchText = $event.detail" left-icon="search"
<view class="h-30 p-x-md d-flex justify-between align-center">
<!-- <van-field :value="searchText" @input="searchText = $event.detail" left-icon="search"
:placeholder="$t('base.d9')" input-class="fn-12 "
class="flex-fill color-gray-6 rounded-md pos fn-12 m-r-lg"
style="padding-left: 0"/>
style="padding-left: 0"/> -->
<van-checkbox :value="hide" @change="hide = !hide" icon-size="16">
<text class="color-gray-6 m-r-xs">{{ $t("base.e0") }} 0 {{ $t("base.e1") }}</text>
</van-checkbox>
@ -138,7 +119,7 @@
<view class="m-x-md d-flex justify-between align-center p-b-xs">
<view>
<img :src="item.image" class="w-20 h-20 rounded-max fn-middle"/>
<text class="fn-18 fn-bold color-light fn-middle p-l-sm">{{
<text class="fn-18 fn-bold color-dark fn-middle p-l-sm">{{
item.coin_name
}}
</text>
@ -159,25 +140,25 @@
/>
</view> -->
</view>
<view class="p-x-md d-flex justify-between align-center">
<view class="p-x-md d-flex justify-between align-center bg-FA">
<view class="w-4/12">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.b9") }}
</p>
<p class="fn-lg color-light overflow-scroll">{{ (item.usable_balance).toFixed(2) }}
<p class="fn-lg color-dark overflow-scroll">{{ (item.usable_balance).toFixed(2) }}
</p>
</view>
<view class="w-4/12 fn-center">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.e2") }}
</p>
<p class="fn-lg color-light overflow-scroll">{{ item.freeze_balance }}</p>
<p class="fn-lg color-dark overflow-scroll">{{ item.freeze_balance }}</p>
</view>
<view class="w-4/12 fn-right">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.e3") }}(USD)
</p>
<p class="fn-lg color-light overflow-scroll">
<p class="fn-lg color-dark overflow-scroll">
{{ omitTo(item.usd_estimate, item.priceDecimals) | priceDecimals }}
</p>
</view>
@ -185,11 +166,9 @@
<view class="h-4 m-t-xs"></view>
</router-link>
</view>
<!-- </van-tab>
<van-tab :title="$t('base.e4')" :name="1" class="p-t-md"> -->
<view class="m-x-md" v-if="tabActive==1">
<view class="bgb3 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
<view class="bg-yellow2 p-x-md p-y-xs m-y-xs rounded-ms" :class="theme == 'light' ? 'bgb3-white' : ''"
style="position: relative">
<view class="fn-sm d-flex justify-between color-gray-6 m-t-xs">
<span> USDT </span>
@ -197,16 +176,15 @@
<van-icon class="fn-middle" name="arrow" size="16"/>
</v-link>
</view>
<span class="fn-20 d-block color-light m-t-md">{{
<span class="fn-20 d-block color-dark m-t-md">{{
filterMoney(account.contract_account_usd)
}}{{ account.symbol }}</span>
<view class="d-flex justify-between m-t-xs">
<v-link to="/pages/transfer/index" class="d-flex">
<view class="m-r-xs align-center">
<img :src="$localImgUrl('fill4.png')" alt="" class="h-18"/>
<img :src="$localImgUrl('fill4.png')" alt="" class="h-18" style="vertical-align: middle;"/>
</view>
<!-- <van-icon class="color-theme-1 fn-26 fn-middle m-r-xs" name="exchange" /> -->
<text class="color-light fn-middle">{{
<text class="color-dark fn-middle">{{
$t("base.d8")
}}
</text>
@ -241,7 +219,6 @@
<view class="m-r-xs align-center">
<img :src="$localImgUrl('fill4.png')" alt="" class="h-18"/>
</view>
<!-- <van-icon class="color-theme-1 fn-26 fn-middle m-r-xs" name="exchange" /> -->
<text class="color-light fn-middle">{{
$t("base.d8")
}}
@ -250,8 +227,7 @@
</view>
</view>
</view>
<!-- </van-tab>
</van-tabs> -->
</view>
</scroll-view>
</view>
@ -516,4 +492,10 @@ export default {
background-color: transparent;
padding: 0 10px;
}
/deep/ .van-nav-bar__title{
color: #000;
}
/deep/ .van-cell{
color: #999;
}
</style>

23
pages/commission/index.vue

@ -16,8 +16,8 @@
<!-- 当前委托 -->
<v-paging :ajax="getCurrentEntrust" key="0" class="layout-main" v-if="active==0">
<template #box="list">
<view v-for="item in $list(list)" class="item bg-panel-4 m-md rounded-sm" :key="item.order_no">
<view class="head d-flex align-center border-b p-x-md p-y-xs justify-between">
<view v-for="item in $list(list)" class="item m-md rounded-sm bg-FA" :key="item.order_no">
<view class="head d-flex align-center border-b p-x-md p-y-xs justify-between color-dark">
<view class="d-flex">
<view
v-if="item.entrust_type==1"
@ -28,31 +28,31 @@
class="suatus color-sell fn-20 m-r-xs rounded"
>{{$t('exchange.b6')}}</view>
<view>
<view class="color-light fn-20">{{item.symbol}}</view>
<view class="color-dark fn-20">{{item.symbol}}</view>
<view class="fn-10">{{item.created_at}}</view>
</view>
</view>
<view>{{item.status_text}}</view>
</view>
<view class="p-x-md p-y-xs">
<view class="row d-flex m-y-xs justify-between">
<view class="row d-flex m-y-xs justify-between color-dark">
<view class="label fn-sm">{{$t('exchange.b8')}}</view>
<view class="color-light">
<view class="">
<template v-if="item.type==1">{{$t('exchange.b9')}}</template>
<template v-if="item.type==2">{{$t('exchange.c0')}}</template>
</view>
</view>
<view class="row d-flex m-y-xs justify-between">
<view class="row d-flex m-y-xs justify-between color-dark">
<view class="label fn-sm">{{$t('exchange.b7')}}</view>
<view class="color-light">{{item.entrust_price}}</view>
<view class="">{{item.entrust_price}}</view>
</view>
<view class="row d-flex m-y-xs justify-between">
<view class="row d-flex m-y-xs justify-between color-dark">
<view class="label fn-sm">{{$t('exchange.c1')}}</view>
<view class="color-buy">{{item.traded_amount}}</view>
</view>
<view class="row d-flex m-y-xs justify-between">
<view class="row d-flex m-y-xs justify-between color-dark">
<view class="label fn-sm">{{$t('exchange.c2')}}</view>
<view class="color-light">{{item.amount}}</view>
<view class="">{{item.amount}}</view>
</view>
</view>
</view>
@ -156,7 +156,8 @@ export default {
border:0!important;
border-radius: 10px;
overflow: hidden;
background-color:$form-panel-4;
// background-color:$form-panel-4;
background-color:#c7c7c7;
}
::v-deep .van-tabs__nav--card .van-tab.van-tab--active{
background-color:$theme-1;

18
pages/exchange/contract-history.vue

@ -5,7 +5,7 @@
<!-- @click="showDetail(item)" -->
<div
class="item bg-panel-4 m-md rounded-sm box-shadow"
class="item m-md rounded-sm box-shadow color-dark"
v-for="item in $list(list)"
:key="item.id"
@ -15,7 +15,7 @@
>
<div class="d-flex">
<div>
<div class="color-light fn-20">{{ item.symbol }}/USDT</div>
<div class="color-dark fn-20">{{ item.symbol }}/USDT</div>
<!-- <div class="fn-10">{{ item.created_at }}</div> -->
<div class="fn-10">{{ item.ts |parseTime}}</div>
</div>
@ -27,31 +27,31 @@
<div class="p-x-md p-y-xs">
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.a6')}}</div>
<div class="color-light">{{cals(item.side,item.order_type)}}</div>
<div class="color-dark">{{cals(item.side,item.order_type)}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.a7')}}/{{$t('contract.a8')}}</div>
<div class="color-light">{{item.traded_amount}}/{{item.amount}}</div>
<div class="color-dark">{{item.traded_amount}}/{{item.amount}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.a9')}}/{{$t('contract.b0')}}</div>
<div class="color-light">{{item.avg_price||'--'}}/{{item.entrust_price||'--'}}</div>
<div class="color-dark">{{item.avg_price||'--'}}/{{item.entrust_price||'--'}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.b1')}}</div>
<div class="color-light">{{item.margin*1}}</div>
<div class="color-dark">{{item.margin*1}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.b2')}}</div>
<div class="color-light">{{item.fee*1}}</div>
<div class="color-dark">{{item.fee*1}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.c7')}}</div>
<div class="color-light">{{item.profit*1||'--'}}</div>
<div class="color-dark">{{item.profit*1||'--'}}</div>
</div>
<div class="row d-flex m-y-mini justify-between">
<div class="label fn-sm">{{$t('contract.b3')}}</div>
<div class="color-light">{{ status(item.status) }}</div>
<div class="color-dark">{{ status(item.status) }}</div>
</div>
<!-- <div class="row d-flex m-y-mini justify-between" v-if="item.profit">
<div class="label fn-sm">{{$t('contract.b4')}}</div>

372
pages/exchange/exchange-transaction.vue

@ -1,16 +1,16 @@
<template>
<v-page>
<view class="d-flex p-x-md fa p-y-md justify-between align-center fn-18 bg-panel-3 color-light flex-wrap border-b">
<view class="d-flex p-x-md fa p-y-md justify-between align-center fn-18 bg-panel-2 color-dark flex-wrap border-b">
<view class="w-max" style="height: var(--status-bar-height)"></view>
<view @click="$emit('symbol')" class="d-flex align-center">
<i class="iconfont color-light fn-bold fn-18">&#xe655;</i>
<i class="iconfont fn-bold fn-18" style="color: #000!important;">&#xe655;</i>
<text class="fn-bold">{{ symbol }}</text>
<text class="fn-10 m-l-xs p-y-2" :class="increase.increase < 0 ? 'color-sell bg-sell-transparent' : 'color-buy bg-buy-transparent'">{{increase.increaseStr}}</text>
</view>
<view class="d-flex fn-20 color-theme-1">
<view class="m-r-xs" @click="$emit('option')">
<van-icon v-if="isCoolect" name="star" />
<van-icon v-else class="color-default" name="star-o" />
<van-icon v-else class="" name="star-o" />
</view>
<v-link
tag="div"
@ -38,39 +38,21 @@
>
<view class="d-flex p-x-md p-b-md">
<!-- 买卖表单 -->
<view class="w-6/12 box-size" style="position: relative;">
<view class="tixing1 bg-form-panel-4" :class="{' bg-green': form.direction == 'buy'}"></view>
<view class="tixing2 bg-form-panel-4 " :class="{'bg-red ': form.direction == 'sell'}"
style="position: absolute;right: 0px;top: 0px;"></view>
<view
class="d-flex fn-center justify-between rounded-xs overflow-hidden tixingtxt"
>
<view
class="w-6/12 h-34 d-flex justify-center align-center t-left"
:class="{
' color-plain': form.direction == 'buy',
}"
@click="
form.direction = 'buy';
getDefaultPrice();
"
>{{ $t("exchange.c3") }}</view>
<view
class="color-gray w-6/12 h-34 d-flex justify-center align-center"
:class="{
' color-plain': form.direction == 'sell',
}"
@click="
form.direction = 'sell';
getDefaultPrice();
"
>{{ $t("exchange.c4") }}</view>
</view>
<view class="w-6/12 box-size">
<view class="b_s_a">
<view class="b_s_item " :class="{' buy_a': form.direction == 'buy'}"
@click="form.direction = 'buy';
getDefaultPrice();">{{ $t("exchange.c3") }}</view>
<view class="b_s_item " :class="{' sell_a': form.direction == 'sell'}"
@click="form.direction = 'sell';
getDefaultPrice();">{{ $t("exchange.c4") }}</view>
</view>
<!-- <v-picker :list="typeList" v-model="form.type" class="p-y-md fn-14">
{{ activeType.label }}
<i class="iconfont" style="margin-left: 5px;">&#xe6e9;</i>
</v-picker> -->
<v-dropdwon class="w-50 m-r-xs p-y-xxs" :list="typeList" @onClick="dropDownChange">
<v-dropdwon class="m-r-xs p-y-xxs" style="width: 100%;margin-bottom: 8px;" :list="typeList" @onClick="dropDownChange">
</v-dropdwon>
<template v-if="form.type == 0">
<view>
@ -87,11 +69,12 @@
<v-input
v-model="form.amount"
@input="sliderActive=-1"
class="h-30 p-x-sm rounded p-y-xxs color-light bg-form-panel-3"
class="h-30 p-x-sm p-y-xxs color-dark"
style="background-color: #F5F5F5;"
:placeholder="$t('exchange.c5')"
>
<template #right>
<view class="color-default fn-bold color-light">{{
<view class="color-default fn-bold color-dark">{{
activeCoin.coin_name
}}</view>
</template>
@ -102,7 +85,8 @@
<view>
<v-input
disabled
class="h-30 p-x-sm rounded p-y-xxs fn-center color-light bg-form-panel-3"
class="h-30 p-x-sm p-y-xxs fn-center color-dark"
style="background:#F5F5F5;"
:placeholder="$t('exchange.c6')"
></v-input>
</view>
@ -111,7 +95,8 @@
<v-input
@input="sliderActive=-1"
v-model="form.amount"
class="h-30 p-x-sm rounded p-y-xxs color-light bg-form-panel-3"
class="h-30 p-x-sm p-y-xxs color-dark"
style="background:#F5F5F5;"
:placeholder="
form.direction =='buy'?$t('exchange.c7'):$t('exchange.c5')
"
@ -123,16 +108,6 @@
</v-input>
</view>
</template>
<view>
<view class="tips fn-10 m-y-ms d-flex justify-between">
<view class="">
{{ $t("exchange.c8") }}
</view>
<view class="">
{{ usable }}{{ usableUnit }}
</view>
</view>
</view>
<view>
<view class="m-t-xs">
<!-- <view class="d-flex justify-between fn-sm">
@ -147,18 +122,33 @@
</view>
</view>
</view>
<view class="d-flex fn-sm m-y-ms color-light justify-between">
<span>{{ $t("exchange.c9") }}</span>
<span v-if="form.type == 1 && form.direction == 'sell'"
>{{ totalMoney }} {{ currentCoin }}</span
>
<span v-else>{{ totalMoney }} {{ targetCoin }}</span>
</view>
<v-input v-if="form.type == 1 && form.direction == 'sell'"
disabled
class="h-30 p-x-sm p-y-xxs fn-center color-dark m-y-ms"
style="background:#F5F5F5;"
:placeholder='$t("exchange.c9")+totalMoney+currentCoin'
></v-input>
<v-input v-else
disabled
class="h-30 p-x-sm p-y-xxs fn-center color-dark m-y-ms"
style="background:#F5F5F5;"
:placeholder='$t("exchange.c9")+totalMoney+targetCoin'
></v-input>
<view>
<view class="tips fn-10 m-y-ms d-flex justify-between">
<view class="">
{{ $t("exchange.c8") }}
</view>
<view class="">
{{ usable }}{{ usableUnit }}
</view>
</view>
</view>
<template v-if="isLogin">
<v-button
size="small"
:type="form.direction == 'buy' ? 'green' : 'red'"
class="w-max rounded-md"
class="w-max rounded-xs"
block
@click="storeEntrust"
ref="btn"
@ -176,7 +166,7 @@
block
to="/pages/login/index"
:type="form.direction == 'buy' ? 'green' : 'red'"
class="w-max rounded-md"
class="w-max rounded-xs"
>{{ $t("exchange.d0") }} / {{ $t("reg.b9") }}</v-button
>
</template>
@ -199,7 +189,7 @@
</view>
<!-- 深度列表 -->
<view class="w-6/12 p-l-md d-flex flex-col dep-list">
<sell-and-buy :buyList="buyList" :max="symbol=='GITP/USDT'?11:8" :sellList="sellList" :symbol="symbol" v-on:price="getPrice($event)" :contract="0">
<sell-and-buy :buyList="buyList" :max="symbol=='GITP/USDT'?11:7" :sellList="sellList" :symbol="symbol" v-on:price="getPrice($event)" :contract="0">
<view
class="fn-lg row fn-bold"
:class="newPrice.increase < 0 ? 'color-sell' : 'color-buy'"
@ -255,63 +245,119 @@
</tbody>
</table>
</view> -->
<view class="m-t-xs bg-panel-3">
<view class="border-t-original d-flex justify-between align-center p-x-md p-t-lg">
<text class="fn-16 fn-bold color-light">{{$t("exchange.a4")}}</text>
<view class="m-t-xs">
<view class="d-flex justify-between align-center p-x-md p-t-lg bor4">
<!-- <text class="fn-16 fn-bold color-dark">{{$t("exchange.a4")}}</text> -->
<view class="d-flex align-center">
<text class="m-x-ms fn-15 bor5" @click="list_active=0"
:class="list_active==0?'fn-bold bor5-active color-dark':''">
{{$t('exchange.a4')}}({{list.length}})
</text>
<text class="m-x-ms fn-15 bor5" @click="list_active=1"
:class="list_active==1?'fn-bold bor5-active color-dark':''">
{{$t("ybgcoins3.a6")}}
</text>
</view>
<v-link tag="div" to="/pages/exchange/exchangeHis" class="d-flex align-center">
<van-icon name="orders-o" class="fn-14" style="font-size: 16px;"/>
<span class="fn-12 " style="font-size: 16px;">{{$t("purchase.a9")}}</span>
</v-link>
</view>
<van-empty v-if="!Object.values(list).length" description="" />
<view v-for="item in (list)" class="item border-b fn-14" :key="item.order_no">
<view class="p-x-md p-y-xs">
<view class="row d-flex m-y-xs">
<view class="d-flex w-50 align-end">
<view v-if="item.entrust_type==1" class="suatus color-buy fn-14 m-r-xs">{{$t('first.c0')}}</view>
<view v-if="item.entrust_type==2" class="suatus color-sell fn-14 m-r-xs">{{$t('first.c1')}}</view>
<view class="color-light fn-bold">{{item.symbol}}</view>
</view>
<view class="d-flex w-50 justify-between">
<view>
{{$t('assets.d0')}}<span class="color-light"></span>{{item.status_text}}
</view>
<img width="15px" height="15px" src="static/img/che.png" @click="ifCancel(item)"/>
</view>
</view>
<view class="row d-flex m-y-xs">
<view class="d-flex w-50" v-if="item.type==1">
<view class="">
{{$t('exchange.b7')}}<span class="color-light">{{item.entrust_price}}</span>
</view>
</view>
<view class="d-flex w-50" v-else>
<view class="">
{{$t('contract.a2')}}{{$t('common.total')}}<span class="fn-12 color-light">{{item.money}}</span>
</view>
</view>
<view class="d-flex w-50">
<view class="label">{{$t('exchange.b8')}}</view>
<view class="color-light">
<template v-if="item.type==1">{{$t('exchange.b9')}}</template>
<template v-if="item.type==2">{{$t('exchange.c0')}}</template>
</view>
</view>
</view>
<view class="row d-flex m-y-xs">
<view class="d-flex w-50" v-if="item.type==1">
<view class="label">{{$t('first.c4')}}</view>
<view class="color-light fn-bold">{{item.amount}}</view>
</view>
<view class="d-flex w-50 align-center">
<view class="">
{{$t('first.c2')}}<span class="color-light">{{item.created_at}}</span>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="" v-if="list_active==0">
<van-empty v-if="!Object.values(list).length" description="" />
<view v-for="item in (list)" class="item border-b fn-14" :key="item.order_no">
<view class="p-x-md p-y-xs">
<view class="row d-flex m-y-xs">
<view class="d-flex w-50 align-end">
<view v-if="item.entrust_type==1" class="suatus color-buy fn-14 m-r-xs">{{$t('first.c0')}}</view>
<view v-if="item.entrust_type==2" class="suatus color-sell fn-14 m-r-xs">{{$t('first.c1')}}</view>
<view class="color-dark fn-bold">{{item.symbol}}</view>
</view>
<view class="d-flex w-50 justify-between">
<view>
{{$t('assets.d0')}}<span class="color-dark"></span>{{item.status_text}}
</view>
<img width="15px" height="15px" src="static/img/che.png" @click="ifCancel(item)"/>
</view>
</view>
<view class="row d-flex m-y-xs">
<view class="d-flex w-50" v-if="item.type==1">
<view class="">
{{$t('exchange.b7')}}<span class="color-dark">{{item.entrust_price}}</span>
</view>
</view>
<view class="d-flex w-50" v-else>
<view class="">
{{$t('contract.a2')}}{{$t('common.total')}}<span class="fn-12 color-dark">{{item.money}}</span>
</view>
</view>
<view class="d-flex w-50">
<view class="label">{{$t('exchange.b8')}}</view>
<view class="color-dark">
<template v-if="item.type==1">{{$t('exchange.b9')}}</template>
<template v-if="item.type==2">{{$t('exchange.c0')}}</template>
</view>
</view>
</view>
<view class="row d-flex m-y-xs">
<view class="d-flex w-50" v-if="item.type==1">
<view class="label">{{$t('first.c4')}}</view>
<view class="color-dark fn-bold">{{item.amount}}</view>
</view>
<view class="d-flex w-50 align-center">
<view class="">
{{$t('first.c2')}}<span class="color-dark">{{item.created_at}}</span>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="" v-if="list_active==1">
<van-empty v-if="!Object.values(assets_list).length" description="" />
<view v-for="item in (assets_list)" class="item border-b fn-14" :key="item.order_no">
<router-link :to="{
path: '/pages/assets/bill',
query: { coin_name: item.coin_name },
}" class="p-t-xs d-block rounded-md text-none"
style="text-decoration: none;">
<view class="m-x-md d-flex justify-between align-center p-b-xs">
<view>
<img :src="item.image" class="w-20 h-20 rounded-max fn-middle"/>
<text class="fn-18 fn-bold color-dark fn-middle p-l-sm">{{
item.coin_name
}}
</text>
</view>
</view>
<view class="p-x-md d-flex justify-between align-center">
<view class="w-4/12">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.b9") }}
</p>
<p class="fn-lg color-dark overflow-scroll">{{ (item.usable_balance).toFixed(2) }}
</p>
</view>
<view class="w-4/12 fn-center">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.e2") }}
</p>
<p class="fn-lg color-dark overflow-scroll">{{ item.freeze_balance }}</p>
</view>
<view class="w-4/12 fn-right">
<p class="color-gray-6" style="padding: 5px 0">
{{ $t("base.e3") }}(USD)
</p>
<p class="fn-lg color-dark overflow-scroll">
{{ omitTo(item.usd_estimate, item.priceDecimals) | priceDecimals }}
</p>
</view>
</view>
<view class="h-4 m-t-xs"></view>
</router-link>
</view>
</view>
</view>
</scroll-view>
</view>
</v-page>
@ -323,6 +369,7 @@ import Market from "@/api/market";
import Order from "@/api/order";
import date from "@/utils/class/date";
import math from "@/utils/class/math";
import Wallet from "@/api/wallet";
import { mapState } from "vuex";
import sellAndBuy from "@/pages/exchange/sell-and-buy";
// import bingProgress from '@/components/bing-progress/bing-progress.vue'
@ -398,7 +445,9 @@ export default {
sliderActive:-1,
dtime: null,
scrollTop:0,
refreshing:false
refreshing:false,
list_active: 0,
assets_list: []
};
},
computed: {
@ -544,7 +593,14 @@ export default {
if(e.length<=0){
clearInterval(this.dtime);
}
}
},
list_active(e){
if(e===1 && this.isLogin){
this.fundAccount();
}else if(e===0 && this.isLogin){
this.getCurrentEntrust();
}
}
},
methods: {
parseTime: date.parseTime,
@ -816,7 +872,13 @@ export default {
this.form.type=e.value
this.form.amount=''
this.sliderActive=-1
}
},
//
fundAccount() {
Wallet.fundAccount().then((res) => {
this.assets_list = res.data.list;
});
},
},
mounted() {
this.getBooks();
@ -827,6 +889,7 @@ export default {
}
if(this.isLogin){
this.getCurrentEntrust()
this.fundAccount();
}
},
destroyed() {
@ -850,7 +913,8 @@ export default {
.minus-class,
.input-class,
.plus-class {
background: $form-panel-4;
color: #333;
background-color: #F5F5F5!important;
}
}
.dep-list {
@ -907,17 +971,15 @@ export default {
}
::v-deep .van-stepper{
background-color: $form-panel-3;
border-radius: 50px;
border-radius: 0px;
overflow: hidden;
padding: 4px;
font-weight: bold;
}
::v-deep .plus-class{
background-color: $panel-4!important;
border-radius: 50%;
}
::v-deep .minus-class{
background-color: $panel-4!important;
border-radius: 50%;
}
::v-deep .van-stepper__input{
@ -939,9 +1001,6 @@ export default {
.bg-red{
background-color: $red;
}
.bor5{
border-top: 5px solid $border-color;
}
.w-50{
width: 48%;
}
@ -1000,4 +1059,81 @@ export default {
.h-25{
height: 25px;
}
.layout-main{
color: #000!important;
background-color: #fff;
}
.b_s_a{
background-color: #F5F5F5;
height: 30px;
overflow: hidden;
display: flex;
justify-content: space-between;
border-radius: 4px;
margin-bottom: 10px;
.b_s_item{
width: 49%;
position: relative;
line-height: 30px;
text-align: center;
color: #777;
}
.buy_a{
color: #fff;
background-color: #2EBD85;
}
.sell_a{
color: #fff;
background-color: #F6465D;
}
.buy_a::after{
content: '';
width: 0px;
height: 0px;
border-left: 15px solid #2EBD85;
border-right: 15px solid transparent;
border-top: 15px solid transparent;
border-bottom: 15px solid transparent;
position: absolute;
top: 0px;
right: -30px;
z-index: 0;
}
.sell_a::before{
content: '';
width: 0px;
height: 0px;
border-left: 15px solid transparent;
border-right: 15px solid #F6465D;
border-top: 15px solid transparent;
border-bottom: 15px solid transparent;
position: absolute;
top: 0px;
left: -30px;
z-index: 0;
}
}
/deep/ .green uni-button{
background-color: #2EBD85;
}
/deep/ .red uni-button{
background-color: #F6465D;
}
/deep/ .van-stepper{
background-color: #F5F5F5 !important;
}
.bor4 {
padding-bottom: 3px;
border-bottom: 1px solid $border-color;
}
.bor5 {
padding-bottom: 6px;
position: relative;
top: 4px;
}
.bor5-active {
border-bottom: 4px solid $theme-2;
}
</style>

31
pages/exchange/exchangeHis.vue

@ -2,32 +2,31 @@
<v-page class="layout-main">
<v-header :title="$t('first.a6')"></v-header>
<view class="d-flex border-b">
<view class="d-flex rounded-lg justify-between w-max p-b-xs">
<view class="d-flex rounded-lg justify-between w-max p-b-xs color-gray-6">
<view
@click="active = 0"
class="p-y-xs p-x-lg fn-center w-50"
>
<text :class="{ 'color-theme-1 active p-b-xs': active == 0 }">{{$t('first.a7')}}</text>
</view>
</view>
<view
@click="active = 1"
class="p-y-xs p-x-lg fn-center w-50"
>
<text :class="{ 'color-theme-1 active p-b-xs': active == 1 }">{{$t('first.a8')}}</text>
</view
>
</view>
</view>
</view>
<v-paging :ajax="getCurrentEntrust" :key="1" ref="list" tag="div" v-if="active==0">
<template #box="list">
<not-data v-if="!$list(list).length"></not-data>
<div v-for="item in $list(list)" class="item bg-panel-4 m-md rounded-sm box-shadow" :key="item.order_no">
<div v-for="item in $list(list)" class="item m-md rounded-sm box-shadow color-dark" :key="item.order_no" style="background-color: #f5f5f5;">
<div class="head d-flex align-center border-b p-x-md p-y-xs justify-between">
<div class="d-flex">
<div v-if="item.entrust_type==1" class="suatus color-buy fn-20 m-r-xs rounded">{{$t('exchange.b5')}}</div>
<div v-if="item.entrust_type==2" class="suatus color-sell fn-20 m-r-xs rounded">{{$t('exchange.b6')}}</div>
<div>
<div class="color-light fn-20">{{item.symbol}}</div>
<div class="color-dark fn-20">{{item.symbol}}</div>
<div class="fn-10">{{item.created_at}}</div>
</div>
</div>
@ -38,11 +37,11 @@
<div class="p-x-md p-y-xs">
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.b7')}}</div>
<div class="color-light">{{item.entrust_price}}</div>
<div class="color-dark">{{item.entrust_price}}</div>
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.b8')}}</div>
<div class="color-light">
<div class="color-dark">
<template v-if="item.type==1">{{$t('exchange.b9')}}</template>
<template v-if="item.type==2">{{$t('exchange.c0')}}</template>
</div>
@ -53,11 +52,11 @@
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.c2')}}</div>
<div class="color-light">{{item.amount}}</div>
<div class="color-dark">{{item.amount}}</div>
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.g3')}}</div>
<div class="color-light">
<div class="color-dark">
<v-button type="red" class="rounded-xs" size="mini" @click="ifCancel(item)">{{$t('exchange.g4')}}</v-button>
</div>
</div>
@ -69,13 +68,13 @@
<v-paging class="layout-main" :key="2" :ajax="getHistoryEntrust" v-if="active==1">
<template #box="list">
<not-data v-if="!$list(list).length"></not-data>
<div v-for="item in $list(list)" class="item bg-panel-4 m-md rounded-sm box-shadow" :key="item.order_no">
<div v-for="item in $list(list)" class="item m-md rounded-sm box-shadow color-dark" :key="item.order_no" style="background-color: #f5f5f5;">
<div class="head d-flex align-center border-b p-x-md p-y-xs justify-between">
<div class="d-flex">
<div v-if="item.entrust_type==1" class="suatus color-buy fn-20 m-r-xs rounded">{{$t('exchange.b5')}}</div>
<div v-if="item.entrust_type==2" class="suatus color-sell fn-20 m-r-xs rounded">{{$t('exchange.b6')}}</div>
<div>
<div class="color-light fn-20">{{item.symbol}}</div>
<div class="color-dark fn-20">{{item.symbol}}</div>
<div class="fn-10">{{item.created_at}}</div>
</div>
</div>
@ -84,11 +83,11 @@
<div class="p-x-md p-y-xs">
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.b7')}}</div>
<div class="color-light">{{item.entrust_price}}</div>
<div class="color-dark">{{item.entrust_price}}</div>
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.b8')}}</div>
<div class="color-light">
<div class="color-dark">
<template v-if="item.type==1">{{$t('exchange.b9')}}</template>
<template v-if="item.type==2">{{$t('exchange.c0')}}</template>
</div>
@ -99,12 +98,12 @@
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.e2')}}</div>
<div class="color-light">{{item.avg_price}}</div>
<div class="color-dark">{{item.avg_price}}</div>
</div>
<div class="row d-flex m-y-xs justify-between">
<div class="label fn-sm">{{$t('exchange.c2')}}</div>
<div class="color-light">{{item.amount}}</div>
<div class="color-dark">{{item.amount}}</div>
</div>
</div>
</div>

20
pages/exchange/index.vue

@ -6,7 +6,7 @@
<i class="van-icon van-icon-arrow-left van-nav-bar__arrow"></i>
</view>
<view
class="fn-20 color-light m-l-xs"
class="fn-20 color-dark m-l-xs"
@click.stop="symbolListShow = true"
>
<i class="iconfont color-theme-1">&#xe655;</i>
@ -22,10 +22,10 @@
</v-header>
<view class="layout-main">
<view
class="price-data d-flex p-t-xs p-x-md justify-between bg-panel-3 rounded-xs"
class="price-data d-flex p-t-xs p-x-md justify-between bg-F5 rounded-xs"
>
<view class="col">
<view class="num fn-26 color-light">
<view class="num fn-26 color-dark">
{{ activeCoin.price }}
</view>
<view class="d-flex">
@ -37,20 +37,20 @@
</view>
</view>
</view>
<view class="col fn-right justify-center d-flex flex-col">
<view class="col fn-right justify-center d-flex flex-col color-gray-6">
<table>
<tr>
<td>24h {{ $t("exchange.e3") }}</td>
<td class="color-light">{{ activeCoin.high }}</td>
<td class="color-dark">{{ activeCoin.high }}</td>
</tr>
<tr>
<td>24h {{ $t("exchange.e4") }}</td>
<td class="color-light">{{ activeCoin.low }}</td>
<td class="color-dark">{{ activeCoin.low }}</td>
</tr>
<tr v-if="!query.contract">
<td>24h {{ $t("exchange.e5") }}</td>
<!-- <td class="color-light">{{ (activeCoin.vol).toFixed(4)}}</td> -->
<td class="color-light">{{activeCoin.vol}}</td>
<!-- <td class="color-dark">{{ (activeCoin.vol).toFixed(4)}}</td> -->
<td class="color-dark">{{activeCoin.vol}}</td>
</tr>
</table>
</view>
@ -119,7 +119,7 @@
<v-button
block
class="flex-fill m-r-md rounded-lg"
type="green"
type="green2"
replace
:to="{
path: '/pages/base/index',
@ -134,7 +134,7 @@
<v-button
block
class="flex-fill rounded-lg"
type="blue"
type="red2"
replace
:to="{
path: '/pages/base/index',

4
pages/exchange/latest-transaction.vue

@ -1,14 +1,14 @@
<template>
<table class="w-max">
<thead>
<tr class="fn-sm">
<tr class="fn-sm color-dark">
<th class="p-l-md p-y-xs fn-left">{{$t('exchange.d4')}}</th>
<th class="fn-left">{{$t('exchange.d5')}}</th>
<th class="fn-right">{{$t('exchange.d2')}}</th>
<th class="p-r-md p-y-xs fn-right">{{$t('exchange.c5')}}</th>
</tr>
</thead>
<tbody class="color-light">
<tbody class="color-dark">
<tr v-for="(item,idx) in tradeList" :key="idx">
<td class="p-l-md p-y-xs">{{parseTime(item.ts,false,'{h}:{i}:{s}')}}</td>
<td>

151
pages/exchange/open-position.vue

@ -1,9 +1,9 @@
<template>
<view>
<view class="d-flex p-x-md p-0 fa p-t-md justify-between align-center fn-18 bg-panel-3 color-light flex-wrap">
<view style="background-color: #fff;">
<view class="d-flex p-x-md p-0 fa p-t-md p-d-md justify-between align-center fn-18 bg-panel-2 color-dark flex-wrap">
<view class="w-max" style="height: var(--status-bar-height)"></view>
<view @click="$emit('symbol')" class="d-flex align-center">
<i class="iconfont color-light fn-bold fn-18">&#xe655;</i>
<i class="iconfont fn-bold fn-18" style="color: #000!important;">&#xe655;</i>
<text class="fn-bold" style="margin-right: 5px;">{{ symbol }}</text>
{{ $t("first.b8") }}
<text class="fn-10 m-l-xs p-y-2"
@ -21,17 +21,17 @@
tag="view"
class=""
:to="{
path: '/pages/exchange/index',
query: { code: symbol, contract: 1 },
}"
path: '/pages/exchange/index',
query: { code: symbol, contract: 1 },
}"
>
<van-icon name="chart-trending-o"/>
</v-link>
</view>
<view class="p-ms bg-form-panel-3 fn-sm m-t-xs rounded-sm d-flex justify-between w-max fn-13">
<view v-if="1" class="p-ms fn-sm m-t-xs rounded-sm d-flex justify-between w-max fn-13">
<view class="item w-33 t-no positions">
<view class="label">{{ $t("contract.d4") }}(USDT)</view>
<view class="num color-light d-flex align-center" style="margin-top:8px;">
<view class="num color-dark d-flex align-center" style="margin-top:8px;">
<text>{{ accountInfo.account_equity || "--"}}</text>
<van-icon name="exchange bg-form-panel-3" @click="_router.push('/pages/transfer/index')"
class="p-l-xs color-theme-1 icon"/>
@ -43,7 +43,7 @@
{{ $t("contract.e4") }}
(USDT)
</view>
<view class="num color-light " style="margin-top:8px;">
<view class="num color-dark " style="margin-top:8px;">
<!-- {{accountInfo.totalUnrealProfit}} -->
{{accountInfo.usable_balance}}
</view>
@ -53,7 +53,7 @@
{{ $t("contract.d6") }}
<van-icon @click="popshow=true" class="color-theme-1 m-l-xs" name="info-o"/>
</view>
<view class="num color-light fn-right" style="margin-top:8px;">{{
<view class="num color-dark fn-right" style="margin-top:8px;">{{
accountInfo.riskRate || "0%"
}}
</view>
@ -91,7 +91,7 @@
</text>
<i class="iconfont">&#xe6e9;</i>
</v-picker> -->
<v-dropdwon class="w-60 m-r-xs bg-form-panel-3 p-y-xxs rounded posi" :list="commissionTypes"
<v-dropdwon class="w-60 m-r-xs p-y-xxs rounded posi" :list="commissionTypes"
@onClick="dropDownChange">
</v-dropdwon>
<!-- <v-picker
@ -104,7 +104,7 @@
<i class="iconfont fn-13">&#xe6e9;</i>
</v-picker> -->
<v-dropdwon v-if="lever_rage.length>0"
class="w-40 m-r-xs posi bg-form-panel-3 p-y-xxs rounded" :contract="contract"
class="w-40 m-r-xs posi p-y-xxs rounded" :contract="contract"
:list="lever_rage" @onClick="openNum" :leverShow="leverShow">
</v-dropdwon>
</view>
@ -125,7 +125,8 @@
v-if="form.type == 1"
disabled
:value='$t("first.a4")'
class="h-30 p-y-xxs rounded fn-center fn-bold color-light bg-form-panel-3 p-x-xs"
class="h-30 p-y-xxs rounded-xs fn-center fn-bold color-dark p-x-xs"
style="background-color: #F5F5F5;"
></v-input>
</view>
<view>
@ -135,10 +136,11 @@
v-model="margin"
:placeholder="$t('contract.d2')"
@input="sliderActive=-1"
class="h-30 p-x-sm p-y-xxs rounded bg-form-panel-3"
class="h-30 p-x-sm p-y-xxs rounded-xs"
style="background-color: #F5F5F5;"
>
<template #right>
<span class="color-light fn-bold">
<span class="color-dark fn-bold">
<!-- {{ $t("contract.d8") }} -->
USDT
</span>
@ -194,13 +196,15 @@
<v-input
:placeholder="$t('contract.i4')"
v-model="form.tp_trigger_price"
class="h-30 p-x-ms rounded bg-form-panel-3 fn-12 fn-center"
class="h-30 p-x-ms rounded fn-12 fn-center"
style="background-color: #f5f5f5;"
>
</v-input>
<v-input
:placeholder="$t('contract.i7')"
v-model="form.sl_trigger_price"
class="h-30 p-x-ms m-l-xs rounded fn-12 bg-form-panel-3"
class="h-30 p-x-ms m-l-xs rounded fn-12 fn-center"
style="background-color: #f5f5f5;"
>
</v-input>
</view>
@ -213,7 +217,7 @@
@click="ifOpenPosition(1)"
size="small"
block
class="w-max rounded"
class="w-max rounded-xs"
>
<span class="but_text">{{ $t("contract.c0") }}</span>
<!--<span class="fn-10 but_right">{{ $t("contract.e0") }}</span>-->
@ -247,7 +251,7 @@
@click="ifOpenPosition(2)"
size="small"
block
class="w-max rounded"
class="w-max rounded-xs"
>
<span class="but_text">{{ $t("contract.c2") }}</span>
<!--<span class="fn-10 but_right">{{ $t("contract.e2") }}</span>-->
@ -317,15 +321,22 @@
</view>
<!-- <view class="h-20"></view> -->
<!-- <trade-list :tradeList="tradeList" /> -->
<view class="" style="background-color: #f5f5f5;width: 90%;margin: 10px auto;padding: 20px;box-sizing: border-box;border-radius: 10px;">
<view class="d-flex">
<view class="">{{$t("ybgcoins3.a7")}}</view>
<view class=""></view>
</view>
<view class="">{{$t("ybgcoins3.a8")}}</view>
</view>
<view class="p-b-lg">
<view class=" d-flex justify-between align-center p-x-md p-t-md bor5">
<view class="d-flex w-75 align-center">
<text class="m-x-ms" @click="active=0"
:class="active==0?'fn-bold fn-15 p-b-xs bor5-active color-light':''">
:class="active==0?'fn-bold fn-15 p-b-xs bor5-active color-dark':''">
{{$t('first.a5')}}({{list.length}})
</text>
<text class="m-x-ms" @click="active=1"
:class="active==1?'fn-bold fn-15 p-b-xs bor5-active color-light':''">
:class="active==1?'fn-bold fn-15 p-b-xs bor5-active color-dark':''">
{{$t('exchange.a4')}}({{listCurrent.length}})
</text>
<!-- <text class="m-x-ms" @click="active=2" :class="active==2?'fn-bold fn-15 p-b-xs bor5-active color-light':''">{{$t('exchange.a5')}}({{listHistory.length}})</text> -->
@ -398,7 +409,7 @@
<!-- </view>-->
<!--</view>-->
<view
class="item border-b bg-panel-3"
class="item border-b"
v-for="item in (list)"
:key="item.id"
>
@ -437,33 +448,33 @@
<view class="row d-flex m-y-xs justify-between fn-14 p-t-xs">
<view class="w-33 fn-left">
<view class="label">{{ $t("contract.g6") }}</view>
<view class="color-light">{{item.avg_price}}</view>
<view class="color-dark">{{item.avg_price}}</view>
</view>
<view class="w-33 fn-center">
<view class="label">{{ $t("first.c5") }}</view>
<view class="color-light">
<view class="color-dark">
<template>{{item.realtimePrice}}</template>
</view>
</view>
<view class="w-33 fn-right">
<view class="label">{{ $t("contract.b1") }}</view>
<view class="color-light">{{item.position_margin}}</view>
<view class="color-dark">{{item.position_margin}}</view>
</view>
</view>
<view class="row d-flex m-y-xs justify-between fn-14 p-t-xs">
<view class="w-33 fn-left">
<view class="label">{{ $t("contract.i4") }}</view>
<view class="color-light">{{item.tpPrice || "--"}}</view>
<view class="color-dark">{{item.tpPrice || "--"}}</view>
</view>
<view class="w-33 fn-center">
<view class="label">{{ $t("contract.i7") }}</view>
<view class="color-light">
<view class="color-dark">
<template>{{item.slPrice || "--"}}</template>
</view>
</view>
<view class="w-33 fn-right">
<view class="label">{{ $t("contract.a1") }}({{ $t("contract.d8") }})</view>
<view class="color-light">
<view class="color-dark">
{{item.avail_position}}
</view>
</view>
@ -471,30 +482,32 @@
<view class="row d-flex m-y-xs justify-between fn-14 p-t-xs">
<view class="w-50 fn-left">
<view class="label">{{ $t("option.b6") }}</view>
<view class="color-light"
<view class="color-dark"
:class="item.unRealProfit>0?'increace':item.unRealProfit<0?'decreace':''">
{{item.unRealProfit}}
</view>
</view>
<!-- <view class="w-50 fn-center">
<view class="label">{{ $t("contract.g8") }}888</view>
<view class="color-light">{{item.flatPrice}}</view>
<view class="color-dark">{{item.flatPrice}}</view>
</view> -->
<view class="w-50 fn-right">
<view class="label">{{ $t("contract.h0") }}</view>
<view class="color-light" :class="item.unRealProfit>0?'color-buy':'color-sell'">
<view class="color-dark" :class="item.unRealProfit>0?'color-buy':'color-sell'">
{{item.profitRate}}
</view>
</view>
</view>
<view class="row d-flex m-y-xs align-center justify-between fn-13 p-t-xs">
<text
class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
class="bg-yellow2 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
style="color: #000;"
@click="toStoploss(item)">{{ $t("contract.h5") }}
</text>
<!-- <text class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1" @click="onekeyReverse(item)">{{ $t("contract.k8") }}</text> -->
<text
class="bg-form-panel-4 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
class="bg-yellow2 box-shadow rounded-xs p-y-ms w-33 p-x-ms fn-center color-theme-1"
style="color: #000;"
@click="closePositionShow(item)">{{ $t("contract.h3") }}
</text>
<!-- <v-button type="default" size="small" class="opt-btn rounded-xs m-b-xs" @click="closePositionShow(item)">{{ $t("contract.h3") }}</v-button>
@ -509,7 +522,7 @@
<template v-if="active==1">
<view
class="item border-b bg-panel-3"
class="item border-b"
v-for="item in (listCurrent)"
:key="item.id"
>
@ -519,14 +532,14 @@
<view class="suatus m-r-xs" :class="item.side==2?'color-buy':'color-sell'">
{{cals(item.side, item.order_type)}} {{item.lever_rate}}X
</view>
<view class="color-light fn-bold">{{item.symbol}}/USDT</view>
<view class="color-dark fn-bold">{{item.symbol}}/USDT</view>
<view class="m-l-ms">
{{item.created_at}}
</view>
</view>
<view class="d-flex w-25 justify-end align-center">
<!-- <view class="label">{{$t('assets.d0')}}</view>
<view class="color-light">
<view class="color-dark">
{{item.status_text}}
</view> -->
<img width="15px" height="15px" src="static/img/che.png"
@ -536,17 +549,17 @@
<view class="row d-flex m-y-xs justify-between fn-10 p-t-xs">
<view class="w-33 fn-left">
<view class="label">{{ $t("contract.a8") }}({{ $t("contract.d8") }})</view>
<view class="color-light">{{item.amount}}</view>
<view class="color-dark">{{item.amount}}</view>
</view>
<view class="w-33 fn-center">
<view class="label">{{ $t("exchange.b7") }}(USDT)</view>
<view class="color-light">
<view class="color-dark">
{{item.entrust_price}}
</view>
</view>
<view class="w-33 fn-right">
<view class="label">{{ $t("first.c6") }}</view>
<view class="color-light">
<view class="color-dark">
<template>{{omitTo(item.margin, 2)}}</template>
</view>
</view>
@ -554,17 +567,17 @@
<view class="row d-flex m-y-xs justify-between fn-10 p-t-xs">
<view class="w-33 fn-left">
<view class="label">{{ $t("first.c7") }}({{ $t("contract.d8") }})</view>
<view class="color-light">{{item.traded_amount}}</view>
<view class="color-dark">{{item.traded_amount}}</view>
</view>
<view class="w-33 fn-center">
<view class="label">{{ $t("contract.a9") }}(USDT)</view>
<view class="color-light">
<view class="color-dark">
{{item.avg_price}}
</view>
</view>
<view class="w-33 fn-right">
<!-- <view class="label">担保资产</view>
<view class="color-light">
<view class="color-dark">
<template>{{omitTo(item.margin,2)}}</template>
</view> -->
</view>
@ -580,10 +593,10 @@
<view>
<view class="p-y-xs p-x-md border-b d-flex align-center">
<view class="p-xs rounded-sm fn-bold" :class="
activeItem.side == 2
? 'bg-danger-transparent color-danger'
: 'bg-success-transparent color-success'
">
activeItem.side == 2
? 'bg-danger-transparent color-danger'
: 'bg-success-transparent color-success'
">
{{ activeItem.side == 1 ? $t("contract.e8") : $t("contract.e9") }}
</view>
<view class="fn-bold m-x-sm">{{ activeItem.pair_name }}</view>
@ -592,11 +605,11 @@
<view class="p-x-md p-t-md d-flex">
<view class="m-r-md">
<span>{{ $t("contract.e9") }}</span><span
class="color-light">{{ activeItem.avg_price * 1 }}</span>
class="color-dark">{{ activeItem.avg_price * 1 }}</span>
</view>
<view>
<span>{{ $t("contract.i2") }}</span><span
class="color-light">{{ activeItem.realtimePrice }}</span>
class="color-dark">{{ activeItem.realtimePrice }}</span>
</view>
</view>
<view class="p-x-md p-t-0">
@ -654,10 +667,10 @@
<view>
<view class="p-y-xs p-x-md border-b d-flex align-center">
<view class="p-xs rounded-xs fn-bold" :class="
activeItem.side == 1
? 'bg-danger-transparent color-danger'
: 'bg-success-transparent color-success'
">
activeItem.side == 1
? 'bg-danger-transparent color-danger'
: 'bg-success-transparent color-success'
">
{{ $t("contract.h6")
}}{{ activeItem.side == 1 ? $t("contract.e8") : $t("contract.e9") }}
</view>
@ -669,7 +682,7 @@
v-model="activeItem.realtimePrice" v-if="activeItem.closeType == 1">
<template #right>
<!-- <v-button size="mini" type="theme" @click="activeItem.closeType = 2">{{ $t("contract.d7") }}</v-button> -->
<v-dropdwon class="w-30 m-r-xs bg-form-panel-3 p-y-xxs rounded posi" :list="shixian"
<v-dropdwon class="w-30 m-r-xs p-y-xxs rounded posi" :list="shixian"
@onClick="dropDownxian">
</v-dropdwon>
</template>
@ -678,7 +691,7 @@
:value="$t('contract.d7')" v-else>
<template #right>
<!-- <v-button size="mini" type="theme" @click="activeItem.closeType = 1">{{ $t("contract.h8") }}</v-button> -->
<v-dropdwon class="w-30 m-r-xs bg-form-panel-3 p-y-xxs rounded posi" :list="shixian"
<v-dropdwon class="w-30 m-r-xs p-y-xxs rounded posi" :list="shixian"
@onClick="dropDownxian">
</v-dropdwon>
</template>
@ -700,7 +713,7 @@
{{item}}%
</view>
</view>
<v-button type="blue" class="rounded-lg" block @click="closePosition" ref="btn">
<v-button type="yellow2" class="rounded-lg" block @click="closePosition" ref="btn">
{{ $t("contract.h3") }}
</v-button>
<!-- <view class="h-55"></view> -->
@ -720,7 +733,7 @@
block
class="w-max rounded-xs "
@click="popshow=false"
>
>
{{$t('contract.i9')}}
</v-button>
</view>
@ -941,7 +954,7 @@ export default {
this.getMarketInfo();
this.contractAccount();
this.getSymbolDetail();
console.log(222222222222);
console.log(222222222222);
},
//
isShow(n) {
@ -1704,7 +1717,8 @@ export default {
.minus-class,
.input-class,
.plus-class {
background: $form-panel-4;
color: #333;
background-color: #F5F5F5!important;
}
}
@ -1824,12 +1838,10 @@ export default {
}
::v-deep .plus-class {
background-color: $panel-4 !important;
border-radius: 50%;
}
::v-deep .minus-class {
background-color: $panel-4 !important;
border-radius: 50%;
}
@ -1874,7 +1886,9 @@ export default {
.h-120 {
height: 120px;
}
.p-d-md{
padding-bottom: 10px;
}
.borders {
// border-color: $form-panel-4!important;
border: 1px solid $form-panel-4 !important;
@ -1962,4 +1976,17 @@ export default {
.but_text {
font-size: 14px;
}
</style>s
.layout-main{
color: #000!important;
background-color: #fff;
}
/deep/ .green uni-button{
background-color: #2EBD85;
}
/deep/ .red uni-button{
background-color: #F6465D;
}
/deep/ .van-stepper{
background-color: #F5F5F5 !important;
}
</style>

8
pages/exchange/sale.vue

@ -6,25 +6,25 @@
</div> -->
<div class="d-flex fn-sm buy-and-sell">
<div :class="query.code!='GITP/USDT'?'w-6/12 buy':'w-12/12 buy'">
<div class="d-flex justify-between p-xs">
<div class="d-flex justify-between p-xs color-dark">
<div>{{$t('exchange.c5')}}</div>
<div>{{$t('exchange.f3')}}</div>
</div>
<div class="d-flex item justify-between p-xs" v-for="(item,idx) in buyList" :key="idx">
<div class="progress bg-buy-transparent transition-default" :style="{width:getValue(item.amount)+'%'}"></div>
<div class="color-light">{{item.amount}}</div>
<div class="color-dark">{{item.amount}}</div>
<div class="color-buy">{{item.price}}</div>
</div>
</div>
<div class="w-6/12 sell">
<div class="d-flex justify-between p-xs">
<div class="d-flex justify-between p-xs color-dark">
<div>{{$t('exchange.c5')}}</div>
<div>{{$t('exchange.f4')}}{{sellList.length}}</div>
</div>
<div class="d-flex item justify-between p-xs" v-for="(item,idx) in sellList" :key="idx">
<div class="progress bg-sell-transparent transition-default" :style="{width:getValue(item.amount)+'%'}"></div>
<div class="color-light">{{item.amount}}</div>
<div class="color-dark">{{item.amount}}</div>
<div class="color-sell">{{item.price}}</div>
</div>

6
pages/exchange/sell-and-buy.vue

@ -1,10 +1,14 @@
<template>
<div class="p-l-xs d-flex flex-col dep-list">
<!-- -->
<div class="d-flex justify-between fn-xs m-b-xs">
<div class="d-flex justify-between fn-xs m-b-xs" style="color: #999;">
<span>{{$t('exchange.d2')}}</span>
<span>{{$t('exchange.c5')}}</span>
</div>
<div class="d-flex justify-between fn-xs m-b-xs" style="color: #999;">
<span>(USDT)</span>
<span>(BTC)</span>
</div>
<div class=" overflow-scroll rotatebox" v-if="symbol!='GITP/USDT'">
<div class="rotateZ">
<div

4
pages/help/detail.vue

@ -3,10 +3,10 @@
<v-header :title="$t('help.a0')"></v-header>
<div class="layout-main">
<div class="p-md border-b">
<div class="title fn-18 color-light m-b-xs">{{detail.title}}</div>
<div class="title fn-18 color-dark m-b-xs">{{detail.title}}</div>
<!-- <div class="fn-sm">{{detail.created_at}}</div> -->
</div>
<div class="edit-content p-md" v-html="detail.body"></div>
<div class="edit-content p-md color-dark" v-html="detail.body"></div>
</div>
</div>
</template>

95
pages/help/index.vue

@ -1,27 +1,54 @@
<template>
<div class="layout-page" :style="themeStyle">
<div class="layout-page layout-page_a" :style="themeStyle">
<v-header :title="$t('help.a3')"></v-header>
<main class="layout-main">
<template v-for="parentItem in list">
<v-link
tag="div"
:to="{path:'/pages/help/sort',query:{id:parentItem.id,title:parentItem.name}}"
class="p-md color-light fn-20 "
:key="parentItem.id"
>{{parentItem.name}}</v-link>
<div class="m-x-md m-b-md p-md bg-panel-4 rounded box-shadow" :key="parentItem.id+'s'">
<v-link
tag="div"
:to="{path:'/pages/help/detail',query:{id:item.id}}"
class="item p-y-xs border-b d-flex justify-between"
v-for="item in parentItem.article"
:key="item.id"
>
<div class="eps-1 color-light">{{item.title}}</div>
<van-icon name="arrow" />
</v-link>
</div>
</template>
<view class="d-flex" style="justify-content: space-between;">
<view v-for="(item1,index1) in list" :key="index1" @click="tab = index1"
style="text-align: center;padding: 20px 0px 0px;">
<image src="../../static/img/4.png" mode="" style="width: 12vw;height: 12vw;"></image>
<view class="">{{item1.name}}</view>
</view>
</view>
<view class="">
<view class="" style="font-size: 20px;font-weight: bold;padding: 20px 0px 20px 15px;">{{$t("ybgcoins3.a9")}}</view>
<view v-for="(parentItem,index2) in list" :key="index2" v-if="tab==index2">
<v-link
tag="div"
:to="{path:'/pages/help/sort',query:{id:parentItem.id,title:parentItem.name}}"
class="p-md fn-20 "
:key="parentItem.id"
>{{parentItem.name}}</v-link>
<div class="m-x-md m-b-md p-md rounded box-shadow" :key="parentItem.id+'s'"
style="background-color: #f5f5f5;">
<block v-for="item2 in parentItem.article":key="item2.id">
<v-link
tag="div"
:to="{path:'/pages/help/detail',query:{id:item2.id}}"
class="item border-b d-flex justify-between"
style="align-items: center;padding: 10px 0px 20px;"
>
<img :src="item2.full_cover" style="width: 16vw;height: 12vw;border-radius: 8px;" />
<div class="eps-1" style="flex: 1;margin: 0 10px;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;">{{item2.title}}</div>
<van-icon name="arrow" />
</v-link>
</block>
</div>
<!-- <div class="m-x-md m-b-md p-md rounded box-shadow" :key="parentItem.id+'s'"
style="background-color: #f5f5f5;">
<v-link
tag="div"
:to="{path:'/pages/help/detail',query:{id:item2.id}}"
class="item p-y-xs border-b d-flex justify-between"
v-for="item2 in parentItem.article"
:key="item2.id"
>
<div class="eps-1">{{item2.title}}</div>
<van-icon name="arrow" />
</v-link>
</div> -->
</view>
</view>
</main>
</div>
</template>
@ -33,6 +60,7 @@ export default {
data() {
return {
list: [],
tab: 0,
};
},
computed: {
@ -40,9 +68,10 @@ export default {
},
methods: {
college() {
let data={
lang:uni.getStorageSync('language')=='zh-CN'?'zh-CN':'en'
}
let lang = uni.getStorageSync('language')=='zh-CN'?'zh-CN':(uni.getStorageSync('language')=='zh-TW'?'zh-CN':'en');
let data={
lang:lang
};
College.college(data).then((res) => {
this.list = res.data.categoryList;
});
@ -53,3 +82,21 @@ export default {
},
};
</script>
<style lang="scss" scoped>
.layout-page_a{
display: flex;
flex-direction: column;
color: #333 !important;
background-color: #fff !important;
}
.layout-main{
color: #333 !important;
background-color: #fff !important;
}
/deep/ .van-nav-bar__left .van-nav-bar__arrow{
color: #000;
}
/deep/ .van-nav-bar__title{
color: #000;
}
</style>

4
pages/help/sort.vue

@ -3,8 +3,8 @@
<v-header :title="query.title||$t('help.a2')"></v-header>
<div class="layout-mian">
<div class="list d-flex flex-wrap justify-between p-md">
<v-link tag="div" :to="{path:'/pages/help/detail',query:{id:item.id}}" class="item p-xs bg-panel-4 rounded m-b-md box-shadow" v-for="item in list" :key="item.id">
<van-image class="image" fit="cover" :src="item.full_cover"></van-image>
<v-link tag="div" :to="{path:'/pages/help/detail',query:{id:item.id}}" class="item p-xs bg-F5 m-b-md" v-for="item in list" :key="item.id">
<image class="image" fit="cover" :src="item.full_cover"></image>
<div class="eps-2 m-t-xs">{{item.title}}</div>
</v-link>
</div>

23
pages/login/index.vue

@ -1,5 +1,5 @@
<template>
<v-page>
<v-page style="background-color: #fff;">
<v-header class="nav-tab" :leftClick="()=>_router.replace('/pages/base/index')">
<template #right>
<view class="per-bot p-y-md p-x-sm d-flex align-center">
@ -8,7 +8,7 @@
<v-lang
></v-lang>
<i class="iconfont m-l-xs fn-sm" >&#xe6e9;</i>
<i class="iconfont m-l-xs fn-sm">&#xe6e9;</i>
</span>
</view>
</template>
@ -19,20 +19,20 @@
</view>
<view class="form m-lg <strong>bg-panel</strong>-3 p-lg rounded-md box-shadow">
<view class="form-item border-b m-b-lg p-b-xs ">
<view class="label m-b-lg">{{$t('login.a0')}}</view>
<v-input class="color-light" v-model="form.account" :placeholder="$t('login.a1')"></v-input>
<view class="label m-b-lg color-dark">{{$t('login.a0')}}</view>
<v-input class="color-dark" v-model="form.account" :placeholder="$t('login.a1')"></v-input>
</view>
<view class="form-item border-b m-b-xl p-b-xs">
<view class="label m-b-lg">{{$t('login.a2')}}</view>
<view class="label m-b-lg color-dark">{{$t('login.a2')}}</view>
<v-input
class="color-light"
class="color-dark"
v-model="form.password"
type="password"
:placeholder="$t('login.a3')"
></v-input>
</view>
<view class="m-b-lg">
<v-button type="blue" block class="w-max rounded-md" key="loginbtn" @click="toLogin">{{$t('login.a4')}}</v-button>
<v-button type="yellow2" block class="w-max rounded-md" key="loginbtn" @click="toLogin">{{$t('login.a4')}}</v-button>
</view>
</view>
@ -226,4 +226,13 @@ export default {
.mlaotu{
margin-left: auto;
}
/deep/ .van-nav-bar{
background-color: #FFF;
}
/deep/ .van-nav-bar__left .van-nav-bar__arrow{
color: #000;
}
.iconfont{
color: #000!important;
}
</style>

2
pages/notice/index.vue

@ -2,7 +2,7 @@
<v-page>
<v-header :title="$t('notice.a1')"></v-header>
<view class="d-flex justify-center p-t-md">
<view class="d-flex bg-form-panel-4 rounded-lg overflow-scroll">
<view class="d-flex rounded-lg overflow-scroll bg-F5">
<view
:class="{ 'bg-theme-1 color-plain rounded-lg': active == 1 }"
@click="active = 1"

46
pages/reg/index.vue

@ -1,11 +1,11 @@
<template>
<v-page>
<v-page style="background-color: #fff;">
<v-header class="nav-tab" :title="$t('reg.b9')">
<template #right>
<view class="per-bot p-y-md p-x-sm d-flex align-center">
<!-- <img :src="$localImgUrl('Page6.png')" alt="" class="h-20 m-r-xs" /> -->
<span class="color-light">
<span class="color-dark">
<v-lang
@change="
marketList = [];
@ -16,8 +16,8 @@
</view>
</template>
</v-header>
<view class="layout-main">
<view class="form m-lg bg-panel-3 p-lg rounded-md">
<view class="layout-main" style="background-color: #fff;">
<view class="form m-lg p-lg rounded-md">
<view class="d-flex justify-center">
<!-- <view
class="item transition-3 p-y-sp-r-sm p-x-xs fn-20 "
@ -39,7 +39,7 @@
<view
class="item transition-3 p-y-sp-r-sm p-x-xs fn-20"
:class="{
'color-light':form.type==2
'color-dark':form.type==2
}"
@click="form.type=2"
>{{$t('reg.a1')}}
@ -55,8 +55,8 @@
<view class="form-item border-b m-b-md p-b-xs">
<template v-if="form.type==1">
<view key="1">
<view class="label m-b-xs">{{$t('reg.a2')}}</view>
<v-input v-model="form.account" class="color-light" :placeholder="$t('reg.a3')">
<view class="label m-b-xs color-dark">{{$t('reg.a2')}}</view>
<v-input v-model="form.account" class="color-dark" :placeholder="$t('reg.a3')">
<template #left>
<v-country ref="country" @country_code="country_code=$event" class="m-r-xs" v-model="form.country_id" />
</template>
@ -65,14 +65,14 @@
</template>
<template v-else-if="form.type==2">
<view key="2">
<view class="label m-b-xs">{{$t('reg.a4')}}</view>
<v-input v-model="form.account" class="color-light" :placeholder="$t('reg.a5')"></v-input>
<view class="label m-b-xs color-dark">{{$t('reg.a4')}}</view>
<v-input v-model="form.account" class="color-dark" :placeholder="$t('reg.a5')"></v-input>
</view>
</template>
</view>
<view class="form-item border-b m-b-md p-b-xs">
<view class="label m-b-xs">{{$t('reg.a6')}}</view>
<v-input class="color-light" v-model="form.code" :placeholder="$t('reg.a7')">
<view class="label m-b-xs color-dark">{{$t('reg.a6')}}</view>
<v-input class="color-dark" v-model="form.code" :placeholder="$t('reg.a7')">
<template #right>
<!-- 手机 -->
<v-code
@ -97,13 +97,13 @@
</v-input>
</view>
<view class="form-item border-b m-b-md p-b-xs">
<view class="label m-b-xs">{{$t('reg.a8')}}</view>
<v-input class="color-light" v-model="form.password" type="password" :placeholder="$t('reg.a9')"></v-input>
<view class="label m-b-xs color-dark">{{$t('reg.a8')}}</view>
<v-input class="color-dark" v-model="form.password" type="password" :placeholder="$t('reg.a9')"></v-input>
</view>
<view class="form-item border-b m-b-md p-b-xs">
<view class="label m-b-xs">{{$t('reg.b0')}}</view>
<view class="label m-b-xs color-dark">{{$t('reg.b0')}}</view>
<v-input
class="color-light"
class="color-dark"
v-model="form.password_confirmation"
type="password"
:placeholder="$t('reg.b1')"
@ -114,9 +114,9 @@
<v-input class="color-light" v-model="form.invitationCode" type="password" :placeholder="$t('reg.c7')"></v-input>
</view> -->
<view class="form-item border-b m-b-md p-b-xs">
<view class="label m-b-xs">{{$t('reg.c6')}}</view>
<view class="label m-b-xs color-dark">{{$t('reg.c6')}}</view>
<!-- <v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}(${$t('reg.b4')})`"></v-input> -->
<v-input class="color-light" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}`"></v-input>
<v-input class="color-dark" :disabled="query.invite_code?true:false" v-model="form.invite_code" :placeholder="`${$t('reg.c7')}`"></v-input>
</view>
<view class="tips d-flex m-b-md fn-sm">
<van-checkbox
@ -126,17 +126,17 @@
icon-size="15px"
checked-color="#f05319"
></van-checkbox>
<view class="m-l-xs">
<view class="m-l-xs color-dark">
{{$t('reg.b5')}}
<v-link class="color-sell" v-if="agreement.agreement" :to="{path:'/pages/notice/detail',query:{id:agreement.agreement.id}}">{{agreement.agreement.title}}</v-link>{{$t('reg.b7')}}
<v-link class="color-sell" v-if="agreement.clause" :to="{path:'/pages/notice/detail',query:{id:agreement.clause.id}}">{{agreement.clause.title}}</v-link>
</view>
</view>
<v-button type="blue" block class="w-max m-b-md rounded-md" @click="register">{{$t('reg.b9')}}</v-button>
<v-button type="yellow2" block class="w-max m-b-md rounded-md" @click="register">{{$t('reg.b9')}}</v-button>
</view>
</view>
<view class="m-x-lg p-x-lg">
<view class="p-y-md border-t fn-center">
<view class="p-y-md border-t fn-center color-dark">
{{$t('reg.b9')}}
<v-link class="color-sell" to="/pages/login/index">{{$t('reg.c1')}}</v-link>
</view>
@ -282,4 +282,10 @@ export default {
.disnone{
display: none;
}
/deep/ .van-nav-bar__left .van-nav-bar__arrow{
color: #000;
}
.iconfont{
color: #000!important;
}
</style>

24
pages/safe/email.vue

@ -1,15 +1,15 @@
<template>
<v-page>
<v-page style="background-color: #fff;">
<v-header :title="`${user.email?$t('safe.a0'):$t('safe.a1')}${$t('safe.a2')}`"></v-header>
<main class="layout-main bg-panel-4 m-t-md">
<main class="layout-main p-t-md" style="background-color: #fff;">
<view class="form-item border-b p-md" v-if="!user.email">
<view class="label m-b-xs">{{$t('safe.a3')}}</view>
<view class="label m-b-xs color-dark">{{$t('safe.a3')}}</view>
<view class="input color-light">
<v-input v-model="form.email" :placeholder="$t('safe.a4')"></v-input>
</view>
</view>
<view class="form-item border-b p-md">
<view class="label m-b-xs">{{$t('safe.a5')}}</view>
<view class="label m-b-xs color-dark">{{$t('safe.a5')}}</view>
<view class="input color-light">
<v-input v-model="form.email_code" :placeholder="$t('safe.a6')">
<template #right>
@ -37,7 +37,7 @@
</view>
</view>
</main>
<view class="p-md bg-panel-4">
<view class="p-md" style="background-color: #fff;">
<v-button block class="w-max" type="theme" ref="btn" @click="chnageEmail">{{user.email?$t('safe.a0'):$t('safe.a1')}}</v-button>
</view>
<van-toast id="van-toast" />
@ -83,4 +83,18 @@ export default {
};
</script>
<style lang="scss" scoped>
/deep/ .van-nav-bar{
background-color: #FFF;
border-bottom: 1px solid #e5e5e5 !important;
}
/deep/ .van-nav-bar__left .van-nav-bar__arrow{
color: #000;
}
/deep/ .van-nav-bar__title{
color: #000;
}
/deep/ .theme uni-button{
background-color: #F7D558;
border: 1px solid #F7D558;
}
</style>

26
pages/safe/forget-password.vue

@ -2,28 +2,28 @@
<v-page>
<v-header :title="$t('safe.b0')"></v-header>
<main class="layout-main m-t-md">
<view class="m-md bg-panel-3 rounded-sm overflow-hidden">
<view class="form-item border-b p-md">
<view class="m-md rounded-sm overflow-hidden box-shadow">
<view class="form-item border-b p-md color-dark">
<view class="label m-b-xs">{{$t('safe.b1')}}</view>
<view class="input color-light">
<view class="input">
<v-input v-model="form.account" :placeholder="`${$t('safe.b2')}`" @blur="checkAccount"></v-input>
</view>
</view>
<view class="form-item border-b p-md">
<view class="form-item border-b p-md color-dark">
<view class="label m-b-xs">{{$t('safe.b3')}}</view>
<view class="input color-light">
<view class="input">
<v-input type="password" v-model="form.password" :placeholder="$t('safe.b4')"></v-input>
</view>
</view>
<view class="form-item border-b p-md">
<view class="form-item border-b p-md color-dark">
<view class="label m-b-xs">{{$t('safe.b5')}}</view>
<view class="input color-light">
<view class="input">
<v-input type="password" v-model="form.password_confirmation" :placeholder="$t('safe.b6')"></v-input>
</view>
</view>
<view class="form-item border-b p-md" v-if="checkData.phone_status==1&&show">
<view class="form-item border-b p-md color-dark" v-if="checkData.phone_status==1&&show">
<view class="label m-b-xs">SMS{{$t('safe.a7')}}</view>
<view class="input color-light">
<view class="input">
<v-input v-model="form.sms_code" :placeholder="$t('safe.a6')">
<template #right>
<v-code
@ -34,9 +34,9 @@
</v-input>
</view>
</view>
<view class="form-item border-b p-md" v-if="checkData.email_status==1">
<view class="form-item border-b p-md color-dark" v-if="checkData.email_status==1">
<view class="label m-b-xs">{{$t('safe.a5')}}</view>
<view class="input color-light">
<view class="input">
<v-input v-model="form.email_code" :placeholder="$t('safe.a6')">
<template #right>
<v-code url="/user/sendEmailCodeForgetPassword" :data="{email:form.account}"></v-code>
@ -44,9 +44,9 @@
</v-input>
</view>
</view>
<view class="form-item border-b p-md" v-if="checkData.google_status==1">
<view class="form-item border-b p-md color-dark" v-if="checkData.google_status==1">
<view class="label m-b-xs">google{{$t('safe.a7')}}</view>
<view class="input color-light">
<view class="input">
<v-input v-model="form.google_code" :placeholder="$t('safe.a6')"></v-input>
</view>
</view>

4
pages/safe/index.vue

@ -1,7 +1,7 @@
<template>
<v-page>
<v-header :title="$t('safe.c7')"></v-header>
<main class=" m-x-lg m-y-lg p-x-md bg-panel-3 rounded-md box-shadow">
<main class=" m-x-lg m-y-lg p-x-md rounded-md box-shadow" style="background-color: #f5f5f5;">
<view class="list">
<!-- --------google------ -->
<!-- <v-link
@ -22,7 +22,7 @@
class="item link-active d-flex p-x-md p-y-md align-center border-b"
>
<view class="flex-fill d-flex justify-between m-r-xs">
<view class="color-light">{{$t('safe.c8')}}</view>
<view class="color-dark">{{$t('safe.c8')}}</view>
</view>
<van-icon name="arrow" />
</v-link>

14
pages/safe/login-password.vue

@ -1,22 +1,22 @@
<template>
<v-page class="pos-login">
<v-header :title="$t('safe.c8')"></v-header>
<main class=" m-x-xl bg-panel-3 p-x-lg p-y-lg rounded-md box-shadow">
<main class=" m-x-xl p-x-lg p-y-lg rounded-md box-shadow" style="background-color: #f5f5f5;">
<view class="form-item border-b p-md ">
<view class="label m-b-xs">{{$t('safe.b3')}}</view>
<view class="input color-light">
<view class="input color-dark">
<v-input type="password" v-model="form.password" :placeholder="$t('safe.b4')"></v-input>
</view>
</view>
<view class="form-item border-b p-md">
<view class="label m-b-xs">{{$t('safe.b5')}}</view>
<view class="input color-light">
<view class="input color-dark">
<v-input type="password" v-model="form.password_confirmation" :placeholder="$t('safe.b6')"></v-input>
</view>
</view>
<view class="form-item border-b p-md" v-if="user.phone_status==1">
<view class="label m-b-xs">SMS{{$t('safe.a7')}}</view>
<view class="input color-light">
<view class="input color-dark">
<v-input v-model="form.sms_code" :placeholder="$t('safe.a6')">
<template #right>
<v-code url="/user/getCode" :data="{type:1}" />
@ -26,7 +26,7 @@
</view>
<view class="form-item border-b p-md" v-if="user.email_status==1">
<view class="label m-b-xs">{{$t('safe.a5')}}</view>
<view class="input color-light">
<view class="input color-dark">
<v-input v-model="form.email_code" :placeholder="$t('safe.a6')">
<template #right>
<v-code url="/user/getCode" :data="{type:2}" />
@ -36,12 +36,12 @@
</view>
<view class="form-item border-b p-md" v-if="user.google_status==1">
<view class="label m-b-xs">google{{$t('safe.a7')}}</view>
<view class="input color-light">
<view class="input color-dark">
<v-input v-model="form.google_code" :placeholder="$t('safe.a6')"></v-input>
</view>
</view>
<view class="p-md ">
<v-button block type="blue" class="w-max rounded-md" ref="btn" @click="setPassword">{{$t('safe.b7')}}</v-button>
<v-button block type="yellow2" class="w-max rounded-md" ref="btn" @click="setPassword">{{$t('safe.b7')}}</v-button>
</view>
<!-- <v-button block class="w-max" ref="btn" type="theme"></v-button> -->
</main>

6
pages/service/service.vue

@ -2,12 +2,12 @@
<v-page>
<v-header :title="$t('notice.a0')"></v-header>
<main class="layout-main p-md">
<view class="top p-b-sm border-b">
<view class="title fn-lg fn-center m-b-md color-light">{{detail.title}}</view>
<view class="top p-b-sm border-b" style="background-color: #f5f5f5;">
<view class="title fn-lg fn-center m-b-md color-dark">{{detail.title}}</view>
<!-- <view class="time fn-sm">{{detail.created_at}}</view> -->
<!-- <view class="time fn-sm">{{detail.created_ats | parseTime}}</view> -->
</view>
<view class="edit-content m-t-md" v-html="detail.body"></view>
<view class="edit-content m-t-md" v-html="detail.body" style="color: #666;"></view>
</main>
</v-page>
</template>

19
pages/transfer/index.vue

@ -12,7 +12,7 @@
<view class="top">
<view style="height: var(--status-bar-height)"></view>
</view>
<view class="panel-box m-x-md rounded p-md bg-panel-3 box-shadow">
<view class="panel-box m-x-md rounded p-md bg-F5 box-shadow">
<v-picker
:list="fromList"
v-model="form.from_account"
@ -20,7 +20,7 @@
>
<view class="label fn-sm color-gray-6">{{ $t("transfer.a9") }}</view>
<view class="select d-flex align-center">
<span class="fn-lg color-light">{{
<span class="fn-lg color-dark">{{
accountMap[form.from_account]
}}</span>
<!-- <span class="fn-lg color-light" v-if="tag == 1">
@ -39,7 +39,7 @@
>
<view class="label fn-sm color-gray-6">{{ $t("transfer.b0") }}</view>
<view class="select d-flex align-center">
<span class="fn-lg color-light">{{
<span class="fn-lg color-dark">{{
accountMap[form.to_account]
}}</span>
<!-- <span class="fn-lg color-light" v-if="tag == 1" >
@ -53,10 +53,10 @@
</v-picker>
<view class=""></view>
<view
class="exchange d-flex justify-center align-center bg-panel-3 box-shadow link-active"
class="exchange d-flex justify-center align-center bg-F5 box-shadow link-active"
@click="swap"
>
<van-icon style="transform:rotateZ(90deg)" class="fn-22 color-light" name="exchange" />
<van-icon style="transform:rotateZ(90deg)" class="fn-22 color-dark" name="exchange" />
</view>
</view>
<v-picker
@ -66,16 +66,15 @@
range-value="coin_name"
class=""
>
<view class="m-md p-md d-flex rounded bg-panel-3 box-shadow">
<view class="m-md p-md d-flex rounded bg-F5 box-shadow">
<view class="flex-fill">
{{ $t("transfer.b1") }}
<!--{{ $t("transfer.b5") }}11111111-->
</view>
<view class="color-light">{{ form.coin_name }}</view>
<view class="color-dark">{{ form.coin_name }}</view>
<van-icon class="m-l-xs" name="arrow" />
</view>
</v-picker>
<view class="m-md p-md rounded bg-panel-3 box-shadow">
<view class="m-md p-md rounded bg-F5 box-shadow">
<view class="label fn-sm d-flex justify-between">
<view>{{ $t("transfer.b1") }}</view>
<view class=" fn-sm"
@ -105,7 +104,7 @@
<v-button
class="w-max rounded-md"
block
type="blue"
type="yellow2"
ref="btn"
@click="fundsTransfer"
>{{ $t("common.confirm") }}</v-button

6
store/index.js

@ -39,9 +39,11 @@ function defaultTheme() {
// } else {
// state = `light`;
// }
uni.setStorageSync('theme', 'dark');
// uni.setStorageSync('theme', 'dark');
uni.setStorageSync('theme', 'light');
// uni.setStorageSync('language','zh-CN');
let state = `dark`
// let state = `dark`
let state = `light`
return state;
}

Loading…
Cancel
Save