lizhen_gitee 1 mese fa
parent
commit
dca70442e2

+ 6 - 6
application/admin/view/user/user/index.html

@@ -17,21 +17,21 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user.user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user.user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user.user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+                        <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
-                        <div class="dropdown btn-group {:$auth->check('user.user/multi')?'':'hide'}">
+                        <!--<div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
                                 {foreach name="statusList" item="vo"}
                                 <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
                                 {/foreach}
                             </ul>
-                        </div>
+                        </div>-->
 
-                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('user.user/recyclebin')?'':'hide'}" href="user.user/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
+                        <a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('user/user/recyclebin')?'':'hide'}" href="user/user/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('user/user/edit')}"

+ 6 - 6
application/admin/view/user/user/recyclebin.html

@@ -7,14 +7,14 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         {:build_toolbar('refresh')}
-                        <a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('user.user/restore')?'':'hide'}" href="javascript:;" data-url="user.user/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>
-                        <a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('user.user/destroy')?'':'hide'}" href="javascript:;" data-url="user.user/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>
-                        <a class="btn btn-success btn-restoreall {:$auth->check('user.user/restore')?'':'hide'}" href="javascript:;" data-url="user.user/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>
-                        <a class="btn btn-danger btn-destroyall {:$auth->check('user.user/destroy')?'':'hide'}" href="javascript:;" data-url="user.user/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>
+                        <!--<a class="btn btn-info btn-multi btn-disabled disabled {:$auth->check('user/user/restore')?'':'hide'}" href="javascript:;" data-url="user/user/restore" data-action="restore"><i class="fa fa-rotate-left"></i> {:__('Restore')}</a>-->
+                        <!--<a class="btn btn-danger btn-multi btn-disabled disabled {:$auth->check('user/user/destroy')?'':'hide'}" href="javascript:;" data-url="user/user/destroy" data-action="destroy"><i class="fa fa-times"></i> {:__('Destroy')}</a>-->
+                        <!--<a class="btn btn-success btn-restoreall {:$auth->check('user/user/restore')?'':'hide'}" href="javascript:;" data-url="user/user/restore" title="{:__('Restore all')}"><i class="fa fa-rotate-left"></i> {:__('Restore all')}</a>-->
+                        <!--<a class="btn btn-danger btn-destroyall {:$auth->check('user/user/destroy')?'':'hide'}" href="javascript:;" data-url="user/user/destroy" title="{:__('Destroy all')}"><i class="fa fa-times"></i> {:__('Destroy all')}</a>-->
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover"
-                           data-operate-restore="{:$auth->check('user.user/restore')}"
-                           data-operate-destroy="{:$auth->check('user.user/destroy')}"
+                           data-operate-restore="{:$auth->check('user/user/restore')}"
+                           data-operate-destroy="{:$auth->check('user/user/destroy')}"
                            width="100%">
                     </table>
                 </div>

+ 12 - 9
public/assets/js/backend/user/user.js

@@ -5,12 +5,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格参数配置
             Table.api.init({
                 extend: {
-                    index_url: 'user.user/index' + location.search,
-                    add_url: 'user.user/add',
-                    edit_url: 'user.user/edit',
-                    del_url: 'user.user/del',
-                    multi_url: 'user.user/multi',
-                    import_url: 'user.user/import',
+                    index_url: 'user/user/index' + location.search,
+                    add_url: 'user/user/add',
+                    edit_url: 'user/user/edit',
+                    del_url: 'user/user/del',
+                    multi_url: 'user/user/multi',
+                    import_url: 'user/user/import',
                     table: 'user',
                 }
             });
@@ -66,13 +66,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             // 初始化表格
             table.bootstrapTable({
-                url: 'user.user/recyclebin' + location.search,
+                url: 'user/user/recyclebin' + location.search,
                 pk: 'id',
                 sortName: 'id',
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
+                        {field: 'contactname', title: __('Contactname'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {
                             field: 'deletetime',
                             title: __('Deletetime'),
@@ -92,7 +95,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     text: __('Restore'),
                                     classname: 'btn btn-xs btn-info btn-ajax btn-restoreit',
                                     icon: 'fa fa-rotate-left',
-                                    url: 'user.user/restore',
+                                    url: 'user/user/restore',
                                     refresh: true
                                 },
                                 {
@@ -100,7 +103,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                     text: __('Destroy'),
                                     classname: 'btn btn-xs btn-danger btn-ajax btn-destroyit',
                                     icon: 'fa fa-times',
-                                    url: 'user.user/destroy',
+                                    url: 'user/user/destroy',
                                     refresh: true,
                                     confirm:'是否彻底删除数据?无法找回!'
                                 }