From be030610b6e6c8d839ba6fc45aff4f433f462e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 3 Dec 2024 09:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/constants.js                        |  5 +++++
 src/views/dashboard/DailyBillAmountChart.vue  | 13 ++++++-------
 src/views/dashboard/DailyBillAmountReport.vue |  2 +-
 src/views/ss/index/index.vue                  |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/utils/constants.js b/src/utils/constants.js
index d6eb5af..1a879a5 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -130,6 +130,11 @@ export const PayBillStatus = {
   CANCEL: "4", // 已取消
   REFUNDING: "5", // 退款中
   REFUNDED: "6", // 已退款
+
+  // 已支付的状态
+  payedList() {
+    return [this.PAY_SUCCESS, this.REFUNDING, this.REFUNDED];
+  }
 }
 
 // 充值订单状态
diff --git a/src/views/dashboard/DailyBillAmountChart.vue b/src/views/dashboard/DailyBillAmountChart.vue
index d550c16..3b7b623 100644
--- a/src/views/dashboard/DailyBillAmountChart.vue
+++ b/src/views/dashboard/DailyBillAmountChart.vue
@@ -2,8 +2,8 @@
   <div>
     <el-row style="margin-bottom: 16px">
       <date-range-picker
-        :start-date.sync="queryParams.startDate"
-        :end-date.sync="queryParams.endDate"
+        :start-date.sync="queryParams.payDateStart"
+        :end-date.sync="queryParams.payDateEnd"
         @change="getList"
       />
     </el-row>
@@ -16,7 +16,7 @@ import { getLastDateStr } from '@/utils'
 import { getBillDailyAmount } from '@/api/system/dashboard'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import DailyBillAmountReport from '@/views/dashboard/DailyBillAmountReport.vue'
-import { RechargeStatus, TransactionBillType } from '@/utils/constants'
+import { PayBillStatus } from '@/utils/constants'
 
 export default {
   name: 'DailyBillAmountChart',
@@ -25,10 +25,9 @@ export default {
     return {
       // 查询条件
       queryParams: {
-        startDate: getLastDateStr(6),
-        endDate: getLastDateStr(0),
-        type: TransactionBillType.RECHARGE,
-        statusList: RechargeStatus.payedOrder()
+        payDateStart: getLastDateStr(6),
+        payDateEnd: getLastDateStr(0),
+        statusList: PayBillStatus.payedList()
       },
       billData: []
     }
diff --git a/src/views/dashboard/DailyBillAmountReport.vue b/src/views/dashboard/DailyBillAmountReport.vue
index b639539..83e5a94 100644
--- a/src/views/dashboard/DailyBillAmountReport.vue
+++ b/src/views/dashboard/DailyBillAmountReport.vue
@@ -104,7 +104,7 @@ export default {
           }
         }],
         series: [{
-          name: '订单金额',
+          name: '支付金额',
           type: 'line',
           data: this.billData.map(item => item.total),
           itemStyle: {
diff --git a/src/views/ss/index/index.vue b/src/views/ss/index/index.vue
index 1d52eeb..7a18f35 100644
--- a/src/views/ss/index/index.vue
+++ b/src/views/ss/index/index.vue
@@ -15,7 +15,7 @@
 
     <el-row :gutter="8">
       <el-col :lg="12" :xs="24">
-        <el-card header="订单对账" class="card-box">
+        <el-card header="支付对账" class="card-box">
           <daily-bill-amount-chart/>
         </el-card>
       </el-col>