From 6a4dd5834e85c2156b431752d93da487eb9e4a0f Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 03 Sep 2024 21:51:31 +0800
Subject: [PATCH] no message
---
.env.development | 1
src/page/quotes.vue | 17 +++++++-
src/page/trade/index.vue | 2
src/page/transfer.vue | 3 +
src/components/perpetual-open/index.vue | 5 ++
src/i18n/index.js | 2
src/page/home.vue | 20 +++++++++
src/API/trade.api.js | 15 +++++++
src/page/TtrendDetails/index.vue | 2
src/page/language/index.vue | 4 +-
src/components/trade-head/index.vue | 23 ++++++++++-
src/page/perpetualContract/perpetualHistory.vue | 23 -----------
12 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/.env.development b/.env.development
index 8f05c62..5b99004 100644
--- a/.env.development
+++ b/.env.development
@@ -8,6 +8,7 @@
VUE_APP_SECRET="WOrldcoinfeyfy343y831r63rt23hFGegfg32fewrgerg"
# VUE_APP_API_BASE_URL=bingx.zqbom.com
VUE_APP_API_BASE_URL=dapp.aorbital7.com
+# VUE_APP_API_BASE_URL=csjys.gayssad.com
# VUE_APP_API_BASE_URL=app.usdtone.com
# VUE_APP_API_BASE_URL=192.168.0.105:8080
\ No newline at end of file
diff --git a/src/API/trade.api.js b/src/API/trade.api.js
index d29c51f..c19d470 100644
--- a/src/API/trade.api.js
+++ b/src/API/trade.api.js
@@ -42,6 +42,21 @@
if(symbol=='orbital'){
symbol = 'mother'
}
+ if(symbol=='zyd'){
+ symbol = 'zkp'
+ }
+ if(symbol=='dea'){
+ symbol = 'dia'
+ }
+ if(symbol=='axfd'){
+ symbol = 'xeta'
+ }
+ if(symbol=='smk'){
+ symbol = 'og'
+ }
+ if(symbol=='fpp'){
+ symbol = 'fil'
+ }
return request({
url: "/api/contractApplyOrder!openview.action",
method: "GET",
diff --git a/src/components/perpetual-open/index.vue b/src/components/perpetual-open/index.vue
index d09b07b..964b8e0 100644
--- a/src/components/perpetual-open/index.vue
+++ b/src/components/perpetual-open/index.vue
@@ -65,6 +65,11 @@
<div class="text-right items-end justify-end">
<div class="">{{ $t("数量") }}</div>
<div class="mt-4" v-if="symbol=='MOTHER'">(ORBITAL)</div>
+ <div class="mt-4" v-else-if="symbol=='ZKP'">(ZYD)</div>
+ <div class="mt-4" v-else-if="symbol=='DEA'">(DIA)</div>
+ <div class="mt-4" v-else-if="symbol=='AXFD'">(XETA)</div>
+ <div class="mt-4" v-else-if="symbol=='SMK'">(OG)</div>
+ <div class="mt-4" v-else-if="symbol=='FPP'">(FIL)</div>
<div class="mt-4" v-else>({{ symbol | _symbolName() }})</div>
</div>
</div>
diff --git a/src/components/trade-head/index.vue b/src/components/trade-head/index.vue
index 7e30a85..769fdb4 100644
--- a/src/components/trade-head/index.vue
+++ b/src/components/trade-head/index.vue
@@ -30,10 +30,27 @@
@click="onSidebar"
/> -->
<div class="flex flex-col pl-21" @click="onSidebar">
- <div class="font-35 textColor">
- <!-- {{ symbol | _symbolName(1) }} -->
- {{symbol=='mother'?'ORBITAL':symbol}}
+ <div class="font-35 textColor" v-if="symbol=='mother'">
+ ORBITAL
</div>
+ <div class="font-35 textColor" v-else-if="symbol=='zkp'">
+ ZYD
+ </div>
+ <div class="font-35 textColor" v-else-if="symbol=='dia'">
+ DEA
+ </div>
+ <div class="font-35 textColor" v-else-if="symbol=='xeta'">
+ AXFD
+ </div>
+ <div class="font-35 textColor" v-else-if="symbol=='og'">
+ SMK
+ </div>
+ <div class="font-35 textColor" v-else-if="symbol=='fil'">
+ FPP
+ </div>
+ <div class="font-35 textColor" v-else>
+ {{symbol.toUpperCase()}}
+ </div>
</div>
<div
v-if="range"
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 8fdc0c2..55892a3 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -27,7 +27,7 @@
Vue.use(VueI18n);
// 获取当前语言（初始化时localStorage里没有存语言，默认为浏览器当前的语言）
-const lang = getStorage("lang") || "en";
+const lang = getStorage("lang") || "zh-CN";
//const lang = 'zh-CN'
// 组合element ui 和 项目自身的文案文件
diff --git a/src/page/TtrendDetails/index.vue b/src/page/TtrendDetails/index.vue
index 92b6670..86972a2 100644
--- a/src/page/TtrendDetails/index.vue
+++ b/src/page/TtrendDetails/index.vue
@@ -16,7 +16,7 @@
<trade-head
@openRecord="openRecord"
:backFunc="() => $router.push('/')"
- :symbol="symbol=='mother'?'ORBITAL':symbol.toUpperCase()"
+ :symbol="symbol=='mother'?'ORBITAL':(symbol=='zkp'?'ZYD':(symbol=='dia'?'DEA':(symbol=='xeta'?'AXFD':(symbol=='og'?'SMK':(symbol=='fil'?'FPP':symbol.toUpperCase())))))"
:islevel="true"
@update-coin="onUpdate"
@data="quote = $event"
diff --git a/src/page/home.vue b/src/page/home.vue
index ce5a9d7..53cf40f 100644
--- a/src/page/home.vue
+++ b/src/page/home.vue
@@ -190,8 +190,26 @@
// const mainArray = this.coinArr.filter(
// (item) => !this.newcoinArr.includes(item)
// );
+
+
const coins = this.coinList.map((item) => item.symbol);
- const mainArray = coins.filter((item) => !this.newcoinArr.includes(item));
+
+ const prioritize = ['btc', 'eth']; // 需要优先排序的币种
+
+ // 按照优先级对 coins 数组进行排序
+ const sortedCoins = coins.sort((a, b) => {
+ const aIndex = prioritize.indexOf(a);
+ const bIndex = prioritize.indexOf(b);
+
+ if (aIndex === -1 && bIndex === -1) return 0; // 两者都不在优先级列表中，不做排序
+ if (aIndex === -1) return 1; // b 在优先级列表中，a 不在，b 排在前面
+ if (bIndex === -1) return -1; // a 在优先级列表中，b 不在，a 排在前面
+ return aIndex - bIndex; // 根据优先级排序
+ });
+
+
+ const mainArray = sortedCoins.filter((item) => !this.newcoinArr.includes(item));
+ console.log(mainArray);
const list = await _getHomeList(mainArray.join(",")).catch(() => {
this.timeout = setTimeout(() => {
this.fetchQList();
diff --git a/src/page/language/index.vue b/src/page/language/index.vue
index bfdca2a..4cf71d3 100644
--- a/src/page/language/index.vue
+++ b/src/page/language/index.vue
@@ -30,11 +30,11 @@
// { title: 'عرب', key: 'ar', image: require('../../assets/image/lang/alb.png') }, //阿拉伯语
{ title: 'Tiếng Việt', key: 'vi', image: require('../../assets/image/lang/vi.png') },//越南语
{ title: 'Italiano', key: 'it', image: require('../../assets/image/lang/Italy.png') }, //意大利语
- // { title: '繁体中文', key: 'zh-TW', image: require('../../assets/image/lang/hongkong.png') },
+ { title: '繁体中文', key: 'zh-TW', image: require('../../assets/image/lang/hongkong.png') },
{ title: 'Nederlands', key: 'af', image: require('../../assets/image/lang/af.png') },//荷兰
{ title: 'España', key: 'es', image: require('../../assets/image/lang/es.png') },//西班牙
{ title: 'Sverige', key: 'sv', image: require('../../assets/image/lang/sv.png') },//瑞典
- // { title: '简体中文', key: 'zh-CN', image: require('../../assets/image/lang/zh-CN.png') },
+ { title: '简体中文', key: 'zh-CN', image: require('../../assets/image/lang/zh-CN.png') },
]
}
},
diff --git a/src/page/perpetualContract/perpetualHistory.vue b/src/page/perpetualContract/perpetualHistory.vue
index 1e1859c..f285625 100644
--- a/src/page/perpetualContract/perpetualHistory.vue
+++ b/src/page/perpetualContract/perpetualHistory.vue
@@ -28,28 +28,7 @@
:key="item.title"
:name="item.type"
>
- <!-- <div class="all-select flex justify-end"> -->
- <!-- <div class="select-box flex" @click.stop="isAll = !isAll">
- <div class="flex-1 font-24" v-if="symbol=='love'">ORBITAL/USDT</div>
- <div class="flex-1 font-24" v-else>{{ symbol.toUpperCase() }}/USDT</div>
- <van-icon name="arrow-down" />
- <div class="select-data" v-if="isAll">
- <div
- class="select-item font-24"
- @click.stop="selectItem(item2)"
- v-for="(item2, index) in currencyList"
- :key="index"
- >
- <div v-if="item2.symbol=='love'">
- ORBITAL/USDT
- </div>
- <div v-else>
- {{ item2.symbol.toUpperCase() }}/USDT
- </div>
- </div>
- </div>
- </div> -->
- <!-- </div> -->
+
<template v-if="type === 'orders'">
<van-list
v-model="loading"
diff --git a/src/page/quotes.vue b/src/page/quotes.vue
index 59295f1..fd99514 100644
--- a/src/page/quotes.vue
+++ b/src/page/quotes.vue
@@ -152,8 +152,21 @@
if (!this.coinList.length) {
await this.SET_COIN_LIST();
}
- const coins = this.coinList.map((item) => item.symbol);
- const mainArray = coins.filter((item) => !this.newcoinArr.includes(item));
+ const coins = this.coinList.map((item) => item.symbol);
+
+ const prioritize = ['btc', 'eth']; // 需要优先排序的币种
+
+ // 按照优先级对 coins 数组进行排序
+ const sortedCoins = coins.sort((a, b) => {
+ const aIndex = prioritize.indexOf(a);
+ const bIndex = prioritize.indexOf(b);
+
+ if (aIndex === -1 && bIndex === -1) return 0; // 两者都不在优先级列表中，不做排序
+ if (aIndex === -1) return 1; // b 在优先级列表中，a 不在，b 排在前面
+ if (bIndex === -1) return -1; // a 在优先级列表中，b 不在，a 排在前面
+ return aIndex - bIndex; // 根据优先级排序
+ });
+ const mainArray = sortedCoins.filter((item) => !this.newcoinArr.includes(item));
const data = await _getHomeList(mainArray.join(","));
this.tabList[0]["data"] = data.filter((item) =>
this.myList.includes(item.symbol)
diff --git a/src/page/trade/index.vue b/src/page/trade/index.vue
index 5e817b1..61edc7e 100644
--- a/src/page/trade/index.vue
+++ b/src/page/trade/index.vue
@@ -382,7 +382,7 @@
if(e==0){
this.initParama(this.symbol)
}else{
- this.symbol = 'wld'
+ // this.symbol = 'wld'
this.initParam(this.symbol)
}
this.$forceUpdate()
diff --git a/src/page/transfer.vue b/src/page/transfer.vue
index 10b7a4b..c037157 100644
--- a/src/page/transfer.vue
+++ b/src/page/transfer.vue
@@ -30,7 +30,7 @@
</div>
</div>
<div style="width: 100%;">
- <input v-model="amount" :placeholder="$t('请输入数量')" type="number" style="width: 83%;" class="h-100 border-none inputBackground textColor mt-20 pl-20 ml-23"
+ <input v-model="amount" :placeholder="$t('请输入数量')" type="number" style="width: 83%;" class="h-100 border-none inputBackground textColor mt-20 pl-20 ml-23"
@input="onInput" :disabled="disabled" />
<span @click="clickall">{{$t('全部')}}</span>
</div>
@@ -125,6 +125,7 @@
},
onInput(e){
console.log(e);
+ this.amount = this.amount.replace(/[^0-9]/g, '');
},
async clicktype(e){
this.typeindex = e
--
Gitblit v1.9.3