From 1915a4794b63260f3cb2bfb2417641aada269891 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Wed, 18 Oct 2023 17:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=81=E6=9C=89=E4=BB=93=E4=BD=8D=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=99=A8=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/contract/hold-position.vue |  2 +-
 src/views/contract/index.vue         | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/contract/hold-position.vue b/src/views/contract/hold-position.vue
index 2c863c4..3e48b25 100644
--- a/src/views/contract/hold-position.vue
+++ b/src/views/contract/hold-position.vue
@@ -461,7 +461,7 @@ export default {
     },
     newPrice: {
         default: 0,
-        type: Number,
+        type: Number|String,
         required: false,
     },
     holdPositionAll: {
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index 7b9ec93..99101a6 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -142,12 +142,12 @@
         :newPriceObj="newPriceObj"
         :contractOpen="contractOpen"
         @accountInfo="accountInfo = $event"
-        @position="holdPosition"
+        @position="getLastHoldPosition"
         @getSymbolDetail="symbolDetail=$event"
       />
     </div>
     <page-bottom
-        @position="holdPosition"
+        @position="getLastHoldPosition"
         @isall="
             holdPositionAll = $event;
             holdPosition();
@@ -263,7 +263,8 @@ export default {
     this.indexList();
     this._time = setInterval(() => {
       if (this.contractOpen) {
-        this.holdPosition();//临时注释
+        // mounted 中有定时器跑holdPosition了
+        // this.holdPosition();
       }
     }, 3000);
     this.ws.on("open", () => {
@@ -279,10 +280,10 @@ export default {
   },
   //三秒更新一次数据
   mounted: function () {
-    // created 中有定时器跑holdPosition了
-      // setInterval(() => {
-      //   this.holdPosition();
-      // }, 2000)
+    
+      setInterval(() => {
+        this.holdPosition();
+      }, 2000)
   },
   methods: {
     ispopover1(item){
@@ -376,6 +377,17 @@ export default {
     //获取某一个持仓订单的数据
     setactiveItem(index=0){
         this.accountInfo=this.holdPositionList[index]
+    },
+    // 线上最新数据有延迟，多请求两次以保拿到
+    getLastHoldPosition(){
+      let ti = 0,timer=null;
+      timer = setInterval(()=>{
+        this.holdPosition();
+        ti++;
+        if(ti==3){
+          clearInterval(timer);
+        }
+      }, 1000)
     }
   }
 };