From 3f2bc28b88ee76a9bc913047ce60ec7b6dd7fcd1 Mon Sep 17 00:00:00 2001 From: CGDF <17256673+CGDF-Github@users.noreply.github.com> Date: Sun, 21 Oct 2018 16:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E9=A1=B5=E3=80=82xc?= =?UTF-8?q?at=20update=E6=90=AC=E5=AE=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/{Utils => Command}/Update.php | 2 +- app/Command/XCat.php | 1 - app/Controllers/Admin/UserController.php | 12 +++++----- resources/views/material/admin/user/index.tpl | 22 +++++++++---------- 4 files changed, 18 insertions(+), 19 deletions(-) rename app/{Utils => Command}/Update.php (99%) diff --git a/app/Utils/Update.php b/app/Command/Update.php similarity index 99% rename from app/Utils/Update.php rename to app/Command/Update.php index 3c8d549b..838b9616 100644 --- a/app/Utils/Update.php +++ b/app/Command/Update.php @@ -1,6 +1,6 @@ "操作", "id" => "ID", "user_name" => "用户名", "remark" => "备注", "email" => "邮箱", "money" => "金钱", "im_type" => "联络方式类型", "im_value" => "联络方式详情", - "node_group" => "群组", "account_expire_in" => "账户过期时间", + "node_group" => "群组", "expire_in" => "账户过期时间", "class" => "等级", "class_expire" => "等级过期时间", "passwd" => "连接密码","port" => "连接端口", "method" => "加密方式", "protocol" => "连接协议", "obfs" => "连接混淆方式", "online_ip_count" => "在线IP数", "last_ss_time" => "上次使用时间", "used_traffic" => "已用流量/GB", "enable_traffic" => "总流量/GB", "last_checkin_time" => "上次签到时间", "today_traffic" => "今日流量/MB", - "is_enable" => "是否启用", "reg_date" => "注册时间", - "reg_location" => "注册IP", "auto_reset_day" => "自动重置流量日", + "enable" => "是否启用", "reg_date" => "注册时间", + "reg_ip" => "注册IP", "auto_reset_day" => "自动重置流量日", "auto_reset_bandwidth" => "自动重置流量/GB", "ref_by" => "邀请人ID", "ref_by_user_name" => "邀请人用户名"); $table_config['default_show_column'] = array("op", "id", "user_name", "remark", "email"); $table_config['ajax_url'] = 'user/ajax'; @@ -352,7 +352,7 @@ class UserController extends AdminController $tempdata['im_value'] = ''.$user->im_value.''; } $tempdata['node_group']=$user->node_group; - $tempdata['account_expire_in']=$user->expire_in; + $tempdata['expire_in']=$user->expire_in; $tempdata['class']=$user->class; $tempdata['class_expire']=$user->class_expire; $tempdata['passwd']=$user->passwd; @@ -366,9 +366,9 @@ class UserController extends AdminController $tempdata['enable_traffic']=Tools::flowToGB($user->transfer_enable); $tempdata['last_checkin_time']=$user->lastCheckInTime(); $tempdata['today_traffic']=$tempdata['used_traffic']-$user->last_day_t; - $tempdata['is_enable']=$user->enable == 1 ? "可用" : "禁用"; + $tempdata['enable']=$user->enable == 1 ? "可用" : "禁用"; $tempdata['reg_date']=$user->reg_date; - $tempdata['reg_location']=$user->reg_ip; + $tempdata['reg_ip']=$user->reg_ip; $tempdata['auto_reset_day']=$user->auto_reset_day; $tempdata['auto_reset_bandwidth']=$user->auto_reset_bandwidth; $tempdata['ref_by']= $user->ref_by; diff --git a/resources/views/material/admin/user/index.tpl b/resources/views/material/admin/user/index.tpl index 78165d34..555dd81f 100644 --- a/resources/views/material/admin/user/index.tpl +++ b/resources/views/material/admin/user/index.tpl @@ -98,7 +98,7 @@ $(document).ready(function(){ type: "POST", }, "columns": [ - { "data": "op" }, + { "data": "op" ,"orderable":false}, { "data": "id" }, { "data": "user_name" }, { "data": "remark" }, @@ -107,7 +107,7 @@ $(document).ready(function(){ { "data": "im_type" }, { "data": "im_value" }, { "data": "node_group" }, - { "data": "account_expire_in" }, + { "data": "expire_in" }, { "data": "class" }, { "data": "class_expire" }, { "data": "passwd" }, @@ -115,19 +115,19 @@ $(document).ready(function(){ { "data": "method" }, { "data": "protocol" }, { "data": "obfs" }, - { "data": "online_ip_count" }, - { "data": "last_ss_time" }, - { "data": "used_traffic" }, - { "data": "enable_traffic" }, - { "data": "last_checkin_time" }, - { "data": "today_traffic" }, - { "data": "is_enable" }, + { "data": "online_ip_count" ,"orderable":false}, + { "data": "last_ss_time" ,"orderable":false}, + { "data": "used_traffic" ,"orderable":false}, + { "data": "enable_traffic" ,"orderable":false}, + { "data": "last_checkin_time" ,"orderable":false}, + { "data": "today_traffic" ,"orderable":false}, + { "data": "enable" }, { "data": "reg_date" }, - { "data": "reg_location" }, + { "data": "reg_ip" }, { "data": "auto_reset_day" }, { "data": "auto_reset_bandwidth" }, { "data": "ref_by" }, - { "data": "ref_by_user_name" } + { "data": "ref_by_user_name" ,"orderable":false} ], "columnDefs": [ {