From 289948f53b5e0b00a656d60c08efbff0eb05fa90 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Thu, 16 May 2024 15:37:05 +0800
Subject: [PATCH] 提款更改

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

diff --git a/src/page/user/Warehouse/data.list.vue b/src/page/user/Warehouse/data.list.vue
index ccab3fc..767bec1 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,20 +22,27 @@
         :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 class="title-box">
-          <div class="span">{{ item.stockName }}</div>
-          <div
-            class="states"
-            :class="item.orderDirection === '买跌' ? 'states-red' : ''"
-          >
-            {{ $t(item.orderDirection) }}
+        <div @click.stop="pushRouter(item)">
+          <div class="title-box">
+            <div class="span">{{ item.stockName }}</div>
+            <div
+              class="states"
+              :class="item.orderDirection === '买跌' ? 'states-red' : ''"
+            >
+              {{ $t(item.orderDirection) }}
+            </div>
           </div>
+          {{ item.stockSpell }}
         </div>
+        <!-- <div @click="$router.push('/Stockdetail')"></div> -->
         <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>
@@ -42,7 +50,9 @@
           </van-col>
           <van-col span="8">
             <div style="text-align: center">
-              <div class="sport-content-title2">{{ $t("hj141") }} (USD)</div>
+              <div class="sport-content-title2">
+                {{ $t("hj141") }} ({{ activeObj.symbolCode }})
+              </div>
               <div class="sport-content-text2">
                 {{ item.profitAndLoseParent }}
               </div>
@@ -58,19 +68,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>
@@ -79,14 +95,16 @@
           <van-col span="8">
             <div style="text-align: left">
               <div class="sport-content-title2">
-                {{ $t("開倉手續費") }} (USD)
+                {{ $t("hj44") }} ({{ 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>
@@ -94,7 +112,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>
@@ -118,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>
@@ -169,7 +189,7 @@
   data() {
     return {
       pageNum: 1,
-      pageSize: 15,
+      pageSize: 150,
       loading: true,
       finished: false,
       closeSell: {},
@@ -189,11 +209,33 @@
       ],
     };
   },
+
   methods: {
+    pushRouter(item) {
+      const obj = {
+        pid: item.stockCode || "",
+        type: item.stockGid || "",
+      };
+      window.localStorage.setItem("kLine", JSON.stringify(obj));
+      // return;
+      var codes = item.stockCode;
+      var names = item.stockName;
+
+      this.$router.push({
+        path: "/kline",
+        query: {
+          name: names,
+          code: codes,
+          if_us: "",
+          if_zhishu: 0,
+          sok: "",
+          type: item.stockGid,
+        },
+      });
+    },
     onLoad() {
       this.pageNum++;
       this.loading = true;
-      this.getList();
     },
     async confirm() {
       const res = await sell({
@@ -205,12 +247,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;
@@ -222,16 +265,13 @@
         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;
         this.finished = true;

--
Gitblit v1.9.3