From 17ba97fcbaff5e99db48090803433e76f0b4da84 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 20 Jan 2024 21:31:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/ShortcutMenuService.php | 46 ++++++++++++++++++-----------
 app/service/StatisticalService.php  |  2 +-
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/service/ShortcutMenuService.php b/app/service/ShortcutMenuService.php
index 2eec73d9e..db2f646a5 100644
--- a/app/service/ShortcutMenuService.php
+++ b/app/service/ShortcutMenuService.php
@@ -86,34 +86,44 @@ class ShortcutMenuService
                 }
 
                 // 是否选择了菜单
-                if(!empty($v['menu']) && !empty($menu['admin_left_menu']))
+                if(!empty($v['menu']))
                 {
-                    foreach($menu['admin_left_menu'] as $mv)
+                    // 是否是插件
+                    if(substr($v['menu'], 0, 8) == 'plugins-')
                     {
-                        if(empty($mv['items']))
+                        $v['url'] = PluginsAdminUrl(substr($v['menu'], 8), 'admin', 'index');
+                    } else {
+                        // 左侧菜单数据
+                        if(!empty($menu['admin_left_menu']))
                         {
-                            if($mv['id'] == $v['menu'])
+                            foreach($menu['admin_left_menu'] as $mv)
                             {
-                                $v['url'] = $mv['url'];
-                                break;
-                            }
-                        } else {
-                            foreach($mv['items'] as $mvs)
-                            {
-                                if(empty($mvs['items']))
+                                if(empty($mv['items']))
                                 {
-                                    if($mvs['id'] == $v['menu'])
+                                    if($mv['id'] == $v['menu'])
                                     {
-                                        $v['url'] = $mvs['url'];
-                                        break 2;
+                                        $v['url'] = $mv['url'];
+                                        break;
                                     }
                                 } else {
-                                    foreach($mvs['items'] as $mvss)
+                                    foreach($mv['items'] as $mvs)
                                     {
-                                        if($mvss['id'] == $v['menu'])
+                                        if(empty($mvs['items']))
                                         {
-                                            $v['url'] = $mvss['url'];
-                                            break 3;
+                                            if($mvs['id'] == $v['menu'])
+                                            {
+                                                $v['url'] = $mvs['url'];
+                                                break 2;
+                                            }
+                                        } else {
+                                            foreach($mvs['items'] as $mvss)
+                                            {
+                                                if($mvss['id'] == $v['menu'])
+                                                {
+                                                    $v['url'] = $mvss['url'];
+                                                    break 3;
+                                                }
+                                            }
                                         }
                                     }
                                 }
diff --git a/app/service/StatisticalService.php b/app/service/StatisticalService.php
index 8461e09b2..91d31a787 100755
--- a/app/service/StatisticalService.php
+++ b/app/service/StatisticalService.php
@@ -705,7 +705,7 @@ class StatisticalService
         {
             $data = [];
         } else {
-            $data = Db::name('OrderDetail')->field('goods_id, sum(buy_number) AS value')->where('order_id', 'IN', $order_ids)->group('goods_id')->order('value desc')->limit(30)->select()->toArray();
+            $data = Db::name('OrderDetail')->field('goods_id, sum(buy_number) AS value')->where('order_id', 'IN', $order_ids)->group('goods_id')->order('value desc')->limit(13)->select()->toArray();
         }
 
         if(!empty($data))