From 1613da5e0d5b13b20fc384da3595766efe8ffb24 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Sat, 03 Aug 2024 15:05:48 +0800
Subject: [PATCH] Merge branch '6-8jys-yz3.5jy' of http://124.156.157.155:8060/r/usdt_one_pc into 6-8jys-yz3.5jy

---
 src/views/order/walletHistory.vue |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/order/walletHistory.vue b/src/views/order/walletHistory.vue
index cdb9ad0..9b1e326 100644
--- a/src/views/order/walletHistory.vue
+++ b/src/views/order/walletHistory.vue
@@ -82,7 +82,7 @@
         :empty-text="$t('message.home.noData')"
       >
         <el-table-column
-          prop="createtimestr"
+          prop="createTimeStr"
           :label="$t('message.user.shijian3')"
         ></el-table-column>
         <el-table-column
@@ -152,7 +152,7 @@
               <span class="label"
                 >{{ $t("message.user.dingdanshijian3") }}:
               </span>
-              <span>{{ detailData.create_time }}</span>
+              <span>{{ detailData.create_time.split(/ +/)[0] + ' ' + initDate(detailData.create_time.split(/ +/)[1]) }}</span>
             </div>
             <div>
               <span class="label"> {{ $t("message.user.dingdanhao3") }}: </span>
@@ -201,10 +201,12 @@
 </template>
 <script>
 import Axios2 from "@/api/wallet.js";
+import { initDate } from "@/utils/utils";
 export default {
   name: "exchangeHistory",
   data() {
     return {
+      initDate,
       formInline: {
         category: "",
         start_time: "",
@@ -255,6 +257,13 @@
         page_no: this.pageNum,
       }).then((res) => {
         this.tableData = res.data;
+        console.log(this.tableData);
+        this.tableData.forEach((item) => {
+          item.createTimeStr =
+            item.createTimeStr.split(/ +/)[0] +
+            " " +
+            initDate(item.createTimeStr.split(/ +/)[1]);
+        });
         this.tableLength = res.data.length;
       });
     },

--
Gitblit v1.9.3