From 47f441e34648c595380072497c8c415d830c9f6e Mon Sep 17 00:00:00 2001
From: DESKTOP-CVS3R96\我恁爹 <11>
Date: Wed, 09 Nov 2022 22:47:40 +0800
Subject: [PATCH] 111111111

---
 src/page/home/home.vue              |   24 ++++++-----
 src/page/list/trading-list.vue      |   63 ++++++++++++++++++++++++++-----
 src/page/kline/index.vue            |    4 +-
 src/page/kline/components/kLine.vue |    8 +++
 4 files changed, 75 insertions(+), 24 deletions(-)

diff --git a/src/page/home/home.vue b/src/page/home/home.vue
index 75d22bf..f455061 100644
--- a/src/page/home/home.vue
+++ b/src/page/home/home.vue
@@ -112,25 +112,27 @@
                   <div class="item_cont" :class="idx!=2?'item_conts':''" v-for="(item2, idx) in proData[currentIndex]" :key="idx">
                     <div class="top_fo">
                       <div class="title">
-                        {{ item2.indexName }}
+                        {{ item2.name }}
                       </div>
                       <div class="numbers">
-                        {{ item2.currentPoint }}
+                        {{ item2.price }}
                       </div>
-                      <div class="percentage" :class="item2.floatRate > 0 ? 'gree' : 'redd'">
-                        <span style="font-weight: 500;">{{ item2.floatRate > 0 ? `+${item2.floatRate}%` :
-                            `${item2.floatRate}%`
+                      <div class="percentage" :class="item2.range > 0 ? 'gree' : 'redd'">
+                        <span style="font-weight: 500;">{{ item2.range > 0 ? `${item2.range}` :
+                            `${item2.range}`
                         }}</span>
                       </div>
                     </div>
                     <div class="bottom_fo">
                       <div class="title">
-                        <span class="numberid" style="margin-right: 0.12rem;">{{ item2.indexCode }}</span>
-
-                        <img v-for="items in item2.random" :src="Huo" alt style="width: 0.4rem;height: 0.4rem;" />
+                        <span class="numberid" style="margin-right: 0.12rem;">{{ item2.symbol }}</span>
+                        <div v-for="(items,index) in item2.pnum.slice(1, 2)">
+                          <img v-if="index<3" :src="Huo" alt style="width: 0.4rem;height: 0.4rem;" />
+                        </div>
+                        
                       </div>
                       <div class="numbers" :class="item2.floatPoint > 0 ? 'gree' : 'redd'">
-                        <span class="point">{{ item2.floatPoint > 0 ? `+${item2.floatPoint}%` : `${item2.floatPoint}%`
+                        <span class="point">{{ item2.pnum
                         }}</span>
                       </div>
                       <div class="percentage">
@@ -365,8 +367,8 @@
     },
     async getStock() {
       let data = await api.getIndexMarket();
-      for (var i = 0; i < data.data.length; i += 3) {
-        this.proData.push(data.data.slice(i, i + 3));
+      for (var i = 0; i < data.data.result.data.length; i += 3) {
+        this.proData.push(data.data.result.data.slice(i, i + 3));
       }
 
     },
diff --git a/src/page/kline/components/kLine.vue b/src/page/kline/components/kLine.vue
index 5b7db82..25824cb 100644
--- a/src/page/kline/components/kLine.vue
+++ b/src/page/kline/components/kLine.vue
@@ -1060,7 +1060,13 @@
   created() {
     const { query } = this.$route;
     console.log(query, "33333");
-    this.Symbol = `${query.code}_${query.sok}.${query.type}`;
+    console.log(query.if_zhishu!= '0', "44444");
+    if(query.if_zhishu== '0'){
+      this.Symbol = `${query.code}_${query.sok}.${query.type}`;
+    }else{
+      this.Symbol = `${query.if_zhishu}_${query.sok}.${query.type}`;
+    }
+    
     console.log(this.Symbol);
   },
 
diff --git a/src/page/kline/index.vue b/src/page/kline/index.vue
index f120020..95c396c 100644
--- a/src/page/kline/index.vue
+++ b/src/page/kline/index.vue
@@ -11,7 +11,7 @@
               <span>{{ kLineDetails.name }}</span>
             </div>
             <div class="b_t">
-              <span>{{ kLineDetails.code }}</span>
+              <span>{{ singDetails.code }}</span>
             </div>
           </div>
         </div>
@@ -245,7 +245,7 @@
       };
       await api.getSingleStock(opts).then(res => {
         if (res.status === 0) {
-          this.singDetails = res.data;
+          this.singDetails = res.data.stock;
           console.log(this.singDetails);
         }
       });
diff --git a/src/page/list/trading-list.vue b/src/page/list/trading-list.vue
index 2b47f0e..fd0f8b1 100644
--- a/src/page/list/trading-list.vue
+++ b/src/page/list/trading-list.vue
@@ -73,7 +73,7 @@
                   <div class="item" v-for="(item, index) in listArr" :key="index" @click="handleGoToKlineDetail(item, index)">
                     <div class="left_title">
                       <div class="tp">
-                        <span class="collection" @click.prevent="options(item)">
+                        <span class="collection" @click.stop="options(item)">
                           <span class="shu" :class="item.isOption == '1' ? 'shublue' : ''"></span>
                         </span>
                         <span class="title_color">
@@ -328,14 +328,14 @@
                 v-else-if="!this.$store.state.settingForm.indexDisplay && !this.$store.state.settingForm.futuresDisplay"
                 class="account"
               >¥{{ $store.state.hide ? '****' : Number($store.state.userInfo.userAmt).toFixed(2) }}</p>
-              <p
+              <!-- <p
                 v-else-if="this.$store.state.settingForm.indexDisplay && this.$store.state.settingForm.futuresDisplay"
                 class="account"
               >
                 ¥{{ $store.state.hide ? '****' : Number($store.state.userInfo.userAmt +
                 $store.state.userInfo.userIndexAmt + $store.state.userInfo.userFuturesAmt).toFixed(2)
                 }}
-              </p>
+              </p> -->
             </div>
           </div>
         </div>
@@ -461,6 +461,7 @@
 </template>
 
 <script>
+import { Toast } from 'mint-ui'
 import * as api from "@/axios/api";
 import elalert from "@/components/elalert.vue";
 export default {
@@ -504,9 +505,13 @@
           name: "科创",
           type: 2
         },
+        // {
+        //   name: "期货",
+        //   type: 3
+        // }
         {
-          name: "期货",
-          type: 3
+          name: "新股",
+          type: 4
         }
       ],
       tabsItemIndex: 0,
@@ -714,15 +719,53 @@
       }
     },
     handleGoToKlineDetail(item) {
-      console.log(item);
+      var codes ="";
+      var names = "";
+      var stock_type = "";
+      var soks = "";
+      var if_zhishu = '0';
+      switch (this.tabsItemIndex) {
+        case 0:
+          codes = item.code;
+          names = item.name;
+          stock_type = item.stock_type;
+          soks = this.filterSH(item.stock_type);
+          if_zhishu = '0';
+          break;
+          case 1:
+          codes = item.indexGid;
+          names = item.indexName;
+          stock_type = 'sh';
+          if_zhishu = item.indexCode;
+          soks = 0;
+          break;
+          case 2:
+          codes = item.code;
+          names = item.name;
+          stock_type = item.stock_type;
+          soks = this.filterSH(item.stock_type);
+          if_zhishu = '0';
+          break;
+          case 3:
+          codes = item.futuresGid;
+          names = item.futuresName;
+          soks = 0;
+          stock_type = 'qh';
+          if_zhishu = item.indexGid;
+          break;
+        default:
+          break;
+      }
+     
       this.$router.push({
         path: "/kline",
         query: {
-          name: item.name,
+          name: names,
           stockplate: item.stock_plate,
-          code: item.code,
-          type: item.stock_type,
-          sok: this.filterSH(item.stock_type)
+          code: codes,
+          type: stock_type,
+          sok:  soks,
+          if_zhishu: if_zhishu,
         }
       });
     },

--
Gitblit v1.9.3