From 2d9eaadefb271a43a9a7de7c299377321e07bc8e Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Thu, 14 Aug 2025 13:29:10 +0800
Subject: [PATCH] 1

---
 src/page/list/favorites/data.list.vue |  118 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/src/page/list/favorites/data.list.vue b/src/page/list/favorites/data.list.vue
index e4852cc..f75f76a 100644
--- a/src/page/list/favorites/data.list.vue
+++ b/src/page/list/favorites/data.list.vue
@@ -8,7 +8,7 @@
           </div>
         </van-col>
         <van-col span="9"
-          ><div style="text-align: left">
+          ><div v-show="false" style="text-align: left">
             {{ $t("hj40") }}
           </div>
         </van-col>
@@ -23,6 +23,7 @@
     <van-list
       v-model="loadings"
       :finished-text="$t('hj43')"
+      :loading-text="$t('hj430')"
       :immediate-check="false"
     >
       <div
@@ -53,16 +54,18 @@
                   >{{ item.name }}</span
                 >
               </div>
-              <div class="bt">
+             <!-- <div class="bt">
                 <span>{{ item.code }}</span>
-              </div>
+              </div> -->
             </div></van-col
           >
 
-          <van-col span="9">
-            <div style="text-align: left">
+          <van-col span="9" >
+            <div style="text-align: left" v-show="false">
               <div class="tp">
-                <span class="price_color">{{ item.price }}</span>
+                <span class="price_color">{{
+                  item.price
+                }}</span>
               </div>
               <div class="bt">
                 <span>Max: {{ item.orderNumber }}</span>
@@ -71,14 +74,23 @@
           </van-col>
           <van-col span="6">
             <div style="text-align: right">
-              <div class="xgsgType">
+              <div :class="item.type === 1 ? 'xgsgType' : 'xgpsType'">
                 <span class="price_color">
                   {{ item.type === 1 ? $t("hj45") : $t("新股配售") }}
                 </span>
               </div>
             </div>
           </van-col>
+          <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-top: 10px;font-size: 10px;;">
+            <div>{{$t('hj59')}}:{{formatTimestamp(item.subscriptionTime)}}</div>
+            <div>{{$t('申购结束时间')}}:{{formatTimestamp(item.subscribeTime)}}</div>
+          </div>
+          <div style="width: 100%;display: flex;justify-content: space-between;align-items: center;margin-top: 10px;font-size: 10px;;">
+            <div>{{$t('上市时间')}}:{{formatTimestamp(item.listDate)}}</div>
+            <div>{{$t('hj314')}}:¥{{item.price}}</div>
+          </div>
         </van-row>
+
       </div>
     </van-list>
 
@@ -96,36 +108,42 @@
           <div class="laber">
             {{ shengouObj.type === 1 ? $t("hj57") : $t("配售数量") }}:
           </div>
-          <input type="number" :value="fromData.value" @input="fromDatavalue" />
+          <input  style="width: 40%;"  type="text" :maxlength="9"  v-model="fromData.value" @input="fromDatavalue"  />
+        </div>
+        <div class="input-box" style="margin-top:20px;" v-if="shengouObj.password">
+        <!-- <div class="input-box" style="margin-top:20px;"> -->
+          <div class="laber">
+            {{$t("秘钥")}}:
+          </div>
+          <input style="width: 40%;" type="text" :maxlength="9"  v-model="fromData.password"  />
         </div>
 
         <div class="shijian">
           <div class="xgsj">
             <div class="sjtlt">
-              {{ shengouObj.type === 1 ? $t("hj59") : $t("配售时间") }}:
+              {{
+                shengouObj.type === 1 ? $t("申购开启时间") : $t("配售开启时间")
+              }}:
             </div>
             <div class="xgTime">
-              {{
-                $moment(shengouObj.subscribeTime).format(
-                  "DD-MM-YYYY hh:mm:ss A"
-                )
-              }}
+              {{formatTimestamp(shengouObj.subscriptionTime)}}
             </div>
           </div>
           <div class="xgsj">
-            <div class="sjtlt">{{ $t("hj60") }}:</div>
-            <div class="xgTime">
+            <div class="sjtlt">
               {{
-                $moment(shengouObj.subscriptionTime).format(
-                  "DD-MM-YYYY hh:mm:ss A"
-                )
-              }}
+                shengouObj.type === 1 ? $t("申购结束时间") : $t("配售结束时间")
+              }}:
+              <!-- {{ $t("hj60") }}: -->
+            </div>
+            <div class="xgTime">
+              {{formatTimestamp(shengouObj.subscribeTime)}}
             </div>
           </div>
           <div class="xgsj">
             <div class="sjtlt">{{ $t("上市时间") }}:</div>
             <div class="xgTime">
-              {{ $moment(shengouObj.listDate).format("DD-MM-YYYY hh:mm:ss A") }}
+              {{formatTimestamp(shengouObj.listDate)}}
             </div>
           </div>
           <div class="xgsj">
@@ -133,8 +151,14 @@
             <div class="xgTime">{{ shengouObj.orderNumber }}</div>
           </div>
           <div class="xgsj">
+            <div class="sjtlt">{{ $t("hj101") }}:</div>
+            <div class="xgTime">{{ shengouObj.lever }}</div>
+          </div>
+          <div class="xgsj">
             <div class="sjtlt">{{ $t("hj120") }}:</div>
-            <div class="xgTime">{{ shengouObj.price }}</div>
+            <div class="xgTime">
+              ¥{{ shengouObj.price  }}
+            </div>
           </div>
           <!-- <div class="xgsj">
             <div class="sjtlt">上市時間:</div>
@@ -191,6 +215,7 @@
     return {
       fromData: {
         value: 1,
+        password:''
       },
       loadings: false,
       show: false,
@@ -207,16 +232,36 @@
     this.getStock(this.active, this.zxactive);
   },
   methods: {
+    formatTimestamp(timestamp) {
+      const date = new Date(timestamp);  // 将时间戳转换为 Date 对象
+
+      const day = date.getDate();        // 日期
+      const month = date.getMonth() + 1; // 月份(从 0 开始,所以下标要加 1)
+      const year = date.getFullYear();   // 年份
+      const hours = date.getHours();     // 小时
+      const minutes = date.getMinutes(); // 分钟
+      const seconds = date.getSeconds(); // 秒钟
+
+      // 格式化为 "日月年/时分秒" 格式
+      return `${year}${this.$t('年')}${month}${this.$t('月')}${day}${this.$t('日')}/${hours}:${minutes}:${seconds}`;
+      // return `${month}`;
+    },
     fromDatavalue(e) {
-      this.fromData.value = e.target.value;
+      this.fromData.value = this.fromData.value.replace(/^(0+)|[^\d]+/g, '')
     },
     async newAddxg() {
+      console.log(this.shengouObj.newlistId, "=====");
       const res = await api.getNewAdd({
         newCode: this.shengouObj.code,
         applyNums: this.fromData.value,
+        password: this.fromData.password,
+        newlistId: this.shengouObj.newlistId,
+        type: this.shengouObj.type,
       });
       if (res.status === 0) {
         Notify({ type: "success", message: res.msg });
+        this.show = false;
+        this.fromData.value = "";
       } else {
         Notify({ type: "warning", message: res.msg });
       }
@@ -224,6 +269,7 @@
     shengou(item) {
       this.show = true;
       this.shengouObj = item;
+      this.fromData.value = item.orderNumber
     },
     filterSH(val) {
       if (val === "sh") {
@@ -243,12 +289,9 @@
         stockType = array[0].name;
       }
       let opt = {
-        // pageNum: this.pageNumVal,
-        // pageSize: 15,
-        // stockPlate: "",
-        keyWords: this.sousuo,
-        // stockType: stockType,
-        // orderBy: "",
+        zt: 0,
+        getType: 1,
+        pageSize: 1000,
       };
       let data = await api.getStocklist(opt);
       this.loading = false;
@@ -285,7 +328,6 @@
     height: 1.3rem;
     background: #f3f3f3;
     border-radius: 0.15rem;
-
     line-height: 1.3rem;
     padding-left: 10px;
     display: flex;
@@ -300,7 +342,7 @@
     width: 100%;
     height: 1.3rem;
     border-radius: 0.15rem;
-    background: #5c288c;
+    background: #185546;
     color: #fff;
     font-size: 0.4615rem;
     margin-top: 0.5rem;
@@ -321,7 +363,7 @@
       -ms-flex-align: center;
       align-items: center;
       .sjtlt {
-        width: 25%;
+        width: 33%;
         margin-left: 0.4rem;
       }
     }
@@ -390,10 +432,18 @@
 }
 .xgsgType {
   border-radius: 0.1rem;
-  background-color: rgba(102, 204, 153, 0.1);
+  // background-color: rgba(102, 204, 153, 0.1);
   border: 0.04rem solid #5ce398;
   color: #5ce398;
   text-align: center;
   line-height: 35px;
 }
-</style>
\ No newline at end of file
+.xgpsType {
+  border-radius: 0.1rem;
+  // background-color: rgba(102, 204, 153, 0.1);
+  border: 0.04rem solid #ba33a5;
+  color: #ba33a5;
+  text-align: center;
+  line-height: 35px;
+}
+</style>

--
Gitblit v1.9.3