From 043e84a0b81b119592b3b37fcec986471295d62d Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 7 Apr 2023 20:41:30 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E5=8F=B3=E4=BE=A7=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E5=8E=BB=E6=8E=89=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/NavigationService.php | 171 ++++++++++++++----------------
 1 file changed, 81 insertions(+), 90 deletions(-)

diff --git a/app/service/NavigationService.php b/app/service/NavigationService.php
index bdc950003..97bab991f 100755
--- a/app/service/NavigationService.php
+++ b/app/service/NavigationService.php
@@ -604,101 +604,92 @@ class NavigationService
      */
     public static function HomeHavTopRight($params = [])
     {
-        // 从缓存获取
-        $key = SystemService::CacheKey('shopxo.cache_header_navigation_top_right_key');
-        $data = MyCache($key);
-        if($data === null || MyEnv('app_debug'))
+        // 列表
+        $lang = MyLang('common_service.navigation.header_top_nav_right');
+        $data = [
+            [
+                'name'      => $lang['user_center'],
+                'type'      => 'center',
+                'is_login'  => 1,
+                'badge'     => null,
+                'icon'      => 'am-icon-user',
+                'url'       => MyUrl('index/user/index'),
+                'items'     => [],
+            ],
+            [
+                'name'      => $lang['user_shop'],
+                'type'      => 'myself',
+                'is_login'  => 1,
+                'badge'     => null,
+                'icon'      => 'am-icon-cube',
+                'url'       => '',
+                'items'     => [
+                    [
+                        'name'  => $lang['user_order'],
+                        'url'   => MyUrl('index/order/index'),
+                    ],
+                ],
+            ],
+            [
+                'name'      => $lang['favor'],
+                'type'      => 'favor',
+                'is_login'  => 1,
+                'badge'     => null,
+                'icon'      => 'am-icon-heart',
+                'url'       => '',
+                'items'     => [
+                    [
+                        'name'  => $lang['goods_favor'],
+                        'url'   => MyUrl('index/usergoodsfavor/index'),
+                    ],
+                ],
+            ],
+            [
+                'name'      => $lang['cart'],
+                'type'      => 'cart',
+                'is_login'  => 1,
+                'badge'     => -1,
+                'icon'      => 'am-icon-shopping-cart',
+                'url'       => MyUrl('index/cart/index'),
+                'items'     => [],
+            ],
+            [
+                'name'      => $lang['message'],
+                'type'      => 'message',
+                'is_login'  => 1,
+                'badge'     => 0,
+                'icon'      => 'am-icon-bell',
+                'url'       => MyUrl('index/message/index'),
+                'items'     => [],
+            ],
+        ];
+
+        // 追加多语言
+        if(MyC('home_use_multilingual_status') == 1)
         {
-            // 列表
-            $lang = MyLang('common_service.navigation.header_top_nav_right');
-            $data = [
-                [
-                    'name'      => $lang['user_center'],
-                    'type'      => 'center',
-                    'is_login'  => 1,
-                    'badge'     => null,
-                    'icon'      => 'am-icon-user',
-                    'url'       => MyUrl('index/user/index'),
-                    'items'     => [],
-                ],
-                [
-                    'name'      => $lang['user_shop'],
-                    'type'      => 'myself',
-                    'is_login'  => 1,
-                    'badge'     => null,
-                    'icon'      => 'am-icon-cube',
-                    'url'       => '',
-                    'items'     => [
-                        [
-                            'name'  => $lang['user_order'],
-                            'url'   => MyUrl('index/order/index'),
-                        ],
-                    ],
-                ],
-                [
-                    'name'      => $lang['favor'],
-                    'type'      => 'favor',
-                    'is_login'  => 1,
-                    'badge'     => null,
-                    'icon'      => 'am-icon-heart',
-                    'url'       => '',
-                    'items'     => [
-                        [
-                            'name'  => $lang['goods_favor'],
-                            'url'   => MyUrl('index/usergoodsfavor/index'),
-                        ],
-                    ],
-                ],
-                [
-                    'name'      => $lang['cart'],
-                    'type'      => 'cart',
-                    'is_login'  => 1,
-                    'badge'     => -1,
-                    'icon'      => 'am-icon-shopping-cart',
-                    'url'       => MyUrl('index/cart/index'),
-                    'items'     => [],
-                ],
-                [
-                    'name'      => $lang['message'],
-                    'type'      => 'message',
-                    'is_login'  => 1,
-                    'badge'     => 0,
-                    'icon'      => 'am-icon-bell',
-                    'url'       => MyUrl('index/message/index'),
-                    'items'     => [],
-                ],
-            ];
-
-            // 追加多语言
-            if(MyC('home_use_multilingual_status') == 1)
+            $multilingual_data = MultilingualService::MultilingualData();
+            if(!empty($multilingual_data) && !empty($multilingual_data['data']) && !empty($multilingual_data['default']))
             {
-                $multilingual_data = MultilingualService::MultilingualData();
-                if(!empty($multilingual_data) && !empty($multilingual_data['data']) && !empty($multilingual_data['default']))
-                {
-                    $data[] = [
-                        'name'      => MyLang('lang_title').'['.$multilingual_data['default']['name'].']',
-                        'is_login'  => 0,
-                        'badge'     => null,
-                        'icon'      => 'am-icon-language',
-                        'url'       => '',
-                        'items'     => $multilingual_data['data'],
-                    ];
-                }
+                $data[] = [
+                    'name'      => MyLang('lang_title').'['.$multilingual_data['default']['name'].']',
+                    'is_login'  => 0,
+                    'badge'     => null,
+                    'icon'      => 'am-icon-language',
+                    'url'       => '',
+                    'items'     => $multilingual_data['data'],
+                ];
             }
-
-            // 顶部小导航右侧钩子
-            $hook_name = 'plugins_service_header_navigation_top_right_handle';
-            MyEventTrigger($hook_name, [
-                'hook_name'     => $hook_name,
-                'is_backend'    => true,
-                'params'        => &$params,
-                'data'          => &$data,
-            ]);
-
-            // 存储缓存
-            MyCache($key, $data, 180);
         }
 
+        // 顶部小导航右侧钩子
+        $hook_name = 'plugins_service_header_navigation_top_right_handle';
+        MyEventTrigger($hook_name, [
+            'hook_name'     => $hook_name,
+            'is_backend'    => true,
+            'params'        => &$params,
+            'data'          => &$data,
+        ]);
+
         // 实时数据处理
         if(!empty($data) && !empty($params['user']))
         {