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 = '