From e7cc7ef9a167d7b097c7ba217ad544a58619d0f8 Mon Sep 17 00:00:00 2001
From: luyisha <luyisha@xingtongworld.com>
Date: Fri, 16 Jun 2023 17:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=8F=A3=E3=80=81=E6=88=90=E4=BA=A4?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/module/_contract.scss |  6 ++++-
 src/views/contract/handicap.vue       | 34 +++++++++++++++------------
 src/views/contract/index.vue          |  3 ++-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/assets/scss/module/_contract.scss b/src/assets/scss/module/_contract.scss
index c904a2a..67a30fa 100644
--- a/src/assets/scss/module/_contract.scss
+++ b/src/assets/scss/module/_contract.scss
@@ -56,7 +56,11 @@
                 .sell,
                 .buy {
                     // height: 310px;
-                    height: 250px;
+                    height: 190px;
+                    overflow: auto;
+                }
+                .deal {
+                    height: 148px;
                     overflow: auto;
                 }
                 .sell {
diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue
index 6b4da08..fc42999 100644
--- a/src/views/contract/handicap.vue
+++ b/src/views/contract/handicap.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="markets-pair-list handicap bg-plain">
-    <div class="nav nav-pills">
+    <!-- <div class="nav nav-pills">
       <div class="nav-item">
         <a class="nav-link" :class="{ active: tab == 1 }" @click="tab = 1">{{
           $t("contract.f7")
@@ -11,7 +11,7 @@
           $t("contract.f8")
         }}</a>
       </div>
-    </div>
+    </div> -->
     <div>
       <!-- 盘口 -->
       <div class="handicap-body px-3" v-if="tab == 1">
@@ -76,7 +76,7 @@
             <!-- <button class="btn btn-sm btn-outline-primary fn-12">更多</button> -->
           </div>
         </div>
-        <div class="buy">
+        <div class="buy fn-12">
           <template v-for="(item, idx) in buyListShow">
             <div
               class="item pointer"
@@ -95,9 +95,7 @@
             </div>
           </template>
         </div>
-      </div>
-      <!-- 实时成交 -->
-      <div class="real-time p-3" v-if="tab == 2">
+        <!-- 实时成交 -->
         <div class="d-flex text-secondary fn-12">
           <div class="w-10/24">
             {{ $t("contract.b1") }}
@@ -107,18 +105,24 @@
             {{ $t("contract.e1") }}({{ $t("contract.e2") }})
           </div>
         </div>
-        <div class="d-flex fn-12" v-for="(item, idx) in tradeList" :key="idx">
-          <div class="w-10/24">
-            {{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
-          </div>
-          <div class="w-7/24 increace">
-            {{ item.price }}
-          </div>
-          <div class="w-7/24 text-right">
-            {{ omitTo(item.amount, 2) }}
+        <div class="deal">
+          <div class="d-flex fn-12" v-for="(item, idx) in tradeList" :key="idx">
+            <div class="w-10/24">
+              {{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
+            </div>
+            <div class="w-7/24 increace">
+              {{ item.price }}
+            </div>
+            <div class="w-7/24 text-right">
+              {{ omitTo(item.amount, 2) }}
+            </div>
           </div>
         </div>
       </div>
+      <!--  -->
+      <div class="real-time p-3" v-if="tab == 2">
+        
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue
index f5aade2..4bc1300 100644
--- a/src/views/contract/index.vue
+++ b/src/views/contract/index.vue
@@ -296,8 +296,9 @@ export default {
       });
       this.ws.on("message", res => {
         let { data, sub,cmd } = res;
-
+        
         if (sub == msg) {
+            // console.log(data, '11--------------------')
             if( data.symbol=='BTC' )(data.price).toFixed(1)
             this.contractList = data;
         }else if (cmd == "ping") {