From fb3125c4cfa239e7f2647b8f5775572906c2cdaa Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Sun, 11 Aug 2024 00:20:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E4=BA=A4=E8=B4=B9=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/order/model/index.ts        |  2 ++
 src/views/yunxinwei/index/index.vue |  7 ++++---
 src/views/yunxinwei/order/index.vue | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/api/order/model/index.ts b/src/api/order/model/index.ts
index 13aba59..d14d075 100644
--- a/src/api/order/model/index.ts
+++ b/src/api/order/model/index.ts
@@ -45,6 +45,8 @@ export interface Order {
   goodsId?: number;
   // 总金额
   totalPrice?: number;
+  //缴费总数
+  totalPayPrice?:number;
   // 发货状态
   deliveryStatus?: number;
   // 收货状态
diff --git a/src/views/yunxinwei/index/index.vue b/src/views/yunxinwei/index/index.vue
index 2dcf120..1c181f1 100644
--- a/src/views/yunxinwei/index/index.vue
+++ b/src/views/yunxinwei/index/index.vue
@@ -86,7 +86,7 @@
             </template>
             <template v-if="column.key === 'createTime'">
               <a-tooltip :title="`${toDateString(record.createTime)}`">
-                {{ timeAgo(record.createTime) }}
+                {{ toDateString(record.createTime) }}
               </a-tooltip>
             </template>
             <template v-if="column.key === 'action'">
@@ -225,8 +225,9 @@
     {
       title: '租赁状态',
       dataIndex: 'leaseStatus',
-      sorter: true,
-      key: 'leaseStatus'
+      //sorter: true,
+      key: 'leaseStatus',
+      hideInTable:true
     },
     {
       title: '电池状态',
diff --git a/src/views/yunxinwei/order/index.vue b/src/views/yunxinwei/order/index.vue
index 07c09fa..bb311ad 100644
--- a/src/views/yunxinwei/order/index.vue
+++ b/src/views/yunxinwei/order/index.vue
@@ -36,14 +36,14 @@
                 </span>
               </div>
             </template>
-            <template v-if="column.key === 'totalPrice'">
+            <template v-if="column.key === 'totalPayPrice'">
               <p>
                 <span class="ele-text-warning price-edit">
-                  ￥{{ record.totalPrice }}
+                  ￥{{ record.totalPayPrice }}
                 </span>
                 <form-outlined
                   v-if="record.payStatus === 10"
-                  @click="onEdit('totalPrice', record.totalPrice, record)"
+                  @click="onEdit('totalPayPrice', record.totalPrice, record)"
               /></p>
               <p class="ele-text-placeholder"
                 >(含运费：￥{{ record.expressPrice }})</p
@@ -323,8 +323,8 @@
     },
     {
       title: '订单金额(元)',
-      dataIndex: 'totalPrice',
-      key: 'totalPrice',
+      dataIndex: 'totalPayPrice',
+      key: 'totalPayPrice',
       ellipsis: true
     },
     {