From 344e1d79d70d1d347dfd95c90317e297902c7e0b Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Tue, 21 Jan 2025 20:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E4=B8=AD=20?=
 =?UTF-8?q?=E5=90=8E=E5=8A=A0=E7=9A=84=E6=89=93=E5=8C=85=E8=B4=B9=20?=
 =?UTF-8?q?=E8=BF=90=E8=B4=B9=20=E6=B2=A1=E6=9C=89=E7=AE=97=E5=9C=A8?=
 =?UTF-8?q?=E6=80=BB=E9=A2=9D=E9=87=8C=E9=9D=A2=20=E3=80=90=E8=BF=87=20=20?=
 =?UTF-8?q?=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           | 33 +++++++++++++++++++
 .../components/main/broadcast/banner.vue      | 31 +++++++++++++++++
 .../components/main/broadcast/notice.vue      | 31 +++++++++++++++++
 .../layout/components/main/order/stat.vue     |  6 ++--
 4 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 src/views/layout/components/main/broadcast/banner.vue
 create mode 100644 src/views/layout/components/main/broadcast/notice.vue

diff --git a/src/router/index.js b/src/router/index.js
index 808c1a8..4b0c9be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -388,6 +388,39 @@ const routes = [
       }
     ]
   },
+  {
+    path: '/broadcast',
+    component: Layout,
+    redirect: '/broadcast/banner',
+    meta: {
+      title: '广告管理',
+      icon: 'iconfont icon-guanliyuan',
+      roles: ['admin', 'editor'],
+      tapName: 'admin'
+    },
+    children: [
+      {
+        path: '/broadcast/banner',
+        component: () => import('@/views/layout/components/main/broadcast/banner'),
+        meta: {
+          title: 'banner设置',
+          icon: 'iconfont icon-yonghuguanli',
+          roles: ['admin', 'editor'],
+          tapName: 'admin'
+        }
+      },
+      {
+        path: '/broadcast/notice',
+        component: () => import('@/views/layout/components/main/broadcast/notice'),
+        meta: {
+          title: '滚动通知设置',
+          icon: 'iconfont icon-yonghuguanli',
+          roles: ['admin', 'editor'],
+          tapName: 'admin'
+        }
+      }
+    ]
+  },
   {
     path: '/order',
     component: Layout,
diff --git a/src/views/layout/components/main/broadcast/banner.vue b/src/views/layout/components/main/broadcast/banner.vue
new file mode 100644
index 0000000..c873016
--- /dev/null
+++ b/src/views/layout/components/main/broadcast/banner.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="app-container">
+    banner
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Banner',
+  data () {
+    return {
+    }
+  },
+  components: {
+  },
+  computed: {
+  },
+  methods: {
+  },
+  watch: {
+  },
+  created () {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/theme.scss";
+
+</style>
diff --git a/src/views/layout/components/main/broadcast/notice.vue b/src/views/layout/components/main/broadcast/notice.vue
new file mode 100644
index 0000000..eb8c5d1
--- /dev/null
+++ b/src/views/layout/components/main/broadcast/notice.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="app-container">
+    notice
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Notice',
+  data () {
+    return {
+    }
+  },
+  components: {
+  },
+  computed: {
+  },
+  methods: {
+  },
+  watch: {
+  },
+  created () {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/styles/theme.scss";
+
+</style>
diff --git a/src/views/layout/components/main/order/stat.vue b/src/views/layout/components/main/order/stat.vue
index 9468a02..3806a9d 100644
--- a/src/views/layout/components/main/order/stat.vue
+++ b/src/views/layout/components/main/order/stat.vue
@@ -286,7 +286,7 @@ export default {
     },
     // 日收款订单 营业额总和
     dayPaidTotal () {
-      return formatPrice(this.dayPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0))
+      return formatPrice(this.dayPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
     },
     // 过滤出 日 退款付点单
     dayRefund () {
@@ -331,7 +331,7 @@ export default {
     },
     // 月收款订单 营业额总和
     monthPaidTotal () {
-      return formatPrice(this.monthPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0))
+      return formatPrice(this.monthPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
     },
     // 过滤出 月 退款付点单
     monthRefund () {
@@ -377,7 +377,7 @@ export default {
     },
     // 年收款订单 营业额总和
     yearPaidTotal () {
-      return formatPrice(this.yearPaid.reduce((total, item) => total + Number(item.total_price) - Number(item.refund_price), 0))
+      return formatPrice(this.yearPaid.reduce((total, item) => total + Number(item.total_price) + Number(item.transport_price) + Number(item.pack_price) - Number(item.refund_price), 0))
     },
     // 过滤出 年 退款付点单
     yearRefund () {