diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 1ea6cf353..0b8423ef2 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -578,4 +578,10 @@ function arrayPromoteWithdrawStatus($status, $param, $array = array()) { } } return $array; +} + +function getAllGame() +{ + $list = M("game", 'tab_')->field('relation_game_name as game_name')->group('relation_game_name')->select(); + return $list; } \ No newline at end of file diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index a66743da3..685ad3c6a 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -88,7 +88,7 @@ class AjaxController extends ThinkController{ if ($game) { $map['game_id'] = ['in', $game]; } - $data = M('Server', 'tab_')->field('id, server_name, server_id')->where($map)->select(); + $data = M('Server', 'tab_')->field('id, server_name, server_id')->where($map)->group('server_name')->select(); $this->AjaxReturn($data); } diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 6691814c6..39f76102b 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -88,4 +88,43 @@ class ConsoleController extends Think { } } } + + /** + * 登录校验 + */ + public function modifyLogin() + { + $start_time = 1569686400; + $current_time = strtotime(date("Y-m-d")); + for ($i=$start_time; $i<=$current_time; $i+=86400) { + $end_time = $i+86400; + $result = M()->query("SELECT + game_id, + FROM_UNIXTIME(login_time, '%Y-%m-%d') create_time, + user_id, + promote_id + FROM + tab_user_login_record + WHERE + login_time >= {$i} and login_time < {$end_time} + GROUP BY + create_time, + game_id, + user_id"); + if ($result) { + foreach ($result as $index => $item) { + $item['create_time'] = strtotime($item['create_time']); + if ($item['create_time']) { + $res = M("login_daily_record", "tab_")->add($item); + echo "写入{$item['create_time']} $res \n"; + } else { + echo "写入{$item['create_time']} error \n"; + } + unset($result[$index]); + } + } else { + echo "写入{$item['create_time']} 无 \n"; + } + } + } } diff --git a/Application/Admin/Controller/GameSourceController.class.php b/Application/Admin/Controller/GameSourceController.class.php index 618109a2c..4743a9ec1 100644 --- a/Application/Admin/Controller/GameSourceController.class.php +++ b/Application/Admin/Controller/GameSourceController.class.php @@ -46,6 +46,9 @@ class GameSourceController extends ThinkController if (empty($_POST['game_id'])) { $this -> error('游戏名称不能为空'); } + if (empty($_POST['remark'])) { + $this->error("请填写更新说明"); + } $game = M('Game', 'tab_') -> where(array('id' => $_POST['game_id'])) -> find(); $_POST['game_name'] = $game['game_name']; if (empty($_POST['file_name'])) { @@ -140,6 +143,9 @@ class GameSourceController extends ThinkController $this -> error('游戏原包格式不正确'); } } + if (empty($_POST['remark'])) { + $this->error("请填写更新说明"); + } $map['file_type'] = $_POST['file_type']; $d = D('Game_source') -> where($map) -> find(); $source = A('Source', 'Event'); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index cc024a314..b5c491be8 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -237,7 +237,7 @@ class MemberController extends ThinkController $this->m_title = '玩家列表'; $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/user_info', 'status' => 1])->find()); - + $this->display(); } @@ -445,6 +445,14 @@ class MemberController extends ThinkController if (empty($data['password'])) { unset($data['password']); } + if (!empty($data['real_name']) && (\mb_strlen($data['real_name']) > 5 || \mb_strlen($data['real_name']) <= 1)) { + $this->error('请填写正确的名字'); + } + + if (!empty($data['idcard']) && !preg_match('/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/', $data['idcard'])) { + $this->error('请输入正确的身份证号码'); + } + $res = $member->updateInfo($data); if ($res !== false) { \Think\Log::actionLog("Member/edit", "Member", $id); diff --git a/Application/Admin/View/GameSource/edit.html b/Application/Admin/View/GameSource/edit.html index 4355fa457..251a72ceb 100644 --- a/Application/Admin/View/GameSource/edit.html +++ b/Application/Admin/View/GameSource/edit.html @@ -129,7 +129,7 @@ 更新说明： - + diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html index a23921597..aa7d84059 100644 --- a/Application/Admin/View/Member/edit.html +++ b/Application/Admin/View/Member/edit.html @@ -104,9 +104,9 @@ 真实姓名 - + - + @@ -114,9 +114,9 @@ 身份证号 - + - + diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 9527b8ee5..93fd046e7 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -67,19 +67,19 @@ -
- -
+
+
+
@@ -253,34 +253,8 @@ }) }); - var game_name = "{:I('game_name')}"; - $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGameList')}", - type:"get", - data:{sdk_type:$("#game_type option:selected").val()}, - dataType:'json', - success:function(response){ - str = ''; - // $.each(response.data, function(index, item){ - // console.log(item.id); - // str += ''; - // }); - data = response.data; - for (var i in data){ - str += "" - } - $("#game_name").empty(); - $("#game_name").append(str); - $("#game_name").select2(); - $("#game_name").change(); - } - }) - }); - $("#game_type").change(); - var game_server = "{:I('server_name')}"; - $("#game_name").change(function(){ + $("#game_type").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", type:"post", @@ -298,6 +272,10 @@ }) }); + $("#game_name").change(function(){ + $("#game_type").change(); + }); + $("#game_name").change(); }) diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index b91cb6357..09edd8ec0 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -116,18 +116,18 @@
- + + + +
- + + +
@@ -452,34 +452,8 @@ $(function(){ }); $("#promote_level").change(); }) - var game_name = "{:I('game_name')}"; + var game_server = "{:I('server_name')}"; $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGameList')}", - type:"get", - data:{sdk_type:$("#game_type option:selected").val()}, - dataType:'json', - success:function(response){ - str = ''; - // $.each(response.data, function(index, item){ - // console.log(item.id); - // str += ''; - // }); - data = response.data; - for (var i in data){ - str += "" - } - $("#game_name").empty(); - $("#game_name").append(str); - $("#game_name").select2(); - $("#game_name").change(); - } - }) - }); - $("#game_type").change(); - - var game_server = "{:I('server_name')}"; - $("#game_name").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", type:"post", @@ -497,6 +471,12 @@ $(function(){ }) }); + $("#game_name").change(function(){ + $("#game_type").change(); + }); + + $("#game_name").change(); + function shenhe(status){ var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { return $(elem).val(); diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html index 3a971cb71..c86300fc8 100644 --- a/Application/Admin/View/RechargeSum/summation.html +++ b/Application/Admin/View/RechargeSum/summation.html @@ -317,50 +317,30 @@ $(function(){ }); $("#promote_level").change(); - var game_name = "{:I('game_name')}"; - $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGameList')}", - type:"get", - data:{sdk_type:$("#game_type option:selected").val()}, - dataType:'json', - success:function(response){ - str = ''; - // $.each(response.data, function(index, item){ - // console.log(item.id); - // str += ''; - // }); - data = response.data; - for (var i in data){ - str += "" - } - $("#game_name").empty(); - $("#game_name").append(str); - $("#game_name").select2(); - $("#game_name").change(); - } - }) - }); - $("#game_type").change(); + var game_server = "{:I('server_name')}"; + $("#game_type").change(function(){ + $.ajax({ + url:"{:U('Ajax/getGmeServer')}", + type:"post", + data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, + dataType:'json', + success:function(data){ + str = ""; + for (var i in data){ + str += "" + } + $("#server_name").empty(); + $("#server_name").append(str); + $("#server_name").select2(); + } + }) + }); + + $("#game_name").change(function(){ + $("#game_type").change(); + }); + $("#game_name").change(); - var game_server = "{:I('server_id')}"; - $("#game_name").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGmeServer')}", - type:"post", - data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, - dataType:'json', - success:function(data){ - str = ""; - for (var i in data){ - str += "" - } - $("#server_id").empty(); - $("#server_id").append(str); - $("#server_id").select2(); - } - }) - }); }) diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 946f352c2..53008b95a 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -60,19 +60,19 @@
-
- -
+
+
+
@@ -498,46 +498,29 @@ }); $("#promote_level").change(); - var game_name = "{:I('game_name')}"; - $("#game_type").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGameList')}", - type:"get", - data:{sdk_type:$("#game_type option:selected").val()}, - dataType:'json', - success:function(response){ - str = ''; - data = response.data; - for (var i in data){ - str += "" - } - $("#game_name").empty(); - $("#game_name").append(str); - $("#game_name").select2(); - $("#game_name").change(); - } - }) - }); - $("#game_type").change(); - var game_server = "{:I('server_name')}"; - $("#game_name").change(function(){ - $.ajax({ - url:"{:U('Ajax/getGmeServer')}", - type:"post", - data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, - dataType:'json', - success:function(data){ - str = ""; - for (var i in data){ - str += "" + $("#game_type").change(function(){ + $.ajax({ + url:"{:U('Ajax/getGmeServer')}", + type:"post", + data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, + dataType:'json', + success:function(data){ + str = ""; + for (var i in data){ + str += "" + } + $("#server_name").empty(); + $("#server_name").append(str); + $("#server_name").select2(); } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); - } - }) - }); + }) + }); + + $("#game_name").change(function(){ + $("#game_type").change(); + }); + $("#game_name").change(); /** * 初始化select2单选，默认带搜索功能。 diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 9db65838b..b087d94f0 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -58,21 +58,21 @@
   
-
- -
-
- -
+
+ +
+
+ +