From 6a4693fdee40a6a5f779e1c0307c19b63fd723e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 20 Mar 2023 10:37:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=A3=E9=87=91=E8=BD=AC=E5=85=A5=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/Common.php                  | 8 ++++----
 .../app/api/controller/v1/user/UserRechargeController.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/adminapi/controller/Common.php b/crmeb/app/adminapi/controller/Common.php
index 92df9cd54..e32274043 100644
--- a/crmeb/app/adminapi/controller/Common.php
+++ b/crmeb/app/adminapi/controller/Common.php
@@ -235,28 +235,28 @@ class Common extends AuthController
         if ($data['ordernum'] != 0) {
             $value[] = [
                 'title' => "您有$data[ordernum]个待发货的订单",
-                'type' => 'bulb',
+                'type' => 1,
                 'url' => '/admin/order/list?status=1'
             ];
         }
         if ($data['inventory'] != 0) {
             $value[] = [
                 'title' => "您有$data[inventory]个商品库存预警",
-                'type' => 'information',
+                'type' => 2,
                 'url' => '/admin/product/product_list?type=5',
             ];
         }
         if ($data['commentnum'] != 0) {
             $value[] = [
                 'title' => "您有$data[commentnum]条评论待回复",
-                'type' => 'bulb',
+                'type' => 3,
                 'url' => '/admin/product/product_reply?is_reply=0'
             ];
         }
         if ($data['reflectnum'] != 0) {
             $value[] = [
                 'title' => "您有$data[reflectnum]个提现申请待审核",
-                'type' => 'bulb',
+                'type' => 4,
                 'url' => '/admin/finance/user_extract/index?status=0',
             ];
         }
diff --git a/crmeb/app/api/controller/v1/user/UserRechargeController.php b/crmeb/app/api/controller/v1/user/UserRechargeController.php
index 57302764d..3c4be9601 100644
--- a/crmeb/app/api/controller/v1/user/UserRechargeController.php
+++ b/crmeb/app/api/controller/v1/user/UserRechargeController.php
@@ -53,7 +53,7 @@ class UserRechargeController
         $uid = (int)$request->uid();
         $re = $this->services->recharge($uid, $price, $recharId, $type, $from, true);
         if ($re) {
-            $payType = $re['pay_type'];
+            $payType = $re['pay_type'] ?? '';
             unset($re['pay_type']);
             return app('json')->status($payType, 410125, $re);
         }