From d057d7b76ebb6330c34ac9410054576dd78745ff Mon Sep 17 00:00:00 2001
From: DESKTOP-CVS3R96\我恁爹 <11>
Date: Fri, 11 Nov 2022 23:37:11 +0800
Subject: [PATCH] 111

---
 src/page/list/trading-list.vue |   56 +++++++++++++++++++--------
 src/axios/api.js               |    5 ++
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/axios/api.js b/src/axios/api.js
index 0213054..8d58ea4 100644
--- a/src/axios/api.js
+++ b/src/axios/api.js
@@ -154,6 +154,11 @@
   return get('/api/futures/querySingleMarket.do', options)
 }
 
+// 新股列表
+export function getNewGu (options) {
+  return post('/user/list.do', options)
+}
+
 // 期货下单
 export function buyFutures (options) {
   return post('/user/buyFutures.do', options)
diff --git a/src/page/list/trading-list.vue b/src/page/list/trading-list.vue
index cd04a2f..f2bde97 100644
--- a/src/page/list/trading-list.vue
+++ b/src/page/list/trading-list.vue
@@ -60,14 +60,14 @@
                           <span class="shu" :class="item.isOption == '1' ? 'shublue' : ''"></span>
                         </span>
                         <span class="title_color">
-                          {{ tabsItemIndex == 3 ? item.futuresName : tabsItemIndex ==
+                          {{ tabsItemIndex == 3 ? item.name : tabsItemIndex ==
                               2 ? item.name : tabsItemIndex == 0 ? item.name : item.indexName
                           }}
                         </span>
                       </div>
                       <div class="bt">
                         <span>
-                          {{ tabsItemIndex == 3 ? item.futuresCode : tabsItemIndex == 2 ? item.code : tabsItemIndex
+                          {{ tabsItemIndex == 3 ? item.code : tabsItemIndex == 2 ? item.code : tabsItemIndex
                               ==
                               0 ? item.code : item.indexCode
                           }}
@@ -82,13 +82,13 @@
                           }}
                         </span>
                         <span class="price_color" v-else>
-                          {{ tabsItemIndex == 3 ? Number(item.nowPrice).toFixed(2) :
+                          {{ tabsItemIndex == 3 ? Number(item.price).toFixed(2) :
                               item.currentPoint
                           }}
                         </span>
                       </div>
                       <div class="bt">
-                        <span v-if="tabsItemIndex == 3 || tabsItemIndex == 1">{{ '手续费:' + item.transFee }}</span>
+                        <span v-if="tabsItemIndex == 3 || tabsItemIndex == 1">{{ tabsItemIndex == 3?item.orderNumber :'手续费:' + Number(item.transFee) }}</span>
                         <span v-else>{{ item.today_min }}</span>
                       </div>
                     </div>
@@ -313,7 +313,7 @@
               <span>
                 {{ tabsItemIndex == 1 ? '指数' : tabsItemIndex == 0 ? '沪深' : tabsItemIndex == 2 ? '科创' :
                     tabsItemIndex ==
-                      3 ? '期货' : ''
+                      3 ? '新股' : ''
                 }}
               </span>
               <span>{{ '资产' }}</span>
@@ -436,7 +436,7 @@
         // }
         {
           name: "新股",
-          type: 4
+          type: 3
         }
       ],
       tabsItemIndex: 0,
@@ -499,6 +499,7 @@
       // }
     },
     gpinput() {
+      
       this.pageNum = 1;
       this.listArr = [];
       this.loading = true;
@@ -575,7 +576,7 @@
         // 成功
         this.settingInfo = data.data;
       } else {
-        this.$store.commit('elAlertShow',{'elAlertShow':true,'elAlertText': data.msg});
+       ` this.$store.commit('elAlertShow',{'elAlertShow':true,'elAlertText': data.msg});`
       }
     },
     async getListMarket() {
@@ -654,6 +655,7 @@
       }
     },
     handleGoToKlineDetail(item) {
+      
       var codes = "";
       var names = "";
       var stock_type = "";
@@ -682,6 +684,7 @@
           if_zhishu = '0';
           break;
         case 3:
+          return;
           codes = item.futuresGid;
           names = item.futuresName;
           soks = 0;
@@ -715,26 +718,44 @@
     async getFutures() {
       // 获取期货列表
       let opt = {
-        homeShow: 1,
-        pageNum: this.pageNum,
-        pageSize: 15
+        
+        
       };
-      let data = await api.getListFutures(opt);
+      let data = await api.getNewGu(opt);
       this.loading = false;
-      if (data.data.length < 15) {
-        this.finished = true;
-      }
       if (data.status === 0) {
         if (this.tabsItemIndex == 3) {
-          data.data.forEach(element => {
-            this.listArr.push(element);
-          });
+          this.listArr = data.data.list;
         }
+        this.finished = true;
       } else {
         this.texts = data.msg;
         this.alertShow = true;
       }
     },
+    // async getFutures() {
+    //   // 获取期货列表
+    //   let opt = {
+    //     homeShow: 1,
+    //     pageNum: this.pageNum,
+    //     pageSize: 15
+    //   };
+    //   let data = await api.getListFutures(opt);
+    //   this.loading = false;
+    //   if (data.data.length < 15) {
+    //     this.finished = true;
+    //   }
+    //   if (data.status === 0) {
+    //     if (this.tabsItemIndex == 3) {
+    //       data.data.forEach(element => {
+    //         this.listArr.push(element);
+    //       });
+    //     }
+    //   } else {
+    //     this.texts = data.msg;
+    //     this.alertShow = true;
+    //   }
+    // },
     async getMyList() {
       this.loadings = true;
       //获取自选列表
@@ -783,6 +804,7 @@
       this.pageNum = 1;
       this.finished = false;
       this.loading = true;
+      console.log(item.type,"阿斯顿八岁的跟随阿达");
       switch (item.type) {
         case 1:
           this.listArr = [];

--
Gitblit v1.9.3