From b8f6f514b675fa6a006dfafbc99303b3c5c8ba85 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Fri, 17 May 2024 10:52:12 +0800
Subject: [PATCH] 一鍵平倉增加英文多语言,IFSC改成Select recharge account

---
 src/page/list/tradingList/data.list.vue |   72 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index 8bce7d2..9512c5d 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -2,21 +2,31 @@
   <div class="list-data">
     <div class="header-box">
       <van-row type="flex" align="center" gutter="20">
-        <van-col span="8">
+        <van-col span="12">
           <div>
             {{ $t("hj313") }}
-          </div></van-col
-        >
-        <van-col span="10"
-          ><div style="text-align: right">
+          </div>
+        </van-col>
+        <van-col span="3" v-if="active == 'IN'">
+          <div>
+            {{ $t("hj62") }}
+          </div>
+        </van-col>
+        <van-col span="3" v-if="active == 'IN'">
+          <div style="text-align: right">
             {{ $t("hj314") }}
-          </div></van-col
-        >
+          </div>
+        </van-col>
+        <van-col span="6" v-else>
+          <div style="text-align: right">
+            {{ $t("hj314") }}
+          </div>
+        </van-col>
         <van-col span="6">
           <div style="text-align: right">
             {{ $t("hj315") }}
-          </div></van-col
-        >
+          </div>
+        </van-col>
       </van-row>
     </div>
 
@@ -24,6 +34,7 @@
       style="margin-bottom: 50px"
       v-model="loadings"
       :finished="finished"
+      :loading-text="$t('hj430')"
       :finished-text="$t('hj43')"
       @load="onLoads"
       :immediate-check="false"
@@ -35,7 +46,7 @@
         :key="item.indexCode"
       >
         <van-row type="flex" align="center" gutter="20">
-          <van-col span="8">
+          <van-col span="12">
             <div>
               <div class="tp">
                 <span class="collection" @click="optionszx(item)">
@@ -61,8 +72,24 @@
               </div>
             </div></van-col
           >
-
-          <van-col span="10">
+          <van-col span="3" v-if="active == 'IN'">
+            <div style="text-align: right">
+              <div class="tp">
+                <span class="price_color">{{ item.gid }}</span>
+              </div>
+            </div>
+          </van-col>
+          <van-col span="3"  v-if="active == 'IN'">
+            <div style="text-align: right">
+              <div class="tp">
+                <span class="price_color">{{ item.nowPrice }}</span>
+              </div>
+              <div class="bt">
+                <span>{{ item.addTime }}</span>
+              </div>
+            </div>
+          </van-col>
+          <van-col span="6"  v-else>
             <div style="text-align: right">
               <div class="tp">
                 <span class="price_color">{{ item.nowPrice }}</span>
@@ -120,6 +147,7 @@
       this.listArr = [];
       this.pageNumVal = 1;
       this.loadings = true;
+      this.getStock(e, this.zxactive, 1);
     },
     zxactive(e) {
       this.finished = false;
@@ -219,15 +247,23 @@
         data = await api.positionzx(opt);
       }
 
-      this.loadings = false;
       if (data.status === 0) {
-        // if (data.data.list.length < 15) {
-        this.finished = true;
-        // }
         if (pageNumVal !== 1) {
           this.listArr = [...this.listArr, ...data.data.list];
         } else {
-          this.listArr = data.data.list;
+          if (this.active) {
+            if (this.active === data.data.stockType) {
+              this.listArr = data.data.list;
+              this.loadings = false;
+              this.finished = true;
+            }
+          } else {
+            if (this.zxactive === data.data.stockType) {
+              this.listArr = data.data.list;
+              this.loadings = false;
+              this.finished = true;
+            }
+          }
         }
       } else {
         this.finished = true;
@@ -309,4 +345,4 @@
   text-align: left;
   color: #14181f;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3