From 43ca8bd41acd713b8b15691c638db6fe48d2d861 Mon Sep 17 00:00:00 2001
From: Huakk <1751826683@qq.com>
Date: Fri, 17 May 2024 18:10:02 +0800
Subject: [PATCH 1/2] fix(custom):

---
 src/pages/admin/verify/verify_list/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/admin/verify/verify_list/index.vue b/src/pages/admin/verify/verify_list/index.vue
index 1d0d753..148206b 100644
--- a/src/pages/admin/verify/verify_list/index.vue
+++ b/src/pages/admin/verify/verify_list/index.vue
@@ -51,10 +51,10 @@ Taro.useLoad((options) => {
 const goodInfo = ref<any>({});
 
 const getData = async (options: any) => {
-  const merInfo = Taro.getStorageSync("mer_info");
+  const merInfo = Taro.getStorageSync("userInfo");
   const res = await getActiveVerifyList({
     oid: options.oid,
-    bid: merInfo.bid,
+    bid: merInfo.data.bid,
   });
   if (!res.data.data.oid) {
     Taro.showToast({

From b9a5993e27a7db8d3a32f585e52d3b3e38661b00 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Mon, 14 Oct 2024 22:12:14 +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/pages/admin/statistics/index.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/pages/admin/statistics/index.vue b/src/pages/admin/statistics/index.vue
index ccf091f..97c6916 100644
--- a/src/pages/admin/statistics/index.vue
+++ b/src/pages/admin/statistics/index.vue
@@ -35,11 +35,22 @@
       </view>
     </view>
     <view class="wrapper">
-      <view class="title">
-        {{ title }}{{ where.type == 1 ? '营业额' : '订单量' }}
+      <view class="flex justify-between">
+        <view>
+          <view class="title">
+            {{ title }}{{ where.type == 1 ? '营业额' : '订单量' }}
+          </view>
+          <view v-if="where.type == 1" class="money">{{
+            dataObj.all || 0
+          }}</view>
+          <view v-else class="money">{{ dataObj.all || 0 }}</view>
+        </view>
+        <view>
+          <view class="title"> {{ title }}现金部分 </view>
+          <view class="money">{{ dataObj.all_discount }}</view>
+        </view>
       </view>
-      <view v-if="where.type == 1" class="money">{{ dataObj.all || 0 }}</view>
-      <view v-else class="money">{{ dataObj.all || 0 }}</view>
+
       <view class="increase">
         <view>
           {{ time === 'date' ? '' : title }}增长率：<text
@@ -395,6 +406,7 @@ const touchEnd = (e: any) => {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       .red {
         color: #ff6969;
       }
@@ -402,6 +414,7 @@ const touchEnd = (e: any) => {
       .green {
         color: #1abb1d;
       }
+
       .iconfont {
         font-size: 23px;
         margin-left: 15px;
@@ -428,6 +441,7 @@ const touchEnd = (e: any) => {
     .top {
       display: flex;
       align-items: center;
+
       text {
         margin-right: 5px;
       }
@@ -436,6 +450,7 @@ const touchEnd = (e: any) => {
         color: #fa2c19;
       }
     }
+
     .table {
       margin-top: 10px;
     }