每个模板都有自己的头部导航,文章和分类

2026-07-01 15:32:48 +08:00 · 2020-05-12 22:18:15 +08:00
parent 2f7ec6793e
commit 713ed8e432
21 changed files with 80 additions and 49 deletions
--- a/app/admin/controller/Category.php
+++ b/app/admin/controller/Category.php
@@ -80,7 +80,7 @@ class Category extends Common

    ModelCategory::create($post_data);

-    return $this->success('添加成功','index');
+    return $this->success('添加成功',url('index',['type'=>$this->request->param('type')]));

  }

@@ -152,7 +152,7 @@ class Category extends Common

    $model_category->save($post_data);

-    return $this->success('保存成功','index');
+    return $this->success('保存成功',url('index',['type'=>$model_category->getData('type')]));


  }
--- a/app/admin/controller/Post.php
+++ b/app/admin/controller/Post.php
@@ -82,7 +82,7 @@ class Post extends Common
      ]);
    }

-    return $this->success('添加成功', 'index');
+    return $this->success('添加成功',url('index',['type'=>$this->request->param('type')]));
  }

  /**
@@ -180,7 +180,7 @@ class Post extends Common
      }
    }

-    return $this->success('保存成功', 'index');
+    return $this->success('保存成功', url('index',['type'=>$model_post->getData('type')]));
  }

  /**
--- a/app/common/ColumnFormat.php
+++ b/app/common/ColumnFormat.php
@@ -42,7 +42,7 @@ class ColumnFormat
    public static function stringShort($name)
    {
        return Column::make($name,'string')
-        ->setLimit(20)
+        ->setLimit(30)
        ->setDefault('');
    }

--- a/app/index/controller/Common.php
+++ b/app/index/controller/Common.php
@@ -14,31 +14,40 @@ class Common extends BaseController
  {
    parent::initialize();

-    $list_header_nav = Nav::where('type', 1)->order('sort asc')->where('status', 1)->select();
-    View::assign('list_header_nav', $list_header_nav);
+
    $list_nav_slide = Nav::where('type', 3)->order('sort asc')->where('status', 1)->select();
    View::assign('list_nav_slide', $list_nav_slide);
    $list_nav_friend_url = Nav::where('type', 2)->order('sort asc')->where('status', 1)->select();
    View::assign('list_nav_friend_url', $list_nav_friend_url);

    if (!empty($this->indexTplMethod)) {
-
      if (method_exists($this, $this->indexTplMethod)) {
        $this->{$this->indexTplMethod}();
      }
-
    }
    if (!empty($this->indexTplMethodCurrentAction)) {
-
      if (method_exists($this, $this->indexTplMethodCurrentAction)) {
        $this->{$this->indexTplMethodCurrentAction}();
      }
-
    }
  }

+  public function __blog()
+  {
+    $list_header_nav = Nav::where('type', 'blog_header_nav')->order('sort asc')->where('status', 1)->select();
+    View::assign('list_header_nav', $list_header_nav);
+  }
+
+  public function __documents()
+  {
+    $list_header_nav = Nav::where('type', 'document_header_nav')->order('sort asc')->where('status', 1)->select();
+    View::assign('list_header_nav', $list_header_nav);
+  }
+
  public function __easyBlue()
  {
+    $list_header_nav = Nav::where('type', 10)->order('sort asc')->where('status', 1)->select();
+    View::assign('list_header_nav', $list_header_nav);
    $list_nav_index_block_1 = Nav::where('type', 6)->order('sort asc')->where('status', 1)->select();
    View::assign('list_nav_index_block_1', $list_nav_index_block_1);
    $list_nav_index_block_2 = Nav::where('type', 7)->order('sort asc')->where('status', 1)->select();
@@ -47,12 +56,15 @@ class Common extends BaseController

  public function __articles()
  {
-    $list_category_first_level = Category::where('level', 1)->where('status', 1)->select();
+    $list_header_nav = Nav::where('type', 11)->order('sort asc')->where('status', 1)->select();
+    View::assign('list_header_nav', $list_header_nav);
+
+    $list_category_first_level = Category::where('level', 1)->where('status', 1)->where('type',3)->select();
    $this->assign('list_category_first_level', $list_category_first_level);
-    $list_nav_more = Nav::where('type', 8)->order('sort asc')->where('status', 1)->select();
+    $list_nav_more = Nav::where('type', 8)->order('sort asc')->where('status', 1)->where('type',11)->select();
    View::assign('list_nav_more', $list_nav_more);

-    $top_posts = Post::where('is_top',1)->limit(8)->select();
+    $top_posts = Post::where('is_top',1)->limit(8)->where('type',3)->select();
    $this->assign('top_posts',$top_posts);

  }
--- a/app/index/controller/Index.php
+++ b/app/index/controller/Index.php
@@ -24,7 +24,7 @@ class Index extends Common

  public function __blogIndex()
  {
-    $list_category = Category::select();
+    $list_category = Category::where('type','blog_post')->select();

    $this->assign('list_category',$list_category);

@@ -38,6 +38,8 @@ class Index extends Common
      $model_list_post = Post::order('sort desc');
    }

+    $model_list_post->where('type','blog_post');
+
    $list_post = $model_list_post->paginate();

    $this->assign('list_post',$list_post);
@@ -58,12 +60,12 @@ class Index extends Common
    $sub_category = [];

    if(!empty($this->request->param('category_id'))){
-      $sub_category = Category::where('pid',$this->request->param('category_id'))->select();
+      $sub_category = Category::where('pid',$this->request->param('category_id'))->where('type',3)->select();

      if(empty($this->request->param('sub_category_id'))){
        $categorys = [$this->request->param('category_id')];

-        $categorys = array_merge($categorys,array_column((array)Category::getListLevel($this->request->param('category_id')),'id'));
+        $categorys = array_merge($categorys,array_column((array)Category::getListLevel($this->request->param('category_id')),3));

        $categorys_where = PostCategory::whereIn('category_id',$categorys);

@@ -77,6 +79,8 @@ class Index extends Common
      $model_post = Post::where('status',1)->order('id desc');
    }
    
+    $model_post->where('type',3);
+
    $keywords = $this->request->param('keywords');

    if(!empty($keywords)){
--- a/database/migrations/20200417060522_create_table_nav.php
+++ b/database/migrations/20200417060522_create_table_nav.php
@@ -37,7 +37,7 @@ class CreateTableNav extends Migrator
        $table->addColumn(Column::make('create_time','integer')->setSigned(false)->setLimit(10)->setComment('添加时间'));
        $table->addColumn(ColumnFormat::timestamp('update_time'));
        $table->addColumn(ColumnFormat::timestamp('delete_time'));
-        $table->addColumn(Column::make('type','integer')->setLimit(10)->setSigned(false)->setComment('类型,用于区分业务场景:1:PC导航,2:PC轮播图,3:PC友情链接'));
+        $table->addColumn(ColumnFormat::stringShort('type')->setComment('类型,用于区分业务场景:1:PC导航,2:PC轮播图,3:PC友情链接'));
        $table->addColumn(Column::make('img','string')->setLimit(100)->setComment('图片'));
        $table->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述'));
        $table->addColumn(Column::make('target','string')->setLimit(10)->setSigned(false)->setComment('网页链接打开对象,_BLANK,_SELF,iframe_name'));
--- a/database/migrations/20200418120809_create_table_post.php
+++ b/database/migrations/20200418120809_create_table_post.php
@@ -45,7 +45,7 @@ class CreateTablePost extends Migrator
        $table->addColumn(ColumnFormat::stringUrl('jump_to_url')->setComment('跳转链接'));
        $table->addColumn(ColumnFormat::integerTypeStatus('jump_to_url_status')->setComment('0:不显示,1:显示连接,2:自动跳转'));
        $table->addColumn(ColumnFormat::integer('sort')->setComment('排序,越大越靠前'));
-        $table->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'));
+        $table->addColumn(ColumnFormat::stringShort('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'));
        $table->addColumn(Column::make('files','text')->setComment('附件'));
        $table->addColumn(Column::make('pictures','text')->setComment('相册'));
        $table->addColumn(ColumnFormat::stringShort('tpl_name')->setComment('模板名称'));
--- a/database/migrations/20200418120827_create_table_category.php
+++ b/database/migrations/20200418120827_create_table_category.php
@@ -41,7 +41,7 @@ class CreateTableCategory extends Migrator
            ->addColumn(ColumnFormat::stringUrl('title_img')->setComment('附图'))
            ->addColumn(ColumnFormat::stringLong('desc')->setComment('副标题描述'))
            ->addColumn(ColumnFormat::integerTypeStatus('status')->setComment('0:不显示,1:显示'))
-            ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
+            ->addColumn(ColumnFormat::stringShort('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
            ->addIndex('type')
            ->addIndex('pid')
            ->addIndex('status')
--- a/database/migrations/20200418120831_create_table_tag.php
+++ b/database/migrations/20200418120831_create_table_tag.php
@@ -35,7 +35,7 @@ class CreateTableTag extends Migrator
            ->addColumn(ColumnFormat::timestamp('create_time'))
            ->addColumn(ColumnFormat::timestamp('update_time'))
            ->addColumn(ColumnFormat::timestamp('delete_time'))
-            ->addColumn(ColumnFormat::integerTypeStatus('type',1)->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
+            ->addColumn(ColumnFormat::stringShort('type')->setComment('类型,1:文章,有分类有标签,2:页面,无分类无标签,N:其他形式用,用于区分不同的用途'))
            ->addIndex('type')
            ->create();
    }
--- a/public/static/css/skin-1.css
+++ b/public/static/css/skin-1.css
@@ -23,7 +23,7 @@
 }

 .layui-layout-admin .layui-header{
-    background-color: #66CCFF;
+    background-color: #39BDFF;
 }

 .layui-nav {
@@ -138,7 +138,7 @@
 }

 .layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this{
-    background-color: #66CCFF;
+    background-color: #19B3FF;
 }

 .layui-nav-tree .layui-nav-bar{
--- a/view/admin/category/create.html
+++ b/view/admin/category/create.html
@@ -10,7 +10,7 @@

  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'category';
+    var currentLeftNavItem = 'category-{$Request.param.type|default="1"}';
  </script>
 </head>

@@ -36,6 +36,7 @@
              <legend>新增分类</legend>
              <div class="layui-field-box">
                <form class="layui-form" action="{:url('save')}" method="post">
+                  <input type="hidden" name="type" value="{$Request.param.type}">
                  <div class="layui-form-item">
                    <div class="layui-form-label">分类名称</div>
                    <div class="layui-input-block">
--- a/view/admin/category/edit.html
+++ b/view/admin/category/edit.html
@@ -10,7 +10,7 @@

  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'category';
+    var currentLeftNavItem = 'category-{$Request.param.type|default="1"}';
  </script>
 </head>

--- a/view/admin/category/index.html
+++ b/view/admin/category/index.html
@@ -10,7 +10,7 @@

  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'category';
+    var currentLeftNavItem = 'category-{$Request.param.type|default="1"}';
  </script>
 </head>

--- a/view/admin/common/_header.html
+++ b/view/admin/common/_header.html
@@ -16,7 +16,7 @@
        <li class="layui-nav-item header-nav-item" data-name="Post-4" ><a href="{:url('admin/Post/index',['type'=>4])}">文档</a></li>
        {/if}
        {if get_system_config('index_tpl_name') == 'blog_' }
-        <li class="layui-nav-item header-nav-item" data-name="Post-5" ><a href="{:url('admin/Post/index',['type'=>5])}">博客</a></li>
+        <li class="layui-nav-item header-nav-item" data-name="Post-blog_post" ><a href="{:url('admin/Post/index',['type'=>'blog_post'])}">博客</a></li>
        {/if}
        <li class="layui-nav-item header-nav-item" data-name="Admin" ><a href="{:url('admin/Admin/index')}">管理员管理</a></li>
        <li class="layui-nav-item header-nav-item" data-name="System" ><a href="{:url('admin/System/index')}">系统设置</a></li>
--- a/view/admin/common/left_post.html
+++ b/view/admin/common/left_post.html
@@ -2,13 +2,13 @@
    <div class="layui-side-scroll">
        <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
        <ul class="layui-nav layui-nav-tree" lay-filter="test">
-          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="post">
+          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="post-{$Request.param.type|default='1'}">
              <a class="" href="{:url('Post/index',['type'=>$Request.param.type])}">文章管理</a>
          </li>
-          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="category">
+          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="category-{$Request.param.type|default='1'}">
              <a class="" href="{:url('Category/index',['type'=>$Request.param.type])}">分类管理</a>
          </li>
-          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="tag">
+          <li class="layui-nav-item layui-nav-itemed left-nav-item" data-name="tag-{$Request.param.type|default='1'}">
              <a class="" href="{:url('Tag/index',['type'=>$Request.param.type])}">标签管理</a>
          </li>
      </ul>
--- a/view/admin/common/left_system.html
+++ b/view/admin/common/left_system.html
@@ -23,7 +23,9 @@
      <li class="layui-nav-item layui-nav-itemed">
        <a class="" href="javascript:;">简约蓝官网</a>
        <dl class="layui-nav-child">
-
+          <dd class="left-nav-item" data-name="pc-nav-10">
+            <a href="{:url('Nav/index',['type'=>10,'show_img'=>1,'show_target'=>1])}">头部导航</a>
+          </dd>
          <dd class="left-nav-item" data-name="easy_blue"><a href="{:url('System/easyBlue')}">一般参数</a></dd>

          <dd class="left-nav-item" data-name="pc-nav-6">
@@ -34,6 +36,7 @@
          </dd>
          

+
        </dl>
      </li>
    </ul>
@@ -44,7 +47,9 @@
      <li class="layui-nav-item layui-nav-itemed">
        <a class="" href="javascript:;">资讯头条</a>
        <dl class="layui-nav-child">
-
+          <dd class="left-nav-item" data-name="pc-nav-10">
+            <a href="{:url('Nav/index',['type'=>11,'show_target'=>1])}">头部导航</a>
+          </dd>
          <dd class="left-nav-item" data-name="pc-nav-6">
            <a href="{:url('Nav/index',['type'=>8,'show_img'=>0,'show_target'=>1])}">更多导航</a>
          </dd>
@@ -59,7 +64,9 @@
      <li class="layui-nav-item layui-nav-itemed">
        <a class="" href="javascript:;">文档中心</a>
        <dl class="layui-nav-child">
-
+          <dd class="left-nav-item" data-name="pc-nav-document_header_nav">
+            <a href="{:url('Nav/index',['type'=>'document_header_nav','show_target'=>1])}">头部导航</a>
+          </dd>
          <dd class="left-nav-item" data-name="pc-nav-6">
            <a href="{:url('Nav/index',['type'=>9,'show_img'=>0,'show_target'=>1])}">首页目录</a>
          </dd>
@@ -75,8 +82,11 @@
        <a class="" href="javascript:;">博客主题</a>
        <dl class="layui-nav-child">
          
+          <dd class="left-nav-item" data-name="pc-nav-blog_header_nav">
+            <a href="{:url('Nav/index',['type'=>'blog_header_nav','show_target'=>1])}">头部导航</a>
+          </dd>
          <dd class="left-nav-item" data-name="pc-nav-6">
-            <dd class="left-nav-item" data-name="blog"><a href="{:url('System/blog')}">一般参数</a></dd>
+          <dd class="left-nav-item" data-name="blog"><a href="{:url('System/blog')}">一般参数</a></dd>
          </dd>

        </dl>
@@ -88,9 +98,10 @@
      <li class="layui-nav-item layui-nav-itemed">
        <a class="" href="javascript:;">PC管理</a>
        <dl class="layui-nav-child">
-
-          <dd class="left-nav-item" data-name="pc-nav-1"><a
-              href="{:url('Nav/index',['type'=>1,'show_target'=>1])}">PC导航管理</a></dd>
+          <dd class="left-nav-item" data-name="pc-nav-1" title="默认皮肤没有使用">
+            <a href="{:url('Nav/index',['type'=>1,'show_target'=>1])}">头部导航 <i class="layui-icon layui-icon-help"></i>
+            </a>
+          </dd>
          <dd class="left-nav-item" data-name="pc-nav-2"><a
              href="{:url('Nav/index',['type'=>2,'show_target'=>1])}">友情链接管理</a></dd>
          <dd class="left-nav-item" data-name="pc-nav-3"><a
--- a/view/admin/post/create.html
+++ b/view/admin/post/create.html
@@ -11,7 +11,7 @@
  <script src="/static/lib/quill/quill.min.js"></script>
  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'post';
+    var currentLeftNavItem = 'post-{$Request.param.type|default="1"}';
  </script>

  <style>
@@ -42,6 +42,7 @@
        <div class="main-container">
          <div class="layui-row">
            <form action="{:url('save')}" method="POST" class="layui-form" lay-filter="*">
+              <input type="hidden" name="type" value="{$Request.param.type}">
              <div class="layui-col-md9 layui-col-lg10">
                <fieldset class="layui-elem-field">
                  <legend>添加</legend>
@@ -410,7 +411,9 @@
      }

      function loadCategory() {
-        $.get('{:url("Category/index")}',function(result){
+        $.get('{:url("Category/index")}',{
+          type:'{$Request.param.type}'
+        },function(result){
          console.log(result);
          result.data.forEach(category => {
            var prefix = '';
--- a/view/admin/post/edit.html
+++ b/view/admin/post/edit.html
@@ -11,7 +11,7 @@
  <script src="/static/lib/quill/quill.min.js"></script>
  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'post';
+    var currentLeftNavItem = 'post-{$Request.param.type|default="1"}';
  </script>

  <style>
--- a/view/admin/post/index.html
+++ b/view/admin/post/index.html
@@ -10,7 +10,7 @@

  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'post';
+    var currentLeftNavItem = 'post-{$Request.param.type|default="1"}';
  </script>
 </head>

--- a/view/admin/tag/index.html
+++ b/view/admin/tag/index.html
@@ -10,7 +10,7 @@

  <script>
    var currentHeaderNavItem = 'Post-{$Request.param.type|default="1"}';
-    var currentLeftNavItem = 'tag';
+    var currentLeftNavItem = 'tag-{$Request.param.type|default="1"}';
  </script>
 </head>

--- a/view/index/common/_articles_left.html
+++ b/view/index/common/_articles_left.html
@@ -8,7 +8,7 @@
    <div class="nav-left-list">
      <a href="{:url('Index/index')}" {eq name='$Request.param.category_id|default=0' value='0'} class="current" {/eq}>全部</a>
      {volist name='list_header_nav' id='nav'}
-      <a href="{$nav.value}" >{$nav.title}</a>
+      <a href="{$nav.value}" target="{$nav.target}">{$nav.title}</a>
      {/volist}
      {volist name='list_category_first_level' id='category'}
      <a href="{:url('Index/index',['category_id'=>$category.id])}" {eq name='$Request.param.category_id|default=0' value='$category.id'} class="current"{/eq} >{$category.title}</a>