diff --git a/ruoyi-ui/src/components/Pagination/index.vue b/ruoyi-ui/src/components/Pagination/index.vue
index 08ff09046..363b508c3 100644
--- a/ruoyi-ui/src/components/Pagination/index.vue
+++ b/ruoyi-ui/src/components/Pagination/index.vue
@@ -1,101 +1,103 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/ruoyi-ui/src/views/custom/order/index.vue b/ruoyi-ui/src/views/custom/order/index.vue
index a2cd21698..ccb7bc400 100644
--- a/ruoyi-ui/src/views/custom/order/index.vue
+++ b/ruoyi-ui/src/views/custom/order/index.vue
@@ -259,8 +259,11 @@
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
+ layout="total, slot, sizes, prev, pager, next, jumper"
@pagination="getList"
- />
+ >
+ 总计:{{toThousands(this.totalAmount)}} 元
+
@@ -451,6 +454,8 @@
const beginTime = dayjs().startOf('month').format('YYYY-MM-DD');
const endTime = dayjs().format('YYYY-MM-DD');
+ // const beginTime = dayjs().format('YYYY-MM-DD');
+ // const endTime = dayjs().format('YYYY-MM-DD');
export default {
name: "Order",
@@ -612,6 +617,7 @@
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
+ this.totalAmount = response.rows.reduce((acc, cur) => cur.amount + acc, 0);
});
},// 收款方式字典翻译
payTypeIdFormat(row, column) {