王智 / baoxiu · 提交

转到一个项目

作者 王智
提交 b60f97b2c9e0df974dc2c5c5b91b884f4d80fc20 1 个父辈 08203f87

baoxiu

内嵌 并排对比
正在显示 2 个修改的文件 包含 27 行增加 和 15 行删除
@@ -7,18 +7,18 @@ @@ -7,18 +7,18 @@
7 <div class="widget-body no-padding"> 7 <div class="widget-body no-padding">
8 <div id="toolbar" class="toolbar"> 8 <div id="toolbar" class="toolbar">
9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a> 9 <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
10 - <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('month_talk/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>  
11 - <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('month_talk/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>  
12 - <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('month_talk/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>  
13 - <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('month_talk/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a> 10 + <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('month_talk/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
  11 + <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('month_talk/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
  12 + <!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('month_talk/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
  13 + <!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('month_talk/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
14 14
15 - <div class="dropdown btn-group {:$auth->check('month_talk/multi')?'':'hide'}">  
16 - <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>  
17 - <ul class="dropdown-menu text-left" role="menu">  
18 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>  
19 - <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>  
20 - </ul>  
21 - </div> 15 + <!--<div class="dropdown btn-group {:$auth->check('month_talk/multi')?'':'hide'}">-->
  16 + <!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
  17 + <!--<ul class="dropdown-menu text-left" role="menu">-->
  18 + <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
  19 + <!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
  20 + <!--</ul>-->
  21 + <!--</div>-->
22 22
23 23
24 </div> 24 </div>
@@ -25,14 +25,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -25,14 +25,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
25 [ 25 [
26 {checkbox: true}, 26 {checkbox: true},
27 {field: 'id', title: __('Id')}, 27 {field: 'id', title: __('Id')},
28 - {field: 'user_id', title: __('User_id')}, 28 + // {field: 'user_id', title: __('User_id')},
  29 + {field: 'user.name', title: __('User.name')},
29 {field: 'weixiu_star', title: __('Weixiu_star')}, 30 {field: 'weixiu_star', title: __('Weixiu_star')},
30 {field: 'taidu_star', title: __('Taidu_star')}, 31 {field: 'taidu_star', title: __('Taidu_star')},
31 {field: 'talk_num', title: __('Talk_num')}, 32 {field: 'talk_num', title: __('Talk_num')},
32 {field: 'talk_con', title: __('Talk_con')}, 33 {field: 'talk_con', title: __('Talk_con')},
33 - {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},  
34 - {field: 'user.name', title: __('User.name')},  
35 - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 + {
  35 + field: 'createtime',
  36 + title: __('Createtime'),
  37 + operate: 'RANGE',
  38 + addclass: 'datetimerange',
  39 + formatter: Table.api.formatter.datetime
  40 + },
  41 + // {
  42 + // field: 'operate',
  43 + // title: __('Operate'),
  44 + // table: table,
  45 + // events: Table.api.events.operate,
  46 + // formatter: Table.api.formatter.operate
  47 + // }
36 ] 48 ]
37 ] 49 ]
38 }); 50 });