From 44db498cedee7573d090797b1fe5c331c413b00a Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Mon, 22 Apr 2024 19:03:57 +0800
Subject: [PATCH] first

---
 src/page/user/Warehouse/data.list.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index 2625a9f..73502c1 100644
--- a/src/page/user/Warehouse/data.list.vue
+++ b/src/page/user/Warehouse/data.list.vue
@@ -14,6 +14,7 @@
       v-model="loading"
       :finished="finished"
       :finished-text="$t('hj43')"
+      :loading-text="$t('hj430')"
       @load="onLoad"
     >
       <div
@@ -21,8 +22,9 @@
         :style="actives === 1 ? 'height:5.52rem' : 'height:7.52rem'"
         v-for="(item, index) in dataList"
         :key="index"
+        @click="$router.push(`/Stockdetail?codes=${item.positionSn}`)"
       >
-        <div @click="pushRouter(item)">
+        <div @click.stop="pushRouter(item)">
           <div class="title-box">
             <div class="span">{{ item.stockName }}</div>
             <div
@@ -32,8 +34,9 @@
               {{ $t(item.orderDirection) }}
             </div>
           </div>
-          {{ item.stockCode }}
+          {{ item.stockSpell }}
         </div>
+        <!-- <div @click="$router.push('/Stockdetail')"></div> -->
         <van-row>
           <van-col span="8">
             <div style="text-align: left">
@@ -92,7 +95,7 @@
           <van-col span="8">
             <div style="text-align: left">
               <div class="sport-content-title2">
-                {{ $t("開倉手續費") }} ({{ activeObj.symbolCode }})
+                {{ $t("hj44") }} ({{ activeObj.symbolCode }})
               </div>
               <div class="sport-content-text2">{{ item.orderFee }}</div>
             </div>
@@ -123,7 +126,7 @@
             <div style="text-align: left">
               <div class="sport-content-title2">{{ $t("持倉時間") }}</div>
               <div class="sport-content-text2">
-                {{ $moment(item.buyOrderTime).format("YYYY-MM-DD HH:mm:ss") }}
+                {{ $moment(item.buyOrderTime).format("DD-MM-YYYY hh:mm:ss A") }}
               </div>
             </div>
           </van-col>
@@ -135,8 +138,8 @@
           </van-col>
         </van-row>
 
-        <div class="but-box" v-if="actives === 0">
-          <div class="but" @click="close(item)">{{ $t("平仓") }}</div>
+        <div class="but-box" v-if="actives === 0" @click.stop="close(item)">
+          <div class="but">{{ $t("平仓") }}</div>
           <!-- <div class="but buts">止盈止损</div> -->
         </div>
       </div>
@@ -183,6 +186,9 @@
       default: {},
     },
   },
+  mounted() {
+    this.getList();
+  },
   data() {
     return {
       pageNum: 1,

--
Gitblit v1.9.3