From a487c52e77e22054dd007f58e605d87f680e434d Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 06 Aug 2024 15:29:17 +0800
Subject: [PATCH] 修改:划转 新增 强平价

---
 src/page/assetsCenter/index.vue                  |   78 ++++++++++++++++++++++----------------
 .gitignore                                       |    1 
 src/page/transfer.vue                            |    6 ++
 src/components/perpetual-position-list/index.vue |    4 ++
 src/page/language/index.vue                      |    4 +-
 5 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 541a820..6f5339c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 *.ntvs*
 *.njsproj
 *.sln
+*.rar
diff --git a/src/components/perpetual-position-list/index.vue b/src/components/perpetual-position-list/index.vue
index 70cd633..0557e2c 100644
--- a/src/components/perpetual-position-list/index.vue
+++ b/src/components/perpetual-position-list/index.vue
@@ -39,6 +39,10 @@
 				        $t('设置') }}{{
 				        $t('止盈') }}{{$t('止损') }}</button>
 				</div> -->
+				<div class="flex-1">
+				    <div class="text-grey">{{ $t('强平价格') }}</div>
+				    <div class="mt-20" :class="[isStyle ? 'textColor1 ' : 'textColor']">{{ item.qiangPing}}</div>
+				</div>
                 <div>
                     <div class="text-grey">ROE</div>
                     <div class="mt-20" :class="item.change_ratio / 1 > 0 ? 'text-green' : 'text-red'">{{ item.change_ratio
diff --git a/src/page/assetsCenter/index.vue b/src/page/assetsCenter/index.vue
index d18ff90..548338e 100644
--- a/src/page/assetsCenter/index.vue
+++ b/src/page/assetsCenter/index.vue
@@ -30,16 +30,26 @@
           }}{{fomtdata.totalMoney}}
 		</div>
       </van-row>
-      <van-row gutter="20" class="but-box">
+      <van-row gutter="20" class="but-box" v-if="typeindex == 0">
         <van-col
           span="8"
-          v-for="item in tabList1"
+          v-for="item in tabList2"
           :key="item.id"
           @click="routerList(item)"
         >
-          <div class="but">{{ item.text }}</div>
+          <div class="but" >{{ item.text }}</div>
         </van-col>
       </van-row>
+	  <van-row gutter="20" class="but-box" v-if="typeindex == 1">
+	    <van-col
+	      span="8"
+	      v-for="item in tabList1"
+	      :key="item.id"
+	      @click="routerList(item)"
+	    >
+	      <div class="but" >{{ item.text }}</div>
+	    </van-col>
+	  </van-row>
     </header>
     <div class="tabs" v-if="typeindex==0">
       <div class="tabs-box">
@@ -212,6 +222,37 @@
       loading: true,
       active: 1,
 	  typeindex:0,
+	  tabList2: [
+	    {
+	      id: 4,
+	      text: this.$t("闪兑"),
+	      route: "/exchange/exchangePage",
+	    },
+	    {
+	      id: 5,
+	      text: this.$t("货币理财"),
+	      route: "/financialHistory",
+	      query: {
+	        type: 0,
+	      },
+	    },
+	    {
+	      id: 6,
+	      text: this.$t("矿池理财"),
+	      route: "/financialHistory",
+	      query: {
+	        type: 1,
+	      },
+	    },
+	  		{
+	  		  id: 7,
+	  		  text: this.$t("划转"),
+	  		  route: "/transfer",
+	  		  // query: {
+	  		  //   type: 1,
+	  		  // },
+	  		},
+	  ],
       tabList1: [
         {
           id: 1,
@@ -223,36 +264,7 @@
           id: 2,
           text: this.$t("提币"),
           route: "/withdraw/withdrawPage",
-        },
-        {
-          id: 4,
-          text: this.$t("闪兑"),
-          route: "/exchange/exchangePage",
-        },
-        {
-          id: 5,
-          text: this.$t("货币理财"),
-          route: "/financialHistory",
-          query: {
-            type: 0,
-          },
-        },
-        {
-          id: 6,
-          text: this.$t("矿池理财"),
-          route: "/financialHistory",
-          query: {
-            type: 1,
-          },
-        },
-		{
-		  id: 6,
-		  text: this.$t("划转"),
-		  route: "/transfer",
-		  query: {
-		    type: 1,
-		  },
-		},
+        }
       ],
       tabList: [
         { id: 1, text: this.$t("现货") },
diff --git a/src/page/language/index.vue b/src/page/language/index.vue
index 9372dc2..2e46a18 100644
--- a/src/page/language/index.vue
+++ b/src/page/language/index.vue
@@ -21,7 +21,7 @@
     return {
       lang: [
 		  { title: 'English', key: 'en', image: require('../../assets/image/lang/en-US.png') },//英语
-        { title: '한국인', key: 'ko', image: require('../../assets/image/lang/Korean.png') },//韩语
+        // { title: '한국인', key: 'ko', image: require('../../assets/image/lang/Korean.png') },//韩语
         { title: 'Deutsch', key: 'de', image: require('../../assets/image/lang/de.png') }, //德语
         { title: 'Français', key: 'fr', image: require('../../assets/image/lang/French.png') }, //法语
         { title: 'やまと', key: 'ja', image: require('../../assets/image/lang/Japanese.png') }, //日语
@@ -31,7 +31,7 @@
         { 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-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/transfer.vue b/src/page/transfer.vue
index 5a234bb..8336f96 100644
--- a/src/page/transfer.vue
+++ b/src/page/transfer.vue
@@ -30,8 +30,9 @@
 				</div>
 			</div>
 			<div style="width: 100%;">
-				<input v-model="amount" :placeholder="$t('请输入数量')"  type="number" style="width: 92%;" 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>
 			<div class="pages_bot_tps">
 				{{$t('可用数量')}}:{{usdcMoney}} {{bzlist[typeindex]}}
@@ -93,6 +94,9 @@
 			this.getwallet()
 		},
 		methods: {
+			clickall(){
+				this.amount=this.usdcMoney
+			},
 			async onSwitch(){
 				var a = this.toptitle
 				var b = this.buttitle

--
Gitblit v1.9.3