何书鹏 / salarycalculator · 提交

转到一个项目

作者 Karson
提交 077eebec86670c848c3ed9cfb2f8c7a1c5caeeb5 1 个父辈 36d762fc

优化前台退出文字 

修复分页搜索BUG
内嵌 并排对比
正在显示 20 个修改的文件 包含 53 行增加 和 74 行删除
@@ -19,8 +19,7 @@ @@ -19,8 +19,7 @@
19 {%relationWithList%} 19 {%relationWithList%}
20 ->where($where) 20 ->where($where)
21 ->order($sort, $order) 21 ->order($sort, $order)
22 - ->limit($offset, $limit)  
23 - ->paginate(); 22 + ->paginate($limit);
24 23
25 foreach ($list as $row) { 24 foreach ($list as $row) {
26 {%visibleFieldList%} 25 {%visibleFieldList%}
@@ -110,7 +110,7 @@ class Index extends Backend @@ -110,7 +110,7 @@ class Index extends Backend
110 } 110 }
111 111
112 /** 112 /**
113 - * 注销登录 113 + * 退出登录
114 */ 114 */
115 public function logout() 115 public function logout()
116 { 116 {
@@ -67,6 +67,8 @@ class Admin extends Backend @@ -67,6 +67,8 @@ class Admin extends Backend
67 */ 67 */
68 public function index() 68 public function index()
69 { 69 {
  70 + //设置过滤方法
  71 + $this->request->filter(['strip_tags', 'trim']);
70 if ($this->request->isAjax()) { 72 if ($this->request->isAjax()) {
71 //如果发送的来源是Selectpage，则转发到Selectpage 73 //如果发送的来源是Selectpage，则转发到Selectpage
72 if ($this->request->request('keyField')) { 74 if ($this->request->request('keyField')) {
@@ -90,26 +92,21 @@ class Admin extends Backend @@ -90,26 +92,21 @@ class Admin extends Backend
90 $adminGroupName[$this->auth->id][$n['id']] = $n['name']; 92 $adminGroupName[$this->auth->id][$n['id']] = $n['name'];
91 } 93 }
92 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 94 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
93 - $total = $this->model  
94 - ->where($where)  
95 - ->where('id', 'in', $this->childrenAdminIds)  
96 - ->order($sort, $order)  
97 - ->count();  
98 95
99 $list = $this->model 96 $list = $this->model
100 ->where($where) 97 ->where($where)
101 ->where('id', 'in', $this->childrenAdminIds) 98 ->where('id', 'in', $this->childrenAdminIds)
102 ->field(['password', 'salt', 'token'], true) 99 ->field(['password', 'salt', 'token'], true)
103 ->order($sort, $order) 100 ->order($sort, $order)
104 - ->limit($offset, $limit)  
105 - ->select(); 101 + ->paginate($limit);
  102 +
106 foreach ($list as $k => &$v) { 103 foreach ($list as $k => &$v) {
107 $groups = isset($adminGroupName[$v['id']]) ? $adminGroupName[$v['id']] : []; 104 $groups = isset($adminGroupName[$v['id']]) ? $adminGroupName[$v['id']] : [];
108 $v['groups'] = implode(',', array_keys($groups)); 105 $v['groups'] = implode(',', array_keys($groups));
109 $v['groups_text'] = implode(',', array_values($groups)); 106 $v['groups_text'] = implode(',', array_values($groups));
110 } 107 }
111 unset($v); 108 unset($v);
112 - $result = array("total" => $total, "rows" => $list); 109 + $result = array("total" => $list->total(), "rows" => $list->items());
113 110
114 return json($result); 111 return json($result);
115 } 112 }
@@ -40,21 +40,17 @@ class Adminlog extends Backend @@ -40,21 +40,17 @@ class Adminlog extends Backend
40 */ 40 */
41 public function index() 41 public function index()
42 { 42 {
  43 + //设置过滤方法
  44 + $this->request->filter(['strip_tags', 'trim']);
43 if ($this->request->isAjax()) { 45 if ($this->request->isAjax()) {
44 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 46 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
45 - $total = $this->model  
46 - ->where($where)  
47 - ->where('admin_id', 'in', $this->childrenAdminIds)  
48 - ->order($sort, $order)  
49 - ->count();  
50 -  
51 $list = $this->model 47 $list = $this->model
52 ->where($where) 48 ->where($where)
53 ->where('admin_id', 'in', $this->childrenAdminIds) 49 ->where('admin_id', 'in', $this->childrenAdminIds)
54 ->order($sort, $order) 50 ->order($sort, $order)
55 - ->limit($offset, $limit)  
56 - ->select();  
57 - $result = array("total" => $total, "rows" => $list); 51 + ->paginate($limit);
  52 +
  53 + $result = array("total" => $list->total(), "rows" => $list->items());
58 54
59 return json($result); 55 return json($result);
60 } 56 }
@@ -31,7 +31,7 @@ class Attachment extends Backend @@ -31,7 +31,7 @@ class Attachment extends Backend
31 public function index() 31 public function index()
32 { 32 {
33 //设置过滤方法 33 //设置过滤方法
34 - $this->request->filter(['strip_tags']); 34 + $this->request->filter(['strip_tags', 'trim']);
35 if ($this->request->isAjax()) { 35 if ($this->request->isAjax()) {
36 $mimetypeQuery = []; 36 $mimetypeQuery = [];
37 $filter = $this->request->request('filter'); 37 $filter = $this->request->request('filter');
@@ -51,24 +51,19 @@ class Attachment extends Backend @@ -51,24 +51,19 @@ class Attachment extends Backend
51 } 51 }
52 52
53 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 53 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
54 - $total = $this->model  
55 - ->where($mimetypeQuery)  
56 - ->where($where)  
57 - ->order($sort, $order)  
58 - ->count();  
59 54
60 $list = $this->model 55 $list = $this->model
61 ->where($mimetypeQuery) 56 ->where($mimetypeQuery)
62 ->where($where) 57 ->where($where)
63 ->order($sort, $order) 58 ->order($sort, $order)
64 - ->limit($offset, $limit)  
65 - ->select(); 59 + ->paginate($limit);
  60 +
66 $cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $this->request->root()); 61 $cdnurl = preg_replace("/\/(\w+)\.php$/i", '', $this->request->root());
67 foreach ($list as $k => &$v) { 62 foreach ($list as $k => &$v) {
68 $v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url']; 63 $v['fullurl'] = ($v['storage'] == 'local' ? $cdnurl : $this->view->config['upload']['cdnurl']) . $v['url'];
69 } 64 }
70 unset($v); 65 unset($v);
71 - $result = array("total" => $total, "rows" => $list); 66 + $result = array("total" => $list->total(), "rows" => $list->items());
72 67
73 return json($result); 68 return json($result);
74 } 69 }
@@ -22,25 +22,18 @@ class Profile extends Backend @@ -22,25 +22,18 @@ class Profile extends Backend
22 public function index() 22 public function index()
23 { 23 {
24 //设置过滤方法 24 //设置过滤方法
25 - $this->request->filter(['strip_tags']); 25 + $this->request->filter(['strip_tags', 'trim']);
26 if ($this->request->isAjax()) { 26 if ($this->request->isAjax()) {
27 $model = model('AdminLog'); 27 $model = model('AdminLog');
28 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 28 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
29 29
30 - $total = $model  
31 - ->where($where)  
32 - ->where('admin_id', $this->auth->id)  
33 - ->order($sort, $order)  
34 - ->count();  
35 -  
36 $list = $model 30 $list = $model
37 ->where($where) 31 ->where($where)
38 ->where('admin_id', $this->auth->id) 32 ->where('admin_id', $this->auth->id)
39 ->order($sort, $order) 33 ->order($sort, $order)
40 - ->limit($offset, $limit)  
41 - ->select(); 34 + ->paginate($limit);
42 35
43 - $result = array("total" => $total, "rows" => $list); 36 + $result = array("total" => $list->total(), "rows" => $list->items());
44 37
45 return json($result); 38 return json($result);
46 } 39 }
@@ -33,29 +33,23 @@ class User extends Backend @@ -33,29 +33,23 @@ class User extends Backend
33 public function index() 33 public function index()
34 { 34 {
35 //设置过滤方法 35 //设置过滤方法
36 - $this->request->filter(['strip_tags']); 36 + $this->request->filter(['strip_tags', 'trim']);
37 if ($this->request->isAjax()) { 37 if ($this->request->isAjax()) {
38 //如果发送的来源是Selectpage，则转发到Selectpage 38 //如果发送的来源是Selectpage，则转发到Selectpage
39 if ($this->request->request('keyField')) { 39 if ($this->request->request('keyField')) {
40 return $this->selectpage(); 40 return $this->selectpage();
41 } 41 }
42 list($where, $sort, $order, $offset, $limit) = $this->buildparams(); 42 list($where, $sort, $order, $offset, $limit) = $this->buildparams();
43 - $total = $this->model  
44 - ->with('group')  
45 - ->where($where)  
46 - ->order($sort, $order)  
47 - ->count();  
48 $list = $this->model 43 $list = $this->model
49 ->with('group') 44 ->with('group')
50 ->where($where) 45 ->where($where)
51 ->order($sort, $order) 46 ->order($sort, $order)
52 - ->limit($offset, $limit)  
53 - ->select(); 47 + ->paginate($limit);
54 foreach ($list as $k => $v) { 48 foreach ($list as $k => $v) {
55 $v->avatar = $v->avatar ? cdnurl($v->avatar, true) : letter_avatar($v->nickname); 49 $v->avatar = $v->avatar ? cdnurl($v->avatar, true) : letter_avatar($v->nickname);
56 $v->hidden(['password', 'salt']); 50 $v->hidden(['password', 'salt']);
57 } 51 }
58 - $result = array("total" => $total, "rows" => $list); 52 + $result = array("total" => $list->total(), "rows" => $list->items());
59 53
60 return json($result); 54 return json($result);
61 } 55 }
@@ -7,7 +7,7 @@ return [ @@ -7,7 +7,7 @@ return [
7 'Password' => '密码', 7 'Password' => '密码',
8 'Sign up' => '注 册', 8 'Sign up' => '注 册',
9 'Sign in' => '登 录', 9 'Sign in' => '登 录',
10 - 'Sign out' => '注 销', 10 + 'Sign out' => '退 出',
11 'Keep login' => '保持会话', 11 'Keep login' => '保持会话',
12 'Guest' => '游客', 12 'Guest' => '游客',
13 'Welcome' => '%s，你好！', 13 'Welcome' => '%s，你好！',
@@ -69,7 +69,7 @@ return [ @@ -69,7 +69,7 @@ return [
69 'Home' => '主页', 69 'Home' => '主页',
70 'Online' => '在线', 70 'Online' => '在线',
71 'Login' => '登录', 71 'Login' => '登录',
72 - 'Logout' => '注销', 72 + 'Logout' => '退出',
73 'Profile' => '个人资料', 73 'Profile' => '个人资料',
74 'Index' => '首页', 74 'Index' => '首页',
75 'Hot' => '热门', 75 'Hot' => '热门',
@@ -68,7 +68,7 @@ class Auth extends \fast\Auth @@ -68,7 +68,7 @@ class Auth extends \fast\Auth
68 } 68 }
69 69
70 /** 70 /**
71 - * 注销登录 71 + * 退出登录
72 */ 72 */
73 public function logout() 73 public function logout()
74 { 74 {
@@ -43,7 +43,7 @@ trait Backend @@ -43,7 +43,7 @@ trait Backend
43 public function index() 43 public function index()
44 { 44 {
45 //设置过滤方法 45 //设置过滤方法
46 - $this->request->filter(['strip_tags']); 46 + $this->request->filter(['strip_tags', 'trim']);
47 if ($this->request->isAjax()) { 47 if ($this->request->isAjax()) {
48 //如果发送的来源是Selectpage，则转发到Selectpage 48 //如果发送的来源是Selectpage，则转发到Selectpage
49 if ($this->request->request('keyField')) { 49 if ($this->request->request('keyField')) {
@@ -54,8 +54,7 @@ trait Backend @@ -54,8 +54,7 @@ trait Backend
54 $list = $this->model 54 $list = $this->model
55 ->where($where) 55 ->where($where)
56 ->order($sort, $order) 56 ->order($sort, $order)
57 - ->limit($offset, $limit)  
58 - ->paginate(); 57 + ->paginate($limit);
59 58
60 $result = array("total" => $list->total(), "rows" => $list->items()); 59 $result = array("total" => $list->total(), "rows" => $list->items());
61 60
@@ -128,7 +128,7 @@ class User extends Api @@ -128,7 +128,7 @@ class User extends Api
128 } 128 }
129 129
130 /** 130 /**
131 - * 注销登录 131 + * 退出登录
132 */ 132 */
133 public function logout() 133 public function logout()
134 { 134 {
@@ -8,7 +8,7 @@ return [ @@ -8,7 +8,7 @@ return [
8 'Password' => '密码', 8 'Password' => '密码',
9 'Sign up' => '注 册', 9 'Sign up' => '注 册',
10 'Sign in' => '登 录', 10 'Sign in' => '登 录',
11 - 'Sign out' => '注 销', 11 + 'Sign out' => '退 出',
12 'Guest' => '游客', 12 'Guest' => '游客',
13 'Welcome' => '%s，你好！', 13 'Welcome' => '%s，你好！',
14 'Add' => '添加', 14 'Add' => '添加',
@@ -42,7 +42,7 @@ return [ @@ -42,7 +42,7 @@ return [
42 'None' => '无', 42 'None' => '无',
43 'Home' => '主页', 43 'Home' => '主页',
44 'Online' => '在线', 44 'Online' => '在线',
45 - 'Logout' => '注销', 45 + 'Logout' => '退出',
46 'Profile' => '个人资料', 46 'Profile' => '个人资料',
47 'Index' => '首页', 47 'Index' => '首页',
48 'Hot' => '热门', 48 'Hot' => '热门',
@@ -29,7 +29,7 @@ return [ @@ -29,7 +29,7 @@ return [
29 'Change password' => '修改密码', 29 'Change password' => '修改密码',
30 'Captcha is incorrect' => '验证码不正确', 30 'Captcha is incorrect' => '验证码不正确',
31 'Logged in successful' => '登录成功', 31 'Logged in successful' => '登录成功',
32 - 'Logout successful' => '注销成功', 32 + 'Logout successful' => '退出成功',
33 'Operation failed' => '操作失败', 33 'Operation failed' => '操作失败',
34 'Invalid parameters' => '参数不正确', 34 'Invalid parameters' => '参数不正确',
35 'Change password failure' => '修改密码失败', 35 'Change password failure' => '修改密码失败',
@@ -261,8 +261,14 @@ class Backend extends Controller @@ -261,8 +261,14 @@ class Backend extends Controller
261 $op = $this->request->get("op", '', 'trim'); 261 $op = $this->request->get("op", '', 'trim');
262 $sort = $this->request->get("sort", !empty($this->model) && $this->model->getPk() ? $this->model->getPk() : 'id'); 262 $sort = $this->request->get("sort", !empty($this->model) && $this->model->getPk() ? $this->model->getPk() : 'id');
263 $order = $this->request->get("order", "DESC"); 263 $order = $this->request->get("order", "DESC");
264 - $offset = $this->request->get("offset", 0);  
265 - $limit = $this->request->get("limit", 0); 264 + $offset = $this->request->get("offset/d", 0);
  265 + $limit = $this->request->get("limit/d", 10);
  266 + //新增自动计算页码
  267 + $page = $limit ? intval($offset / $limit) + 1 : 1;
  268 + if ($this->request->has("page")) {
  269 + $page = $this->request->get("page/d", 1);
  270 + }
  271 + $this->request->get([config('paginate.var_page') => $page]);
266 $filter = (array)json_decode($filter, true); 272 $filter = (array)json_decode($filter, true);
267 $op = (array)json_decode($op, true); 273 $op = (array)json_decode($op, true);
268 $filter = $filter ? $filter : []; 274 $filter = $filter ? $filter : [];
@@ -404,7 +410,7 @@ class Backend extends Controller @@ -404,7 +410,7 @@ class Backend extends Controller
404 } 410 }
405 } 411 }
406 }; 412 };
407 - return [$where, $sort, $order, $offset, $limit]; 413 + return [$where, $sort, $order, $offset, $limit, $page];
408 } 414 }
409 415
410 /** 416 /**
@@ -14,7 +14,7 @@ return [ @@ -14,7 +14,7 @@ return [
14 'Password' => '密码', 14 'Password' => '密码',
15 'Sign up' => '注 册', 15 'Sign up' => '注 册',
16 'Sign in' => '登 录', 16 'Sign in' => '登 录',
17 - 'Sign out' => '注 销', 17 + 'Sign out' => '退 出',
18 'Guest' => '游客', 18 'Guest' => '游客',
19 'Welcome' => '%s，你好！', 19 'Welcome' => '%s，你好！',
20 'Add' => '添加', 20 'Add' => '添加',
@@ -47,7 +47,7 @@ return [ @@ -47,7 +47,7 @@ return [
47 'Last' => '末页', 47 'Last' => '末页',
48 'None' => '无', 48 'None' => '无',
49 'Online' => '在线', 49 'Online' => '在线',
50 - 'Logout' => '注销', 50 + 'Logout' => '退出',
51 'Profile' => '个人资料', 51 'Profile' => '个人资料',
52 'Index' => '首页', 52 'Index' => '首页',
53 'Hot' => '热门', 53 'Hot' => '热门',
@@ -225,7 +225,7 @@ class Auth @@ -225,7 +225,7 @@ class Auth
225 } 225 }
226 226
227 /** 227 /**
228 - * 注销 228 + * 退出
229 * 229 *
230 * @return boolean 230 * @return boolean
231 */ 231 */
@@ -239,7 +239,7 @@ class Auth @@ -239,7 +239,7 @@ class Auth
239 $this->_logined = false; 239 $this->_logined = false;
240 //删除Token 240 //删除Token
241 Token::delete($this->_token); 241 Token::delete($this->_token);
242 - //注销成功的事件 242 + //退出成功的事件
243 Hook::listen("user_logout_successed", $this->_user); 243 Hook::listen("user_logout_successed", $this->_user);
244 return true; 244 return true;
245 } 245 }
@@ -31,7 +31,7 @@ class User extends Frontend @@ -31,7 +31,7 @@ class User extends Frontend
31 $this->error(__('User center already closed')); 31 $this->error(__('User center already closed'));
32 } 32 }
33 33
34 - //监听注册登录注销的事件 34 + //监听注册登录退出的事件
35 Hook::add('user_login_successed', function ($user) use ($auth) { 35 Hook::add('user_login_successed', function ($user) use ($auth) {
36 $expire = input('post.keeplogin') ? 30 * 86400 : 0; 36 $expire = input('post.keeplogin') ? 30 * 86400 : 0;
37 Cookie::set('uid', $user->id, $expire); 37 Cookie::set('uid', $user->id, $expire);
@@ -208,11 +208,11 @@ class User extends Frontend @@ -208,11 +208,11 @@ class User extends Frontend
208 } 208 }
209 209
210 /** 210 /**
211 - * 注销登录 211 + * 退出登录
212 */ 212 */
213 public function logout() 213 public function logout()
214 { 214 {
215 - //注销本站 215 + //退出本站
216 $this->auth->logout(); 216 $this->auth->logout();
217 $this->success(__('Logout successful'), url('user/index')); 217 $this->success(__('Logout successful'), url('user/index'));
218 } 218 }
@@ -9,7 +9,7 @@ return [ @@ -9,7 +9,7 @@ return [
9 'Password' => '密码', 9 'Password' => '密码',
10 'Sign up' => '注 册', 10 'Sign up' => '注 册',
11 'Sign in' => '登 录', 11 'Sign in' => '登 录',
12 - 'Sign out' => '注 销', 12 + 'Sign out' => '退 出',
13 'Guest' => '游客', 13 'Guest' => '游客',
14 'Welcome' => '%s，你好！', 14 'Welcome' => '%s，你好！',
15 'Add' => '添加', 15 'Add' => '添加',
@@ -44,7 +44,7 @@ return [ @@ -44,7 +44,7 @@ return [
44 'Last' => '末页', 44 'Last' => '末页',
45 'None' => '无', 45 'None' => '无',
46 'Online' => '在线', 46 'Online' => '在线',
47 - 'Logout' => '注销', 47 + 'Logout' => '退出',
48 'Profile' => '个人资料', 48 'Profile' => '个人资料',
49 'Index' => '首页', 49 'Index' => '首页',
50 'Hot' => '热门', 50 'Hot' => '热门',
@@ -56,7 +56,7 @@ return [ @@ -56,7 +56,7 @@ return [
56 'Change password successful' => '修改密码成功', 56 'Change password successful' => '修改密码成功',
57 'Captcha is incorrect' => '验证码不正确', 57 'Captcha is incorrect' => '验证码不正确',
58 'Logged in successful' => '登录成功', 58 'Logged in successful' => '登录成功',
59 - 'Logout successful' => '注销成功', 59 + 'Logout successful' => '退出成功',
60 'User center already closed' => '会员中心已经关闭', 60 'User center already closed' => '会员中心已经关闭',
61 'Operation failed' => '操作失败', 61 'Operation failed' => '操作失败',
62 'Invalid parameters' => '参数不正确', 62 'Invalid parameters' => '参数不正确',
@@ -175,7 +175,7 @@ @@ -175,7 +175,7 @@
175 <a href="javascript:;" data-id="14" class="list-group-item">会员登录</a> 175 <a href="javascript:;" data-id="14" class="list-group-item">会员登录</a>
176 <a href="javascript:;" data-id="15" class="list-group-item">手机验证码登录</a> 176 <a href="javascript:;" data-id="15" class="list-group-item">手机验证码登录</a>
177 <a href="javascript:;" data-id="16" class="list-group-item">注册会员</a> 177 <a href="javascript:;" data-id="16" class="list-group-item">注册会员</a>
178 - <a href="javascript:;" data-id="17" class="list-group-item">注销登录</a> 178 + <a href="javascript:;" data-id="17" class="list-group-item">退出登录</a>
179 <a href="javascript:;" data-id="18" class="list-group-item">修改会员个人信息</a> 179 <a href="javascript:;" data-id="18" class="list-group-item">修改会员个人信息</a>
180 <a href="javascript:;" data-id="19" class="list-group-item">修改邮箱</a> 180 <a href="javascript:;" data-id="19" class="list-group-item">修改邮箱</a>
181 <a href="javascript:;" data-id="20" class="list-group-item">修改手机号</a> 181 <a href="javascript:;" data-id="20" class="list-group-item">修改手机号</a>
@@ -2174,7 +2174,7 @@ @@ -2174,7 +2174,7 @@
2174 <div class="panel-heading" id="heading-17"> 2174 <div class="panel-heading" id="heading-17">
2175 <h4 class="panel-title"> 2175 <h4 class="panel-title">
2176 <span class="label label-success">GET</span> 2176 <span class="label label-success">GET</span>
2177 - <a data-toggle="collapse" data-parent="#accordion17" href="#collapseOne17"> 注销登录 <span class="text-muted">/api/user/logout</span></a> 2177 + <a data-toggle="collapse" data-parent="#accordion17" href="#collapseOne17"> 退出登录 <span class="text-muted">/api/user/logout</span></a>
2178 </h4> 2178 </h4>
2179 </div> 2179 </div>
2180 <div id="collapseOne17" class="panel-collapse collapse"> 2180 <div id="collapseOne17" class="panel-collapse collapse">
@@ -2192,7 +2192,7 @@ @@ -2192,7 +2192,7 @@
2192 2192
2193 <div class="tab-pane active" id="info17"> 2193 <div class="tab-pane active" id="info17">
2194 <div class="well"> 2194 <div class="well">
2195 - 注销登录 </div> 2195 + 退出登录 </div>
2196 <div class="panel panel-default"> 2196 <div class="panel panel-default">
2197 <div class="panel-heading"><strong>Headers</strong></div> 2197 <div class="panel-heading"><strong>Headers</strong></div>
2198 <div class="panel-body"> 2198 <div class="panel-body">