From aab5e957dfeaa71bb56771f101d7b26c88e2e83a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 14 十一月 2024 09:28:23 +0800
Subject: [PATCH] add: -商户列表需要增加下单次数统计(已退款、已取消、待付款的不统计在内)

---
 pages/shop/list.vue             |    1 +
 pages/settlement/list/index.vue |    2 ++
 pages/wallet/withdraw-audit.vue |    2 +-
 pages/order/list/index.vue      |    1 +
 4 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index 8533b52..3f74328 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -84,6 +84,7 @@
           },
           { label: '订单金额(元)', prop: 'totalAmount', minWidth: 150 },
           { label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
+          { label: '销售扎数', prop: 'saleNum', minWidth: 150 },
           { label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
           { label: '下单时间', prop: 'createTime', minWidth: 180 },
           { label: '支付时间', prop: 'paymentTime', minWidth: 180 },
diff --git a/pages/settlement/list/index.vue b/pages/settlement/list/index.vue
index 1f422ef..fac1145 100644
--- a/pages/settlement/list/index.vue
+++ b/pages/settlement/list/index.vue
@@ -13,6 +13,8 @@
         hasNew: false,
         hasEdit: false,
         hasDelete: false,
+        hasExport: true,
+        exportUrl: 'flower/api/settlement/export',
         onResetView: (row) => {
           this.$router.push(`${this.$route.path}/${row.id}`)
         },
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
index fa6389f..97cf21b 100644
--- a/pages/shop/list.vue
+++ b/pages/shop/list.vue
@@ -25,6 +25,7 @@
           { label: '商户名称', prop: 'name', minWidth: 150, fixed: 'left' },
           { label: '商户昵称', prop: 'nickName', minWidth: 150 },
           { label: '所属合伙人', prop: 'partnerName', minWidth: 150 },
+          { label: '下单次数', prop: 'orderNum', minWidth: 150 },
           {
             label: '地址',
             formatter: (row) => this.getDistrict(row),
diff --git a/pages/wallet/withdraw-audit.vue b/pages/wallet/withdraw-audit.vue
index e4a137e..76ec926 100644
--- a/pages/wallet/withdraw-audit.vue
+++ b/pages/wallet/withdraw-audit.vue
@@ -18,7 +18,7 @@
         columns: [
           {label: '供应商信息',
             minWidth: 120,
-            formatter: (row) => `${row.supplierName || ''}:${row.supplierId || ''}`},
+            formatter: (row) => `${row.supplierName || ''}:[ID:${row.supplierId || ''}]`},
           {label: '申请时间', prop: 'createTime', minWidth: 100},
           {label: '提现类型', prop: 'withdrawTypeStr', minWidth: 100},
           {label: '提现金额(元)', prop: 'amount', minWidth: 120},

--
Gitblit v1.9.3