From b4c4556a5eddf6708ec55b07e3edc15b2217842e Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Wed, 30 Apr 2025 18:35:59 +0800
Subject: [PATCH] 0430号修改

---
 src/page/user/Warehouse/data.list.vue |   66 +++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index ba89be9..e280ed9 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -137,7 +137,7 @@
               </div>
             </div>
           </van-col> -->
-          <!-- <van-col span="8">
+        <!-- <van-col span="8">
             <div style="text-align: center">
               <div class="sport-content-title2">
                 {{ $t("止損價") }} ({{ activeObj.symbolCode }})
@@ -286,6 +286,12 @@
               </div>
             </div>
           </van-col>
+          <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>
+          </van-col>
           <!-- <van-col span="8">
             <div style="text-align: center">
               <div class="sport-content-title2">
@@ -318,8 +324,12 @@
           </van-col>
           <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-title2">{{ $t("hj128") }}</div>
+              <div class="sport-content-text2">
+                {{
+                  $moment(item.sellOrderTime).format("DD-MM-YYYY hh:mm:ss A")
+                }}
+              </div>
             </div>
           </van-col>
         </van-row>
@@ -369,8 +379,8 @@
           {{ item.stockSpell }}
         </div>
         <!-- <van-row> -->
-          <!-- <van-col span="8"> -->
-            <!-- <div style="text-align: left">
+        <!-- <van-col span="8"> -->
+        <!-- <div style="text-align: left">
               <div class="sport-content-title2">
                 {{ $t("盈虧") }} ({{ activeObj.symbolCode }})
               </div>
@@ -384,14 +394,14 @@
               >
                 {{ item.profitAndLose }}
               </div> -->
-            <!-- </div> -->
-          <!-- </van-col> -->
-          <!-- <van-col span="8"> -->
-            <!-- <div style="text-align: center"> -->
-            <!-- <div class="sport-content-title2">
+        <!-- </div> -->
+        <!-- </van-col> -->
+        <!-- <van-col span="8"> -->
+        <!-- <div style="text-align: center"> -->
+        <!-- <div class="sport-content-title2">
                 {{ $t("hj141") }} ({{ activeObj.symbolCode }})
               </div> -->
-            <!-- <div
+        <!-- <div
                 class="sport-content-text2"
                 :style="
                   item.profitAndLoseParent.charAt(0) == '-'
@@ -401,9 +411,9 @@
               >
                 {{ item.profitAndLoseParent }}
               </div> -->
-            <!-- </div> -->
-          <!-- </van-col> -->
-          <!-- <van-col span="8">
+        <!-- </div> -->
+        <!-- </van-col> -->
+        <!-- <van-col span="8">
             <div style="text-align: right">
               <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
               <div class="sport-content-text2">{{ item.orderNum }}</div>
@@ -412,12 +422,12 @@
         <!-- </van-row> -->
         <van-row>
           <van-col span="8">
-             <van-col span="8">
-            <div style="text-align: right">
-              <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
-              <div class="sport-content-text2">{{ item.orderNum }}</div>
-            </div></van-col
-          >
+            <van-col span="8">
+              <div style="text-align: right">
+                <div class="sport-content-title2">{{ $t("倉位(股)") }}</div>
+                <div class="sport-content-text2">{{ item.orderNum }}</div>
+              </div></van-col
+            >
             <!-- <div style="text-align: left"> -->
             <!-- <div class="sport-content-title2">
                 {{ $t("hj40") }}({{ activeObj.symbolCode }})
@@ -433,7 +443,7 @@
                 {{ $t("持倉價") }} ({{ activeObj.symbolCode }})
               </div>
               <div class="sport-content-text2">
-                {{ item.buyOrderPrice }}
+                {{ item.sellOrderPrice || item.buyOrderPrice }}
               </div>
             </div>
           </van-col>
@@ -449,7 +459,7 @@
           </van-col>
         </van-row>
         <!-- <van-row> -->
-          <!-- <van-col span="12">
+        <!-- <van-col span="12">
             <div style="text-align: left">
               <div class="sport-content-title2">
                 {{ $t("hj44") }} ({{ activeObj.symbolCode }})
@@ -469,7 +479,7 @@
               </div>
             </div>
           </van-col> -->
-          <!-- <van-col span="8">
+        <!-- <van-col span="8">
             <div style="text-align: center">
               <div class="sport-content-title2">
                 {{ $t("止損價") }} ({{ activeObj.symbolCode }})
@@ -574,9 +584,9 @@
       pendingShow: false,
       pendingStatus: 1, // 默认选中挂单中
       pendingOptions: [
-        { text: "挂单成功", value: 0 },
-        { text: "挂单中", value: 1 },
-        { text: "撤销", value: 2 }
+        { text: this.$t("挂单成功"), value: 0 },
+        { text: this.$t("挂单中"), value: 1 },
+        { text: this.$t("hj126"), value: 2 }
       ],
       pageNum: 1,
       pageSize: 150,
@@ -683,7 +693,7 @@
         pageNum: 1,
         pageSize: 30
       };
-      if (_laber === "USDT") {
+      if (_laber === "USD") {
         opt.stockCode = "HJYY";
       }
 
@@ -713,7 +723,7 @@
         pageNum: 1,
         pageSize: 30
       };
-      if (_laber === "USDT") {
+      if (_laber === "USD") {
         opt.stockCode = "HJYY";
       }
       const res = await getchicang(opt);

--
Gitblit v1.9.3