From edecf5db77e9094f22e1ad3abb80c2bd3e245c81 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Tue, 8 Nov 2016 10:21:03 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=AE=8C=E5=96=84JS=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE=E5=B8=A6?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Menu.php    | 8 ++------
 public/admin/static/js/template.js       | 4 +++-
 public/admin/static/js/template/table.js | 9 ++++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 4641c87..07abbce 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -35,10 +35,6 @@ class Menu extends Base {
                 [
                     'field' => 'sort',
                     'info' => '排序'
-                ],
-                [
-                    'field' => 'action',
-                    'info' => '操作'
                 ]
             ],
             'topButton' => [
@@ -46,14 +42,14 @@ class Menu extends Base {
                     'href' => url('Menu/add'),
                     'class'=> 'btn-success',
                     'info'=> '新增',
-                    'icon' => 'plus',
+                    'icon' => 'fa fa-plus',
                     'confirm' => 0,
                 ],
                 [
                     'href' => url('Menu/del'),
                     'class'=> 'btn-danger',
                     'info'=> '删除',
-                    'icon' => 'trash',
+                    'icon' => 'fa fa-trash',
                     'confirm' => 1,
                 ]
             ],
diff --git a/public/admin/static/js/template.js b/public/admin/static/js/template.js
index 15b8eeb..7461904 100644
--- a/public/admin/static/js/template.js
+++ b/public/admin/static/js/template.js
@@ -88,7 +88,9 @@ function refresh( url ) {
         success: function(data){
             if( data.code == 200 ){
                 if( data.data.tempType == 'table' ){
-                    $.getScript('/static/js/template/table.js');
+                    $.getScript('/static/js/template/table.js', function (){
+                        $('#content').html($.buildTable(data.data));
+                    });
                 }
             }else{
                 $.alertMsg('请求失败！')
diff --git a/public/admin/static/js/template/table.js b/public/admin/static/js/template/table.js
index 8a3f06e..ac3cf74 100644
--- a/public/admin/static/js/template/table.js
+++ b/public/admin/static/js/template/table.js
@@ -4,14 +4,17 @@
 (function ($) {
     $.buildTable = function ( tableObj ) {
         var tableHtml = '<div class="box"><div class="box-body">';
-        if( tableObj.topButton ){
+        if( tableObj.rightButton && tableObj.rightButton.length ){
+            tableObj.header.push({field:"action",info:"操作"});
+        }
+        if( tableObj.topButton && tableObj.topButton.length ){
             tableHtml += buildTopButton( tableObj );
         }
         tableHtml += '<table class="table table-bordered"> <tbody>';
-        if( tableObj.header ){
+        if( tableObj.header && tableObj.header.length ){
             tableHtml += buildHeader( tableObj );
         }
-        if( tableObj.data ){
+        if( tableObj.data && tableObj.data.length ){
             tableHtml += buildDataList( tableObj );
         }else{
             tableHtml += buildEmptyTable( tableObj );