From 30bc867ed50796d459760862c7dfa49b7935e381 Mon Sep 17 00:00:00 2001
From: microrain <xinjy@qq.com>
Date: Mon, 5 Feb 2018 13:46:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E6=96=B0=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E7=AD=9B=E9=80=89=E7=9A=84=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Category.php  | 31 +++++++++++++++-------
 application/admin/view/category/index.html | 10 ++++++-
 public/assets/js/backend/category.js       | 30 ++++++++++++++++++---
 3 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/application/admin/controller/Category.php b/application/admin/controller/Category.php
index ca7e31f4..b16c4d47 100644
--- a/application/admin/controller/Category.php
+++ b/application/admin/controller/Category.php
@@ -46,22 +46,33 @@ class Category extends Backend
         if ($this->request->isAjax())
         {
             $search = $this->request->request("search");
+            $type = $this->request->request("type");
+
             //构造父类select列表选项数据
             $list = [];
-            if ($search)
-            {
+
                 foreach ($this->categorylist as $k => $v)
                 {
-                    if (stripos($v['name'], $search) !== false || stripos($v['nickname'], $search) !== false)
-                    {
-                        $list[] = $v;
+                    if ($search) {
+                        if ($v['type'] == $type && stripos($v['name'], $search) !== false || stripos($v['nickname'], $search) !== false)
+                        {
+                            if($type == "all" || $type == null) {
+                                $list = $this->categorylist;
+                            } else {
+                                $list[] = $v;
+                            }
+                        }
+                    } else {
+                        if($type == "all" || $type == null) {
+                            $list = $this->categorylist;
+                        } else if ($v['type'] == $type){
+                            $list[] = $v;
+                        }
+
                     }
+
                 }
-            }
-            else
-            {
-                $list = $this->categorylist;
-            }
+
             $total = count($list);
             $result = array("total" => $total, "rows" => $list);
 
diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html
index 3c07c85b..b457d3ce 100644
--- a/application/admin/view/category/index.html
+++ b/application/admin/view/category/index.html
@@ -1,6 +1,14 @@
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    <div class="panel-heading">
+        {:build_heading()}
+        <ul class="nav nav-tabs">
+            <li class="active"><a href="all" data-toggle="tab">全部</a></li>
+            {foreach name="typeList" item="vo"}
+                <li><a href="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
 
+    </div>
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
diff --git a/public/assets/js/backend/category.js b/public/assets/js/backend/category.js
index 6b9750fb..6c4bb675 100644
--- a/public/assets/js/backend/category.js
+++ b/public/assets/js/backend/category.js
@@ -15,10 +15,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 }
             });
 
-            var table = $("#table");
 
-            // 初始化表格
-            table.bootstrapTable({
+            var table = $("#table");
+            var tableOptions = {
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 escape: false,
                 pk: 'id',
@@ -39,10 +38,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
-            });
+            };
+            // 初始化表格
+            table.bootstrapTable(tableOptions);
 
             // 为表格绑定事件
             Table.api.bindevent(table);
+
+            //绑定TAB事件
+            $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+                // var options = table.bootstrapTable(tableOptions);
+                var typeStr = $(this).attr("href");
+                var options = table.bootstrapTable('getOptions');
+                options.pageNumber = 1;
+                options.queryParams = function (params) {
+                    // params.filter = JSON.stringify({type: typeStr});
+                    params.type = typeStr;
+
+                    return params;
+                };
+                table.bootstrapTable('refresh', {});
+                return false;
+
+            });
+
+            //必须默认触发shown.bs.tab事件
+            // $('ul.nav-tabs li.active a[data-toggle="tab"]').trigger("shown.bs.tab");
+
         },
         add: function () {
             Controller.api.bindevent();

From 208b94894b23441759930c75c39b43f9a6d6e73d Mon Sep 17 00:00:00 2001
From: microrain <xinjy@qq.com>
Date: Mon, 5 Feb 2018 13:52:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=AA=E6=8C=89?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=96=87=E4=BB=B6=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/category/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html
index b457d3ce..da8cf509 100644
--- a/application/admin/view/category/index.html
+++ b/application/admin/view/category/index.html
@@ -2,7 +2,7 @@
     <div class="panel-heading">
         {:build_heading()}
         <ul class="nav nav-tabs">
-            <li class="active"><a href="all" data-toggle="tab">全部</a></li>
+            <li class="active"><a href="all" data-toggle="tab">{:__('All')}</a></li>
             {foreach name="typeList" item="vo"}
                 <li><a href="{$key}" data-toggle="tab">{$vo}</a></li>
             {/foreach}