From 055c05439662ce0f9b6280f98f834758dc5962d0 Mon Sep 17 00:00:00 2001
From: yyyzq <superyexiyu@163.com>
Date: Tue, 6 Jul 2021 10:00:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A6=82=E5=86=B5=E9=A1=B5=E9=9D=A2-?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/OrderOverview.vue    | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/views/dashboard/components/OrderOverview.vue b/src/views/dashboard/components/OrderOverview.vue
index 733499c..178f03b 100644
--- a/src/views/dashboard/components/OrderOverview.vue
+++ b/src/views/dashboard/components/OrderOverview.vue
@@ -2,35 +2,62 @@
   <a-card class="app-dashboard-overview" :hoverable="true">
     <a-row :gutter="20">
       <a-col :span="5">
-        <h4 class="flag">1</h4>
+        <h4 class="flag">{{ orderData.forwardingOrderNum }}</h4>
         <p>待发货订单</p>
       </a-col>
       <a-col :span="5">
-        <h4>1</h4>
+        <h4>{{ orderData.rightsOrderProtectionNum }}</h4>
         <p>维权订单</p>
       </a-col>
       <a-col :span="5">
-        <h4>1</h4>
+        <h4>{{ orderData.yesterdayOrderNum }}</h4>
         <p>昨日订单</p>
       </a-col>
       <a-col :span="5">
-        <h4>¥0.00</h4>
+        <h4>¥{{ orderData.yesterdayTransactionAmount }}</h4>
         <p>昨日交易额</p>
       </a-col>
       <a-col :span="5">
-        <h4>¥0.00</h4>
+        <h4>¥{{ orderData.withdrawalBalance }}</h4>
         <p>可提现余额</p>
       </a-col>
     </a-row>
   </a-card>
 </template>
 
-<script>
-import { defineComponent } from 'vue'
+<script lang="ts">
+import { defineComponent, reactive } from 'vue'
+import request from '@/utils/request'
 
 export default defineComponent({
   setup() {
-    return {}
+    const orderData = reactive({
+      id: 0,
+      forwardingOrderNum: 0,
+      rightsOrderProtectionNum: 0,
+      yesterdayOrderNum: 0,
+      yesterdayTransactionAmount: '0.00',
+      withdrawalBalance: '0.00',
+      storeId: 0,
+      createTime: '',
+      updateTime: '',
+    })
+
+    request.get('/api/order/statical/yesterday').then((res) => {
+      if (res) {
+        orderData.id = res.id
+        orderData.forwardingOrderNum = res.forwardingOrderNum
+        orderData.rightsOrderProtectionNum = res.rightsOrderProtectionNum
+        orderData.yesterdayOrderNum = res.yesterdayOrderNum
+        orderData.withdrawalBalance = res.withdrawalBalance
+        orderData.storeId = res.storeId
+        orderData.createTime = res.createTime
+        orderData.updateTime = res.updateTimes
+      }
+    })
+    return {
+      orderData,
+    }
   },
 })
 </script>
-- 
Gitee


From 0524c85d01774febdea0265d483e50e217fb5ddd Mon Sep 17 00:00:00 2001
From: yyyzq <superyexiyu@163.com>
Date: Tue, 6 Jul 2021 10:30:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E7=A9=BA?=
 =?UTF-8?q?=E5=80=BC=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.ts                            |  3 +++
 .../dashboard/components/OrderOverview.vue    | 20 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 src/utils/index.ts

diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 0000000..d258cee
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,3 @@
+export const isEmptyObj = (obj: object) => {
+    Object.keys(obj).length === 0
+}
\ No newline at end of file
diff --git a/src/views/dashboard/components/OrderOverview.vue b/src/views/dashboard/components/OrderOverview.vue
index 178f03b..8bcb2d6 100644
--- a/src/views/dashboard/components/OrderOverview.vue
+++ b/src/views/dashboard/components/OrderOverview.vue
@@ -28,6 +28,7 @@
 <script lang="ts">
 import { defineComponent, reactive } from 'vue'
 import request from '@/utils/request'
+import { isEmptyObj } from '@/utils/index'
 
 export default defineComponent({
   setup() {
@@ -44,16 +45,17 @@ export default defineComponent({
     })
 
     request.get('/api/order/statical/yesterday').then((res) => {
-      if (res) {
-        orderData.id = res.id
-        orderData.forwardingOrderNum = res.forwardingOrderNum
-        orderData.rightsOrderProtectionNum = res.rightsOrderProtectionNum
-        orderData.yesterdayOrderNum = res.yesterdayOrderNum
-        orderData.withdrawalBalance = res.withdrawalBalance
-        orderData.storeId = res.storeId
-        orderData.createTime = res.createTime
-        orderData.updateTime = res.updateTimes
+      if (!res || isEmptyObj(res)) {
+        return
       }
+      orderData.id = res.id
+      orderData.forwardingOrderNum = res.forwardingOrderNum
+      orderData.rightsOrderProtectionNum = res.rightsOrderProtectionNum
+      orderData.yesterdayOrderNum = res.yesterdayOrderNum
+      orderData.withdrawalBalance = res.withdrawalBalance
+      orderData.storeId = res.storeId
+      orderData.createTime = res.createTime
+      orderData.updateTime = res.updateTimes
     })
     return {
       orderData,
-- 
Gitee