From 4d1142f68ab46428939b6d16913b98cad406f082 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Sun, 07 Apr 2024 18:25:48 +0800
Subject: [PATCH] ne1

---
 src/page/user/Warehouse/data.list.vue |   57 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 83176cb..6e4eb0d 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -34,17 +34,22 @@
         <van-row>
           <van-col span="8">
             <div style="text-align: left">
-              <div class="sport-content-title2">{{ $t("盈虧") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text" style="color: #d04b64">
                 {{ item.profitAndLose }}
               </div>
             </div>
-            </van-col
-          >
+          </van-col>
           <van-col span="8">
             <div style="text-align: center">
-              <div class="sport-content-title2">{{ $t("hj141") }} (USD)</div>
-              <div class="sport-content-text2">{{ item.profitAndLoseParent }}</div>
+              <div class="sport-content-title2">
+                {{ $t("hj141") }} ({{ activeObj.symbolCode }})
+              </div>
+              <div class="sport-content-text2">
+                {{ item.profitAndLoseParent }}
+              </div>
             </div>
           </van-col>
           <van-col span="8">
@@ -57,19 +62,25 @@
         <van-row>
           <van-col span="8">
             <div style="text-align: left">
-              <div class="sport-content-title2">{{ $t("hj40") }}(USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("hj40") }}({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">{{ item.now_price }}</div>
             </div>
           </van-col>
           <van-col span="8">
             <div style="text-align: center">
-              <div class="sport-content-title2">{{ $t("持倉價") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("持倉價") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">{{ item.buyOrderPrice }}</div>
             </div>
           </van-col>
           <van-col span="8">
             <div style="text-align: right">
-              <div class="sport-content-title2">{{ $t("訂單金額") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("訂單金額") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">{{ item.orderTotalPrice }}</div>
             </div>
           </van-col>
@@ -78,14 +89,16 @@
           <van-col span="8">
             <div style="text-align: left">
               <div class="sport-content-title2">
-                {{ $t("開倉手續費") }} (USD)
+                {{ $t("開倉手續費") }} ({{ activeObj.symbolCode }})
               </div>
               <div class="sport-content-text2">{{ item.orderFee }}</div>
             </div>
           </van-col>
           <van-col span="8">
             <div style="text-align: center">
-              <div class="sport-content-title2">{{ $t("止損價") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("止損價") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">
                 -{{ item.profitTargetPrice || "--" }}
               </div>
@@ -93,7 +106,9 @@
           </van-col>
           <van-col span="8">
             <div style="text-align: right">
-              <div class="sport-content-title2">{{ $t("止盈價") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("止盈價") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">
                 -{{ item.stopTargetPrice || "--" }}
               </div>
@@ -112,7 +127,7 @@
           <van-col span="12">
             <div style="text-align: right">
               <div class="sport-content-title2">{{ $t("訂單編號") }}</div>
-              <div class="sport-content-text2">-{{ item.buyOrderId }}</div>
+              <div class="sport-content-text2">{{ item.buyOrderId }}</div>
             </div>
           </van-col>
         </van-row>
@@ -168,7 +183,7 @@
   data() {
     return {
       pageNum: 1,
-      pageSize: 15,
+      pageSize: 150,
       loading: true,
       finished: false,
       closeSell: {},
@@ -188,11 +203,11 @@
       ],
     };
   },
+
   methods: {
     onLoad() {
       this.pageNum++;
       this.loading = true;
-      this.getList();
     },
     async confirm() {
       const res = await sell({
@@ -204,12 +219,13 @@
         this.pageNum = 1;
         this.finished = false;
         this.getList();
+        this.$emit("closingPosition");
       } else {
         Notify({ type: "danger", message: res.msg });
       }
     },
+    // 获取仓位列表
     async getList(laber) {
-      console.log(laber);
       if (laber) {
         this.dataList = [];
         this.pageNum = 1;
@@ -221,15 +237,12 @@
         pageNum: this.pageNum,
         pageSize: this.pageSize,
       });
-      if (res.data.total <= this.dataList.length) {
-        this.finished = true;
-      }
+
       this.loading = false;
       if (res.status === 0) {
-        if (this.pageNum !== 1) {
-          this.dataList = [...this.dataList, ...res.data.list];
-        } else {
-          this.dataList = res.data.list;
+        this.dataList = res.data.list;
+        if (res.data.total <= this.dataList.length) {
+          this.finished = true;
         }
       } else {
         this.loading = false;

--
Gitblit v1.9.3