diff --git a/.gitignore b/.gitignore index c4023a16c..685fe3db6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ Runtime/ Uploads/ Application/Common/Conf/env.php +Application/Common/Conf/pay_config.php .idea/ \ No newline at end of file diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 0abfb29a0..f1feb8ee7 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -549,6 +549,7 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){ public function rolelist() { + $map = []; if (isset($_REQUEST['game_name'])) { $map['game_name'] = trim($_REQUEST['game_name']); unset($_REQUEST['game_name']); @@ -562,7 +563,7 @@ function think_ucenter_md5($str, $key = 'ThinkUCenter'){ unset($_REQUEST['role_name']); } empty(I('user_account')) || $map['user_account'] = ['like',"%".I('user_account')."%"]; - $list = $this->lists(M('user_play_info', 'tab_'), $map); + $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); $this->assign('list', $list); $this->meta_title = '角色数据'; diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 1a0735ac1..0e43f2823 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -306,7 +306,7 @@ class SourceEvent extends Controller //$ossClient->multiuploadFile($bucket, $url, $file, $options); } catch (OssException $e) { printf(__FUNCTION__ . ": initiateMultipartUpload FAILED\n"); - $this -> error($e -> getMessage() . "\n"); + $this -> error('1' . $e -> getMessage() . "\n"); return; } /* diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index 8c25ebc62..a6b8e04ab 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -108,7 +108,7 @@
今日充值
¥{$today}昨日充值
¥{$yesterday}本月充值
¥{$month}上月充值
¥{$lastmonth}总计充值
¥{$total}推广总用户
{$user_count}推广总充值
¥{$total_money}当日新增用户充值
¥{$today_add_user_money}当月新增用户充值
¥{$month_add_user_money}昨日注册用户
{$yesterday_user_regist_count}昨日充值金额
¥{$yesterday_total_money}今日注册用户
{$yesterday_regist_user_count}今日充值金额
¥{$yesterday_total_money}+ {$gg.title} + {$gg.update_time|date="Y/m/d",###} +
++ {$xx.title} + {$xx.update_time|date="Y/m/d",###} +
++ {$zx.title} + {$zx.update_time|date="Y/m/d",###} +
+今日开服
+开服预告
+游戏ICON | +游戏名称 | +平台 | +开服时间 | +服务器信息 | +|||
---|---|---|---|---|---|---|---|
暂无数据 | |||||||
+ | {$data.game_name} | +{$data.start_time|date="m-d H:i",###} | +{$data.server_name} | +
+ {$data.title} + {$data.update_time|date="Y/m/d",###} +
+图标 | +模块名称 | +是否添加 | +操作 | +||||
---|---|---|---|---|---|---|---|
暂无数据 | |||||||
+ | {$data.name} | +
玩家帐号 | -推广账号 | -游戏名称 | -平台 | -游戏区服 | -角色名 | -等级 | -创建时间 | -
---|---|---|---|---|---|---|---|
暂无数据 | |||||||
{$vo.user_account} | -{$vo.promote_account} | -{$vo.game_name} | -{:getSDKTypeName($vo['sdk_version'])} | -{$vo.server_name} | -{$vo.role_name} | -{$vo.role_level} | -{$vo.play_time|date='Y-m-d H:i:s',###} | -
玩家账号 | +游戏名称 | +平台 | +游戏区服 | +角色名 | +等级 | +充值总额 | +充值次数 | +今日充值 | +未登录天数 | +最后登录时间 | +组长|推广员 | +
---|---|---|---|---|---|---|---|---|---|---|---|
暂无数据 | |||||||||||
{$record.user_account} | +{$record.game_name} | +{:getSDKTypeName($record['sdk_version'])} | +{$record.server_name} | +{$record.role_name} | +{$record.role_level} | +{$record.recharge_cost} | +{$record.recharge_count} | +{$record.recharge_cost_today} | +{$record.unlogin_day} | +{$record.play_time|date='Y-m-d H:i:s',###} | +{$record.promote_account} | +
玩家帐号 | +推广账号 | +游戏名称 | +平台 | +游戏区服 | +角色名 | +等级 | +创建时间 | +
---|---|---|---|---|---|---|---|
暂无数据 | |||||||
{$record.user_account} | +{$record.promote_account} | +{$record.game_name} | +{:getSDKTypeName($record['sdk_version'])} | +{$record.server_name} | +{$record.role_name} | +{$record.role_level} | +{$record.play_time|date='Y-m-d H:i:s',###} | +
玩家帐号 | +推广账号 | +设备IMIE/IDFA | +设备类型 | +注册时间 | +注册IP | +最近登录时间 | +最近登陆IP | +操作 | +
---|---|---|---|---|---|---|---|---|
暂无数据 | ||||||||
{$record.account} | +{$record.promote_account} | +{$record.device_number} | ++ | {$record.register_time|date='Y-m-d H:i:s',###} | +{$record.register_ip} | +{$record.login_time|date='Y-m-d H:i:s',###} | +{$record.login_ip} | +查看角色 | +