合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !468

@@ -98,6 +98,7 @@ class AdminIndexController extends AdminBaseController
         $this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('list', $list->items());
         $this->assign('page', $list->render());
+        $this->assign('uid', $uid);
         // 渲染模板输出
         return $this->fetch();
     }

@@ -5,7 +5,7 @@
     <ul class="nav nav-tabs">
         <li class="active"><a>{:lang('USER_INDEXADMIN_INDEX')}</a></li>
     </ul>
-    <form class="well form-inline margin-top-20" method="post" action="{:url('user/adminIndex/index')}">
+    <form class="well form-inline margin-top-20" method="post" action="{:url('user/adminIndex/index',['uid'=>$uid])}">
         关键字：
         <input class="form-control" type="text" name="keyword" style="width: 200px;" value="{$keyword|default=''}"
                placeholder="用户id/手机号">