From 0788772afaf87391d302ad90c8825f4da11277f4 Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Sat, 26 Apr 2025 13:59:13 +0800
Subject: [PATCH] Merge branch 'master' of http://124.156.157.155:8060/r/gp/cakuns_st_app

---
 src/page/list/tradingList/data.list.vue |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/page/list/tradingList/data.list.vue b/src/page/list/tradingList/data.list.vue
index e0e5f29..63dd526 100644
--- a/src/page/list/tradingList/data.list.vue
+++ b/src/page/list/tradingList/data.list.vue
@@ -2,16 +2,16 @@
   <div class="list-data">
     <div class="header-box">
       <van-row type="flex" align="center" gutter="20">
-        <van-col span="8">
+        <van-col span="11">
           <div>
             {{ $t("hj313") }}
           </div>
         </van-col>
-        <van-col span="3">
+        <!-- <van-col span="3">
           <div style="text-align: right">
             {{ $t("市场") }}
           </div>
-        </van-col>
+        </van-col> -->
         <van-col :span="active == 'DZ' ? '12' : '7'">
           <div style="text-align: right">
             {{ $t("hj314") }}
@@ -21,6 +21,19 @@
           <div style="text-align: right">
             {{ $t("hj315") }}
           </div>
+        </van-col>
+        <van-col span="6" v-if="active == 'ST'">
+          <van-popover
+            theme="dark"
+            v-model="showPopover"
+            trigger="click"
+            :actions="actions"
+            @select="onSelect"
+          >
+            <template #reference>
+              <van-button type="primary">الترتيب</van-button>
+            </template>
+          </van-popover>
         </van-col>
       </van-row>
     </div>
@@ -46,7 +59,7 @@
           :key="item.indexCode"
         >
           <van-row type="flex" align="center" gutter="20">
-            <van-col span="8">
+            <van-col span="13" style="padding-right: 0 !important;">
               <div>
                 <div class="tp">
                   <div class="collection" @click="optionszx(item)">
@@ -58,13 +71,14 @@
                   <div
                     class="title_color"
                     style="
+                      font-size: 14px;
                       width: 100%;
                       overflow: hidden;
                       text-overflow: ellipsis;
                       white-space: nowrap;
                     "
                   >
-                    {{ item.st_name || item.stockName }}
+                    {{ item.st_name || item.name || item.stockName }}
                   </div>
                 </div>
                 <div class="bt">
@@ -73,17 +87,17 @@
               </div>
             </van-col>
 
-            <van-col span="3" v-if="active != 'HJ'">
+            <!-- <van-col span="3" v-if="active != 'HJ'">
               <div style="text-align: right">
                 {{ (item.gid || item.stockGid).toUpperCase() }}
               </div>
-            </van-col>
+            </van-col> -->
 
-            <van-col :span="active == 'DZ' ? '12' : '7'">
+            <van-col :span="active == 'DZ' ? '12' : '5'">
               <div style="text-align: right">
                 <div class="tp">
                   <span class="price_color">
-                    {{ item.nowPrice | _toLocaleString(false) }}
+                    {{ item.nowPrice  }}
                   </span>
                 </div>
                 <div class="bt" v-if="active != 'DZ'">
@@ -91,11 +105,11 @@
                 </div>
               </div>
             </van-col>
-            <van-col span="6" v-if="!['DZ', 'HJ'].includes(active)">
+            <van-col span="6" v-if="!['DZ',].includes(active)">
               <div style="text-align: right">
                 <div
                   class="tp right_bs"
-                  :class="`${item.hcrateP.charAt(0) == '+' ? 'green' : 'red'}`"
+                  :class="`${item.hcrate > 0 ? 'green' : 'red'}`"
                 >
                   <span class="price_color">{{ item.hcrateP }}</span>
                 </div>
@@ -177,13 +191,20 @@
   },
   data() {
     return {
+      showPopover: false,
       loadings: false,
       finished: false,
       listArr: [],
       pageNumVal: 1,
       getInterval: null,
       num: 1,
-      refreshing: false
+      orderBy: "",
+      refreshing: false,
+      actions: [
+        { text: "ترتيب", zh: "升序", val: "asc" },
+        { text: "التخفيض", zh: "降序", val: "desc" },
+        { text: "طبيعي", zh: "正常", val: "" }
+      ]
     };
   },
   beforeDestroy() {
@@ -202,6 +223,10 @@
     // }, 5000);
   },
   methods: {
+    onSelect(action) {
+      this.orderBy = action.val;
+      this.getStock(this.active, this.zxactive, 1);
+    },
     filterSH(val) {
       if (val === "sh") {
         return 1;
@@ -231,7 +256,6 @@
       var ifZhishu = "0";
       var ifUs =
         item.stock_type === "us" ? "1" : item.stock_type === "hk" ? "2" : "";
-      console.log("td_item:", item);
       this.$router.push({
         path: "/kline",
         query: {
@@ -266,7 +290,7 @@
         stockPlate: "",
         keyWords: this.sousuo,
         stockType: stockType,
-        orderBy: ""
+        orderBy: this.orderBy
       };
 
       // console.log();
@@ -315,7 +339,6 @@
               this.listArr = data.data.list;
               this.loadings = false;
               // this.finished = true;
-              console.log("listArr", this.listArr);
               if (this.listArr.length % 20) {
                 this.finished = true;
               }

--
Gitblit v1.9.3