From b6df68f43c4924eff2e23c53f741140c5ed1f985 Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Thu, 22 Aug 2024 20:28:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=9F=E8=AE=A1=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=94=B9=E6=88=90=E6=94=AF=E4=BB=98=E5=AE=9D=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=AD=E8=B4=B9=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dashboard/components/visit-hour.vue |  3 ++-
 src/views/yunxinwei/withdraw/index.vue               |  4 ++--
 src/views/yunxinwei/xufei/index.vue                  | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/system/dashboard/components/visit-hour.vue b/src/views/system/dashboard/components/visit-hour.vue
index 7dbe3ac..6c8778c 100644
--- a/src/views/system/dashboard/components/visit-hour.vue
+++ b/src/views/system/dashboard/components/visit-hour.vue
@@ -27,6 +27,7 @@
   import VChart from 'vue-echarts';
   import { getSaleroomList, getVisitHourList } from "@/api/dashboard/analysis";
   import useEcharts from '@/utils/use-echarts';
+  import dayjs from 'dayjs';
 
   use([
     CanvasRenderer,
@@ -60,7 +61,7 @@
             {
               type: 'category',
               boundaryGap: false,
-              data: data.map((d) => d.startStatisticsDate)
+              data: data.map((d) => dayjs(d.startStatisticsDate).format('YYYY-MM-DD'))
             }
           ],
           yAxis: [
diff --git a/src/views/yunxinwei/withdraw/index.vue b/src/views/yunxinwei/withdraw/index.vue
index 360f954..c430b7b 100644
--- a/src/views/yunxinwei/withdraw/index.vue
+++ b/src/views/yunxinwei/withdraw/index.vue
@@ -25,7 +25,7 @@
             <template v-if="column.key === 'action' && record.applyStatus == 10">
               <a-space>
                 <a-popconfirm
-                  title="确定已完成线下打款？"
+                  title="确定通过支付宝线上打款？"
                   @confirm="auditOffline(record)">
                   <a class="ele-text-success">通过</a>
                 </a-popconfirm>
@@ -259,7 +259,7 @@
   const auditOffline = (param) => {
     pass({
     	id: param.id,
-    	payType: 40
+    	payType: 20
     }).then(result => {
       message.success(result)
       reload()
diff --git a/src/views/yunxinwei/xufei/index.vue b/src/views/yunxinwei/xufei/index.vue
index 1a68474..ef34f9c 100644
--- a/src/views/yunxinwei/xufei/index.vue
+++ b/src/views/yunxinwei/xufei/index.vue
@@ -38,6 +38,11 @@
               {{ record.merchantName }}
             </template>
 
+            <template v-if="column.key === 'payStatus'">
+              <span v-if="record.payStatus === 20" color="green">已付</span>
+              <span v-if="record.payStatus === 10" color="red">未付</span>
+            </template>
+
             <template v-if="column.key === 'orderSource'">
               <span v-if="record.orderSource === 10" color="green"
                 >普通订单</span
@@ -134,6 +139,11 @@
       dataIndex: 'payPrice',
       key: 'payPrice'
     },
+    {
+      title: '是否付款',
+      dataIndex: 'payStatus',
+      key: 'payStatus'
+    },
     {
       title: '创建时间',
       dataIndex: 'createTime',