From 3737d0711b345bc5c6e5c8848b404043d3d68af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Thu, 23 Feb 2023 10:08:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/admin/statistics/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/pages/admin/statistics/index.vue b/template/uni-app/pages/admin/statistics/index.vue
index b83c4a3dd..07fa50ec6 100644
--- a/template/uni-app/pages/admin/statistics/index.vue
+++ b/template/uni-app/pages/admin/statistics/index.vue
@@ -25,7 +25,7 @@
 		</div>
 		<div class="wrapper">
 			<div class="title">
-				{{ time == 'date'?'':title }}{{ this.where.type == 1 ? $t(`营业额（元）`) : $t(`订单量（份）`) }}
+				{{ time == 'date'?'':title }}{{ where.type == 1 ? $t(`营业额（元）`) : $t(`订单量（份）`) }}
 			</div>
 			<div class="money">{{ time_price }}</div>
 			<div class="increase acea-row row-between-wrapper">

From ae9b64082ca2ad23e442e802daa555f94d2a0a62 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Thu, 23 Feb 2023 10:21:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/OtherOrderServices.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crmeb/app/services/order/OtherOrderServices.php b/crmeb/app/services/order/OtherOrderServices.php
index 2c81611b5..64d08c4ad 100644
--- a/crmeb/app/services/order/OtherOrderServices.php
+++ b/crmeb/app/services/order/OtherOrderServices.php
@@ -563,6 +563,9 @@ class OtherOrderServices extends BaseServices
                     case "alipay" :
                         $v['pay_type'] = "支付宝";
                         break;
+                    case 'allinpay':
+                        $v['pay_type'] = "通联支付";
+                        break;
                     case "admin" :
                         $v['pay_type'] = "后台赠送";
                         break;