diff --git a/application/admin/controller/BroadController.php b/application/admin/controller/BroadController.php index a5cf12c..0f1c112 100644 --- a/application/admin/controller/BroadController.php +++ b/application/admin/controller/BroadController.php @@ -53,6 +53,17 @@ class BroadController extends Controller return $this->fetch(); } + public function edit($id, Request $request, Broad $model) + { + $data = $model::get($id); + if ($request->isPost()) { + $param = $request->param(); + $data->save($param) ? admin_success() : admin_error(); + } + $this->assign('data', $data); + return $this->fetch('add'); + } + //删除 public function del($id, Broad $model) { @@ -66,7 +77,7 @@ class BroadController extends Controller } } - $result = $model->whereIn('id', $id)->delete(); + $result = $model->whereIn('server_id', $id)->delete(); return $result ? admin_success(lang('delete_success'), URL_RELOAD) : admin_error(lang('delete_error')); } diff --git a/application/admin/controller/PlayerController.php b/application/admin/controller/PlayerController.php index 0a4827f..ca27760 100644 --- a/application/admin/controller/PlayerController.php +++ b/application/admin/controller/PlayerController.php @@ -31,7 +31,7 @@ class PlayerController extends Controller $param = $request->param(); $son_agency_invite = $this->son_agency_invite . ",{$this->user->invite}"; $model = $model - ->field('roleid,name,accountid,level,jade,create_time,serverid') + ->field('roleid,name,accountid,level,jade,create_time,serverid,mapid,x,y,lastonline') ->order('create_time') ->withJoin([ diff --git a/application/admin/view/broad/add.html b/application/admin/view/broad/add.html index 9c90d80..f937e8b 100644 --- a/application/admin/view/broad/add.html +++ b/application/admin/view/broad/add.html @@ -33,7 +33,7 @@
- +
diff --git a/application/admin/view/player/index.html b/application/admin/view/player/index.html index 5fb8c1b..a2d6177 100644 --- a/application/admin/view/player/index.html +++ b/application/admin/view/player/index.html @@ -13,8 +13,8 @@
+ name="_keywords" id="_keywords" class="form-control" + placeholder="ID/角色名/账号">
@@ -68,7 +68,11 @@ 等级 所属代理 仙玉 + 地图id + X + Y 创建时间 + 最后在线时间 最后登录IP 操作 @@ -83,7 +87,11 @@ {$item.level} {$item.roleid|get_role_agency_account|default=''} {$item.jade} + {$item.mapid} + {$item.x} + {$item.y} {$item.create_time} + {$item.lastonline} {$item.account.login_ip|default='无'} diff --git a/application/admin/view/user/index.html b/application/admin/view/user/index.html index 20b7df7..c9678fb 100644 --- a/application/admin/view/user/index.html +++ b/application/admin/view/user/index.html @@ -107,8 +107,6 @@ 邀请码 所属代理 是否启用 - 是否在线 - 坐标 mac 创建时间 最后登陆时间 @@ -129,8 +127,6 @@ {$item.invite} {$item.agency.username} {$item.state_text} - 是否在线 - 坐标 {$item.mac} {$item.register_time} {$item.last_login_time}