From 36612722e10987755bfaa6343b5b7b071534a33c Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Sat, 5 Oct 2024 04:21:55 +0800
Subject: [PATCH 1/2] mod(custom): \!

---
 .idea/.gitignore            |  5 +++++
 .idea/git_toolbox_blame.xml |  6 ++++++
 .idea/jdt-mer.iml           | 12 ++++++++++++
 .idea/modules.xml           |  8 ++++++++
 .idea/vcs.xml               |  6 ++++++
 5 files changed, 37 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/git_toolbox_blame.xml
 create mode 100644 .idea/jdt-mer.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..bf2de99
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
new file mode 100644
index 0000000..04ede99
--- /dev/null
+++ b/.idea/git_toolbox_blame.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jdt-mer.iml b/.idea/jdt-mer.iml
new file mode 100644
index 0000000..0b872d8
--- /dev/null
+++ b/.idea/jdt-mer.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..8aab5b9
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-mer.iml" filepath="$PROJECT_DIR$/.idea/jdt-mer.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..c8397c9
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 614923b3956fd8883edfce8ec1f49119a76c5330 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Mon, 14 Oct 2024 22:10:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(custom):=20=E7=8E=B0=E9=87=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/index1/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/order/index1/index.vue b/src/views/order/index1/index.vue
index 1d28c54..b233852 100644
--- a/src/views/order/index1/index.vue
+++ b/src/views/order/index1/index.vue
@@ -23,6 +23,11 @@
               <n-number-animation :from="0" :to="cardData.commission" :precision="2" />
             </n-statistic>
           </n-card>
+          <n-card ml-10 w-200 rounded-5>
+            <n-statistic label="现金部分" tabular-nums>
+              <n-number-animation :from="0" :to="cardData.discount_number" :precision="2" />
+            </n-statistic>
+          </n-card>
         </div>
       </n-col>
       <n-col :span="24" mt-10>
@@ -426,6 +431,7 @@ const getList = async () => {
     cardData.value.count = res.data.total
     cardData.value.commission = res.data.total_commission
     cardData.value.pulse = res.data.total_pulse
+    cardData.value.discount_number = res.data.discount_number
   } catch (error) {
     $message.error(error.msg)
     throw error