From 01a68fa371b87926b7ed2db87347c830abdf1cc8 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Mon, 9 Sep 2024 00:51:00 +0000
Subject: [PATCH]  * [bug] use default menu in tutorial.

---
 module/common/model.php | 2 +-
 module/custom/model.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 87bc6c9fd0..3199a37dce 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -622,7 +622,7 @@ class commonModel extends model
 
         $menuOrder     = array();
         $hasCustomMenu = false;
-        if(isset($config->customMenu->nav) && !$useDefault)
+        if(isset($config->customMenu->nav) && !$useDefault && !commonModel::isTutorialMode())
         {
             $items = json_decode($config->customMenu->nav);
             foreach($items as $item) $menuOrder[$item->order] = $item->name;
diff --git a/module/custom/model.php b/module/custom/model.php
index c514638943..043fc419da 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -451,7 +451,7 @@ class customModel extends model
 
         /* 获取自定义过的导航。 */
         $customKey  = $isHomeMenu ? $app->tab . '-home' : ($module == 'main' ? $app->tab : $app->tab . '-' . $module);
-        $customMenu = isset($config->customMenu->{$customKey}) ? $config->customMenu->{$customKey}: array();
+        $customMenu = (isset($config->customMenu->{$customKey}) && !commonModel::isTutorialMode()) ? $config->customMenu->{$customKey}: array();
 
         if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu);
         if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score);