Browse Source

修改ico,把币币和合约的logo打开,改变首页布局

master
liaoxinyu 2 years ago
parent
commit
0d1d5dd153
  1. BIN
      src/assets/img/home/btcex.png
  2. BIN
      src/favicon.ico
  3. 14
      src/views/contract/exchange-store.vue
  4. 28
      src/views/contract/index.vue
  5. 2
      src/views/exchange/index.vue
  6. 18
      src/views/exchange/make-deal.vue
  7. 1
      src/views/exchange/symbols.vue
  8. 10
      src/views/home/index.vue
  9. BIN
      static/favicon.ico

BIN
src/assets/img/home/btcex.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
src/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

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

@ -71,6 +71,7 @@
v-model="buyform.entrust_price" v-model="buyform.entrust_price"
class="form-control" class="form-control"
placeholder="" placeholder=""
title=""
/> />
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">USDT</span> <span class="input-group-text">USDT</span>
@ -83,6 +84,7 @@
:value="$t('contract.d9')" :value="$t('contract.d9')"
class="form-control" class="form-control"
:placeholder="$t('contract.d9')" :placeholder="$t('contract.d9')"
title=""
/> />
</template> </template>
</div> </div>
@ -99,6 +101,7 @@
class="form-control" class="form-control"
v-model="marginBuy" v-model="marginBuy"
:placeholder="tips" :placeholder="tips"
title=""
/> />
<!-- <div class="input-group-append"> <!-- <div class="input-group-append">
<span class="input-group-text">{{ $t("contract.e2") }}</span> <span class="input-group-text">{{ $t("contract.e2") }}</span>
@ -153,7 +156,7 @@
</div> </div>
<!-- 止盈止损 --> <!-- 止盈止损 -->
<div class="d-flex mb-4 border-top py-2"> <div class="d-flex mb-4 border-top py-2">
<input type="checkbox" name="" id="" v-model="checkboxBuy"> <input type="checkbox" name="" id="" v-model="checkboxBuy" title="">
<div>{{ $t("contact.Profit&Loss") }}</div> <div>{{ $t("contact.Profit&Loss") }}</div>
</div> </div>
<template v-if="checkboxBuy"> <template v-if="checkboxBuy">
@ -166,6 +169,7 @@
class="form-control" class="form-control"
v-model="buyform.pri1" v-model="buyform.pri1"
:placeholder="tips" :placeholder="tips"
title=""
/> />
</div> </div>
<div class="input-group mb-4 input-group-sm"> <div class="input-group mb-4 input-group-sm">
@ -177,6 +181,7 @@
class="form-control" class="form-control"
v-model="buyform.pri2" v-model="buyform.pri2"
:placeholder="tips" :placeholder="tips"
title=""
/> />
</div> </div>
</template> </template>
@ -194,6 +199,7 @@
v-model="sellform.entrust_price" v-model="sellform.entrust_price"
class="form-control" class="form-control"
placeholder="" placeholder=""
title=""
/> />
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">USDT</span> <span class="input-group-text">USDT</span>
@ -206,6 +212,7 @@
:value="$t('contract.d9')" :value="$t('contract.d9')"
class="form-control" class="form-control"
:placeholder="$t('contract.d9')" :placeholder="$t('contract.d9')"
title=""
/> />
</template> </template>
</div> </div>
@ -222,6 +229,7 @@
class="form-control" class="form-control"
v-model="marginSell" v-model="marginSell"
:placeholder="tips" :placeholder="tips"
title=""
/> />
<!-- <div class="input-group-append"> <!-- <div class="input-group-append">
<span class="input-group-text">{{ $t("contract.e2") }}</span> <span class="input-group-text">{{ $t("contract.e2") }}</span>
@ -265,7 +273,7 @@
</div> </div>
<!-- 止盈止损 --> <!-- 止盈止损 -->
<div class="d-flex mb-4 border-top py-2"> <div class="d-flex mb-4 border-top py-2">
<input type="checkbox" name="" id="" v-model="checkboxSell"> <input type="checkbox" name="" id="" v-model="checkboxSell" title="">
<div>{{ $t("contact.Profit&Loss") }}</div> <div>{{ $t("contact.Profit&Loss") }}</div>
</div> </div>
<template v-if="checkboxSell"> <template v-if="checkboxSell">
@ -278,6 +286,7 @@
class="form-control" class="form-control"
v-model="sellform.pri1" v-model="sellform.pri1"
:placeholder="tips" :placeholder="tips"
title=""
/> />
</div> </div>
<div class="input-group mb-4 input-group-sm"> <div class="input-group mb-4 input-group-sm">
@ -289,6 +298,7 @@
class="form-control" class="form-control"
v-model="sellform.pri2" v-model="sellform.pri2"
:placeholder="tips" :placeholder="tips"
title=""
/> />
</div> </div>
</template> </template>

28
src/views/contract/index.vue

@ -9,7 +9,7 @@
<!-- </div>--> <!-- </div>-->
<div class="d-flex align-items-center" style="background-color: #121212;min-height:58px;"> <div class="d-flex align-items-center" style="background-color: #121212;min-height:58px;">
<div class="price px-3"> <div class="price px-3">
<img :src="currentIcon" alt="" style="width: 26px;height: 26px;" v-if="currentIcon.includes('https://djs.jedcoin.com/storage/')"> <img :src="currentIcon" alt="" style="width: 26px;height: 26px;">
</div> </div>
<div class="price"> <div class="price">
<div class="item fn-16" style="font-weight: bold;">{{ activeContract.pair_name }}</div> <div class="item fn-16" style="font-weight: bold;">{{ activeContract.pair_name }}</div>
@ -64,7 +64,7 @@
</div> </div>
<div class="page-top d-flex pt-2"> <div class="page-top d-flex pt-2">
<!-- 交易对 --> <!-- 交易对 -->
<div style="width: 20%;background-color: #121212;margin-right: 7px;"> <div style="width: 24%;background-color: #121212;margin-right: 7px;">
<div <div
class="coin-change d-flex align-items-center py-2 pl-2 heading justify-content-between" style="border-bottom: 1px solid #2e2e2e;height: 43px;font-size: 16px;" class="coin-change d-flex align-items-center py-2 pl-2 heading justify-content-between" style="border-bottom: 1px solid #2e2e2e;height: 43px;font-size: 16px;"
>{{ $t("contact.market") }} >{{ $t("contact.market") }}
@ -93,8 +93,11 @@
@click="ispopover1(item.symbol)" @click="ispopover1(item.symbol)"
v-show="isShow(item)" v-show="isShow(item)"
> >
<td class="w-9/24 tr-text"> <td class="d-flex">
{{ item.symbol }}/{{ parent.coin_name }} <div v-for="items in Liste" :key="items.symbol">
<img :src="items.icon" width="20" height="20" v-if="items.symbol==item.symbol" />
</div>
<div style="margin-left: 10px;">{{ item.symbol }}/{{ parent.coin_name }}</div>
</td> </td>
<td class="w-7/24 text-right" > <td class="w-7/24 text-right" >
<!-- :class="item.increase < 0 ? 'decreace' : 'increase'" --> <!-- :class="item.increase < 0 ? 'decreace' : 'increase'" -->
@ -135,7 +138,7 @@
@getSymbolDetail="symbolDetail=$event" @getSymbolDetail="symbolDetail=$event"
/> />
</div> </div>
<div style="width: 20%;"> <div style="width: 24%;">
<!-- 盘口 --> <!-- 盘口 -->
<handicap <handicap
@input="newPriceObj = $event" @input="newPriceObj = $event"
@ -240,7 +243,8 @@ export default {
symbolDetail:{}, symbolDetail:{},
currentIcon: '', currentIcon: '',
filterCoin: "", filterCoin: "",
contractListFilter: [] contractListFilter: [],
Liste:[]
}; };
}, },
computed: { computed: {
@ -339,6 +343,7 @@ export default {
this.contractList = data; this.contractList = data;
if(this.filterCoin==''){ if(this.filterCoin==''){
this.contractListFilter = data; this.contractListFilter = data;
this.Listes();
} }
}else if (cmd == "ping") { }else if (cmd == "ping") {
this.ws.send({ this.ws.send({
@ -352,6 +357,16 @@ export default {
this.wsOpen(); this.wsOpen();
}) })
}, },
Listes(){
this.Liste = []
this.contractListFilter[0].marketInfoList.map(item=>{
this.Liste.push({
pair_name: item.pair_name,
symbol: item.symbol,
icon:item.icon
})
})
},
wsOpen(){ wsOpen(){
this.ws.on("open", () => { this.ws.on("open", () => {
this.swapMarketList(); this.swapMarketList();
@ -367,6 +382,7 @@ export default {
this.contractList = res; this.contractList = res;
if(this.filterCoin==''){ if(this.filterCoin==''){
this.contractListFilter = res; this.contractListFilter = res;
this.Listes();
} }
// //

2
src/views/exchange/index.vue

@ -9,7 +9,7 @@
<!-- </div>--> <!-- </div>-->
<div class="d-flex align-items-center" style="background-color: #121212;min-height:58px;"> <div class="d-flex align-items-center" style="background-color: #121212;min-height:58px;">
<div class="price px-3"> <div class="price px-3">
<img :src="currentIcon" alt="" style="width: 26px;height: 26px;" v-if="currentIcon.includes('https://djs.jedcoin.com/storage/')"> <img :src="currentIcon" alt="" style="width: 26px;height: 26px;">
</div> </div>
<div class="price"> <div class="price">
<div class="item fn-16" style="font-weight: bold;">{{ activeContract.pair_name }}</div> <div class="item fn-16" style="font-weight: bold;">{{ activeContract.pair_name }}</div>

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

@ -100,7 +100,7 @@
{{ msgList.buy[0] }} {{ msgList.buy[0] }}
</span> </span>
<div class="input-group" v-if="isCondition" slot="reference"> <div class="input-group" v-if="isCondition" slot="reference">
<input type="number" v-model="buyorder.trigger_price" class="form-control" :placeholder="$t('exchange.trigger-price')"> <input type="number" v-model="buyorder.trigger_price" class="form-control" :placeholder="$t('exchange.trigger-price')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.from}}</span> <span class="input-group-text">{{pair.from}}</span>
</div> </div>
@ -110,7 +110,7 @@
<template v-if="isMarket"> <template v-if="isMarket">
<div class="input-group"> <div class="input-group">
<!-- Market Price --> <!-- Market Price -->
<input type="text" class="form-control" disabled :placeholder="$t('exchange.at-best-price')"> <input type="text" class="form-control" disabled :placeholder="$t('exchange.at-best-price')" title="">
</div> </div>
</template> </template>
<template v-else> <template v-else>
@ -121,7 +121,7 @@
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<!-- Entrust Price --> <!-- Entrust Price -->
<input type="number" v-model="buyorder.entrust_price" class="form-control" :placeholder="$t('exchange.enter-price')"> <input type="number" v-model="buyorder.entrust_price" class="form-control" :placeholder="$t('exchange.enter-price')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.from}}</span> <span class="input-group-text">{{pair.from}}</span>
</div> </div>
@ -137,7 +137,7 @@
{{ msgList.buy[3] }} {{ msgList.buy[3] }}
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<input type="number" v-model="buyTotal" class="form-control" min=0 :placeholder="$t('exchange.enter-total')"> <input type="number" v-model="buyTotal" class="form-control" min=0 :placeholder="$t('exchange.enter-total')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.from}}</span> <span class="input-group-text">{{pair.from}}</span>
</div> </div>
@ -154,7 +154,7 @@
{{ msgList.buy[2] }} {{ msgList.buy[2] }}
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<input type="number" v-model="buyorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')"> <input type="number" v-model="buyorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.to}}</span> <span class="input-group-text">{{pair.to}}</span>
</div> </div>
@ -213,7 +213,7 @@
</span> </span>
<!-- Trigger Price --> <!-- Trigger Price -->
<div class="input-group" v-if="isCondition" slot="reference"> <div class="input-group" v-if="isCondition" slot="reference">
<input type="number" v-model="sellorder.trigger_price" class="form-control" min=0 :placeholder="$t('exchange.trigger-price')"> <input type="number" v-model="sellorder.trigger_price" class="form-control" min=0 :placeholder="$t('exchange.trigger-price')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.from}}</span> <span class="input-group-text">{{pair.from}}</span>
</div> </div>
@ -223,7 +223,7 @@
<template v-if="isMarket"> <template v-if="isMarket">
<div class="input-group"> <div class="input-group">
<!-- Market Price --> <!-- Market Price -->
<input type="text" class="form-control" disabled :placeholder="$t('exchange.at-best-price')"> <input type="text" class="form-control" disabled :placeholder="$t('exchange.at-best-price')" title="">
</div> </div>
</template> </template>
<template v-else> <template v-else>
@ -234,7 +234,7 @@
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<!-- Entrust Price --> <!-- Entrust Price -->
<input type="number" v-model="sellorder.entrust_price" class="form-control" min=0 :placeholder="$t('exchange.enter-price')"> <input type="number" v-model="sellorder.entrust_price" class="form-control" min=0 :placeholder="$t('exchange.enter-price')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.from}}</span> <span class="input-group-text">{{pair.from}}</span>
</div> </div>
@ -249,7 +249,7 @@
{{ msgList.sell[2] }} {{ msgList.sell[2] }}
</span> </span>
<div class="input-group" slot="reference"> <div class="input-group" slot="reference">
<input type="number" v-model="sellorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')"> <input type="number" v-model="sellorder.amount" class="form-control" min=0 :placeholder="$t('exchange.enter-amount')" title="">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">{{pair.to}}</span> <span class="input-group-text">{{pair.to}}</span>
</div> </div>

1
src/views/exchange/symbols.vue

@ -51,6 +51,7 @@
<tr style="display:block" :class="{highlight : item.pair_id == marketId}" @click="$emit('update:symbol', item.symbol)" v-for="(item, key) in coin.marketInfoList" :key="key" v-show="isShow(item)"> <tr style="display:block" :class="{highlight : item.pair_id == marketId}" @click="$emit('update:symbol', item.symbol)" v-for="(item, key) in coin.marketInfoList" :key="key" v-show="isShow(item)">
<td class="w-33" style="white-space:nowrap"> <td class="w-33" style="white-space:nowrap">
<i class="icon ion-md-star h6" :class="{ active: isCoolect(item) }" @click.self="handleFav(item)"></i> <i class="icon ion-md-star h6" :class="{ active: isCoolect(item) }" @click.self="handleFav(item)"></i>
<img :src="item.coin_icon" width="20" style="margin: 0px 5px;"/>
{{ coin.coin_name == 'fav' ? item.pair_name : item.coin_name + '/' + coin.coin_name}} {{ coin.coin_name == 'fav' ? item.pair_name : item.coin_name + '/' + coin.coin_name}}
</td> </td>
<td class="w-33 text-right"> <td class="w-33 text-right">

10
src/views/home/index.vue

@ -436,8 +436,8 @@
<div class="title2" style="color: #fff;">{{ $t("homeNewText.bb24") }}</div> <div class="title2" style="color: #fff;">{{ $t("homeNewText.bb24") }}</div>
<div class="Crossbar" style="margin: 10px auto 0px;"></div> <div class="Crossbar" style="margin: 10px auto 0px;"></div>
<div class="positionBox d-flex" style="justify-content: space-between;height: 600px;"> <div class="positionBox d-flex" style="justify-content: space-between;height: 600px;">
<div style="width: 480px;margin-top: 100px;"> <div style="width: 480px;margin-top: 90px;">
<div class="trade_box"><img src="" /></div> <div class="trade_box"><img src="@/assets/img/home/btcex.png" /></div>
<div style="font-size: 36px;margin-bottom: 30px;">{{ $t("homeNewText.bb25",{name:'BTCEX'}) }}</div> <div style="font-size: 36px;margin-bottom: 30px;">{{ $t("homeNewText.bb25",{name:'BTCEX'}) }}</div>
<div style="font-size: 24px;margin-bottom: 20px;">{{ $t("homeNewText.bb26") }}</div> <div style="font-size: 24px;margin-bottom: 20px;">{{ $t("homeNewText.bb26") }}</div>
<div style="color: #9292AA;font-size: 20px;">{{ $t("homeNewText.bb27") }}</div> <div style="color: #9292AA;font-size: 20px;">{{ $t("homeNewText.bb27") }}</div>
@ -2119,9 +2119,9 @@
.trade_box { .trade_box {
display: flex; display: flex;
width: 300px; width: 280px;
height: 50px; // height: 100px;
background-color: #fff; // background-color: #fff;
// padding: 10px; // padding: 10px;
align-items: center; align-items: center;
// border-radius: 10px; // border-radius: 10px;

BIN
static/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Loading…
Cancel
Save