From 0c9f90f0e4f401693c63e6c0c8b3a535b056aee4 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Sun, 11 Aug 2024 20:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0=E7=94=9F?=
 =?UTF-8?q?=E6=B4=BB=E8=8F=9C=E5=8D=95=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/decoration/MenuDecorate.php       |  6 ++++--
 app/admin/logic/decoration/MenuDecorateLogic.php       | 10 +++++++++-
 app/admin/validate/decoration/MenuDecorateValidate.php |  5 +++++
 app/common/enum/MenuEnum.php                           |  3 ++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/decoration/MenuDecorate.php b/app/admin/controller/decoration/MenuDecorate.php
index 63f82689..b19ae84f 100755
--- a/app/admin/controller/decoration/MenuDecorate.php
+++ b/app/admin/controller/decoration/MenuDecorate.php
@@ -64,8 +64,8 @@ class MenuDecorate extends AdminBase{
         }
         $type = $this->request->get('type');
         $menu_type = MenuEnum::INDEX;
-        if(2 == $type){
-            $menu_type = MenuEnum::CENTRE;
+        if(3 == $type){
+            $menu_type = MenuEnum::LOCAL;
         }
         return view('',['menu_list'=>$menu_type]);
     }
@@ -95,6 +95,8 @@ class MenuDecorate extends AdminBase{
         $menu_type = MenuEnum::INDEX;
         if(2 == $type){
             $menu_type = MenuEnum::CENTRE;
+        } else if(3 == $type) {
+            $menu_type = MenuEnum::LOCAL;
         }
         return view('',['menu_list'=>$menu_type,'detail'=>$detail]);
     }
diff --git a/app/admin/logic/decoration/MenuDecorateLogic.php b/app/admin/logic/decoration/MenuDecorateLogic.php
index e24ab371..64d8c41c 100755
--- a/app/admin/logic/decoration/MenuDecorateLogic.php
+++ b/app/admin/logic/decoration/MenuDecorateLogic.php
@@ -42,7 +42,15 @@ class MenuDecorateLogic extends Logic {
 
         $list = $lists->items();
         $count = $lists->total();
-        $menu_type = 1 == $get['type'] ? 'index' : 'center';
+        if (1 == $get['type']) {
+            $menu_type = 'index';
+        } else if (2 == $get['type']) {
+            $menu_type = 'center';
+        } else if (3 == $get['type']) {
+            $menu_type = 'local';
+        }
+
+//        $menu_type = 1 == $get['type'] ? 'index' : 'center';
         foreach ($list as $key => $menu){
             if(1 == $menu['link_type']){
                 $list[$key]['link_address'] = MenuEnum::getMenu($menu_type,$menu['link_address'])['name'] ?? '';
diff --git a/app/admin/validate/decoration/MenuDecorateValidate.php b/app/admin/validate/decoration/MenuDecorateValidate.php
index 310039d0..b04f0a07 100755
--- a/app/admin/validate/decoration/MenuDecorateValidate.php
+++ b/app/admin/validate/decoration/MenuDecorateValidate.php
@@ -60,6 +60,11 @@ class MenuDecorateValidate extends Validate{
             if(2 == $data['type']){
                 $menu_list = MenuEnum::CENTRE;
             }
+
+            if(3 == $data['type']){
+                $menu_list = MenuEnum::LOCAL;
+            }
+
             $menu_index = array_column($menu_list,'index');
 
             if(!in_array($value,$menu_index)) {
diff --git a/app/common/enum/MenuEnum.php b/app/common/enum/MenuEnum.php
index 4b1f01d5..7a59021b 100755
--- a/app/common/enum/MenuEnum.php
+++ b/app/common/enum/MenuEnum.php
@@ -411,10 +411,11 @@ class MenuEnum{
         ]
     ];
 
+    // 本地生活
     const LOCAL = [
         [
             'index'         => 300,
-            'name'          => '我的钱包',
+            'name'          => '我的钱包123',
             'link'          => '/bundle/pages/user_wallet/user_wallet',
             'is_tab'        => 0,
             'link_type'     => 1,