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 @@ - {{ timeAgo(record.createTime) }} + {{ toDateString(record.createTime) }} @@ -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 @@ - + - ¥{{ record.totalPrice }} + ¥{{ record.totalPayPrice }} (含运费:¥{{ record.expressPrice }})
- ¥{{ record.totalPrice }} + ¥{{ record.totalPayPrice }}
(含运费:¥{{ record.expressPrice }})