diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 713f67a4f..622619e61 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -301,7 +301,7 @@ class AutoPackController extends Think $applys = M('apply', 'tab_')->field('id,game_id,game_name,promote_id,promote_account,sdk_version') ->where($map) ->order('bale_sort desc,id desc') - ->limit(12) + ->limit(15) ->select(); if (count($applys) == 0) { diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index dc9e97c15..80f10074a 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -49,10 +49,9 @@ class ExportController extends Controller //导出Excel function expUser($id) { - $xlsName = $_REQUEST['xlsname']; + $xlsName = $_REQUEST['xlsname']; switch ($id) { case 1: - $xlsCell = array( array('user_account', "玩家账号"), array('game_name', "游戏名称"), @@ -866,6 +865,11 @@ class ExportController extends Controller unset($_REQUEST['time-start']); unset($_REQUEST['time-end']); } + if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { + $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1)); + unset($_REQUEST['timestart']); + unset($_REQUEST['timeend']); + } if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) { $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1)); unset($_REQUEST['start']); @@ -1004,7 +1008,7 @@ class ExportController extends Controller array('pay_amount', "充值平台币"), array('pay_way', "充值方式", 'get_pay_way', '*'), array('pay_ip', "充值ip"), - array('create_time', "充值时间", 'time_format'), + array('create_time', "充值时间"), array('pay_status', L('Order_status'), 'get_info_status', '*', '9'), array('', "共计充值{$total}"), ); @@ -1012,6 +1016,10 @@ class ExportController extends Controller ->where($map) ->order('id DESC') ->select(); + foreach ($xlsData as $key => $value) { + $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']); + } +// dd($xlsData); break; case 9: $xlsName = $xlsName?$xlsName:"平台币发放"; @@ -1542,6 +1550,7 @@ class ExportController extends Controller $xlsName = $xlsCell = $xlsData = []; } + //数据处理 foreach ($xlsData as $key => $val) { foreach ($xlsCell as $k => $v) { @@ -3419,80 +3428,131 @@ if ($key == 'model'){ * 登录记录 * @author 鹿文学 */ - public function login_record() { + public function login_record() { - $xlsName = $_REQUEST['xlsname']; + $xlsName = $_REQUEST['xlsname']; - $xlsCell = array( - array('user_account','玩家账号'), - array('game_name','游戏名称'), - array('server_name','游戏区服'), - array('user_nickname','角色名'), - array('login_time','登录时间'), - array('login_ip','最后登录ip'), - ); +// $xlsCell = array( +// array('user_account','玩家账号'), +// array('game_name','游戏名称'), +// array('server_name','游戏区服'), +// array('user_nickname','角色名'), +// array('login_time','登录时间'), +// array('login_ip','最后登录ip'), +// ); + $xlsCell = array( + '玩家账号', + '游戏名称', + '游戏区服', + '角色名', + '登录时间', + '最后登录ip', + ); - if (isset($_REQUEST['login_ip'])) { - $map['login_ip'] = $_REQUEST['login_ip']; - } - if (isset($_REQUEST['game_id'])) { - $map['game_id'] = $_REQUEST['game_id']; - } - if (isset($_REQUEST['game_name'])) { - $map['game_name'] = ['like', $_REQUEST['game_name']."%"]; - unset($_REQUEST['game_name']); - } - if (isset($_REQUEST['game_type'])) { - $map['sdk_version'] = $_REQUEST['game_type']; - unset($_REQUEST['game_type']); - } - if (isset($_REQUEST['server_name'])) { - $map['server_name'] = $_REQUEST['server_name']; - unset($_REQUEST['server_name']); - } - if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { - $map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1)); - }elseif(isset($_REQUEST['timestart'])){ - $map['login_time'] = array('GT',strtotime($_REQUEST['timestart'])); - }elseif(isset($_REQUEST['timeend'])){ - $map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1)); - } - if (isset($_REQUEST['account'])) { - $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%'); - } - - $map['login_time'] = array('neq', 0); - $page = intval($_REQUEST['p']); + if (isset($_REQUEST['login_ip'])) { + $map['login_ip'] = $_REQUEST['login_ip']; + } + if (isset($_REQUEST['game_id'])) { + $map['game_id'] = $_REQUEST['game_id']; + } + if (isset($_REQUEST['game_name'])) { + $map['game_name'] = ['like', $_REQUEST['game_name']."%"]; + unset($_REQUEST['game_name']); + } + if (isset($_REQUEST['game_type'])) { + $map['sdk_version'] = $_REQUEST['game_type']; + unset($_REQUEST['game_type']); + } + if (isset($_REQUEST['server_name'])) { + $map['server_name'] = $_REQUEST['server_name']; + unset($_REQUEST['server_name']); + } + if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) { + $map['login_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1)); + }elseif(isset($_REQUEST['timestart'])){ + $map['login_time'] = array('GT',strtotime($_REQUEST['timestart'])); + }elseif(isset($_REQUEST['timeend'])){ + $map['login_time'] = array('lt',(strtotime($_REQUEST['timeend'])+ 24 * 60 * 60 - 1)); + } + if (isset($_REQUEST['account'])) { + $map['user_account'] = array('like', '%' . trim($_REQUEST['account']) . '%'); + } - $page = $page?$page:1; + if (isset($_REQUEST['promote_id'])) { + $map['promote_id'] = $_REQUEST['promote_id']; + } - $row = $_REQUEST['row']?$_REQUEST['row']:10; +// $map['login_time'] = array('neq', 0); - $data = M('UserLoginRecord','tab_') - ->where($map)->order('id desc')->select(); + $page = intval($_REQUEST['p']); - $xlsData = []; + $page = $page?$page:1; - foreach($data as $k => $v) { + $row = $_REQUEST['row']?$_REQUEST['row']:10; - $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']); - $v['server_name'] = empty($v['server_name'])?'空':$v['server_name']; - $gamename=trim(get_game_name($v['game_id'],'id')); + //查询数量 + $accessNum = M('UserLoginRecord','tab_') + ->where($map)->order('id desc')->count(); - $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename; + if ($accessNum > 1000000) { + echo "数据量过大，大于100万";die(); + } - $xlsData[] = $v; + $csvFileName = $xlsName.'.csv'; + //设置好告诉浏览器要下载excel文件的headers + header('Content-Description: File Transfer'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment; filename="'. $csvFileName .'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + $fp = fopen('php://output', 'a');//打开output流 + mb_convert_variables('GBK', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 - } + $perSize = 50000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + for($i = 1; $i <= $pages; $i++) { + $data = M('UserLoginRecord','tab_') + ->field("user_account,game_name,server_name,user_nickname,login_time,login_ip") + ->where($map) + ->limit(($i-1)*$perSize ,$perSize) + ->order('id desc') + ->select(); - $this->exportExcel($xlsName, $xlsCell, $xlsData); + foreach($data as $k => $v) { - } + $v['login_time'] = date('Y-m-d H:i:s',$v['login_time']); + $v['server_name'] = empty($v['server_name'])?'空':$v['server_name']; + +// $gamename=trim(get_game_name($v['game_id'],'id')); + +// $v['game_name'] = empty($gamename)?($v['type']==2?'APP登录':'平台登录'):$gamename; + + $xlsData[] = $v; + + mb_convert_variables('GBK', 'UTF-8', $v); + fputcsv($fp, $v); + } + + unset($xlsData);//释放变量的内存 + //刷新输出缓冲到浏览器 + ob_flush(); + flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 + } +// $xlsData = []; + + exit(); + + +// $this->exportExcel($xlsName, $xlsCell, $xlsData); + + } /** diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php index 864003999..0e1304463 100644 --- a/Application/Admin/Controller/FileController.class.php +++ b/Application/Admin/Controller/FileController.class.php @@ -209,9 +209,9 @@ class FileController extends AdminController ); //TODO:上传到远程服务器 // 添加水印 - if ($_REQUEST['flag']) { - $this->addWatermarkOnPic($info['download']); - } +// if ($_REQUEST['flag']) { +// $this->addWatermarkOnPic($info['download']); +// } /* 记录图片信息 */ if ($info) { @@ -249,8 +249,6 @@ class FileController extends AdminController C("UPLOAD_{$file_driver}_CONFIG"), $_REQUEST['flag'] ); //TODO:上传到远程服务器 - - /* 记录图片信息 */ if ($info) { $return['status'] = 1; diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index afde5599c..b24903687 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -788,13 +788,20 @@ class MemberController extends ThinkController $map['server_name'] = $_REQUEST['server_name']; unset($_REQUEST['server_name']); } + if (isset($_REQUEST['promote_id'])) { + $map['promote_id'] = $_REQUEST['promote_id']; + unset($_REQUEST['promote_id']); + } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); $extend['map'] = $map; - + $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false); + $sql = "select count(user_id) as count from ({$count})t"; + $count = M('UserLoginRecord','tab_')->query($sql); $this->m_title = '登录记录'; + $this->assign('user_count',$count[0]['count']); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find()); parent::lists("UserLoginRecord", $p, $extend['map']); @@ -1231,6 +1238,24 @@ class MemberController extends ThinkController } $list = M('device_bans', 'tab_')->where($map)->page($p, $row)->select(); $count = M('device_bans', 'tab_')->where($map)->count(); + if (!empty($list)) { + foreach ($list as &$item) { + switch ($item['type']) { + case '1': + $item['type_name'] = '设备号'; + break; + case '2': + $item['type_name'] = 'IP'; + break; + case '3': + $item['type_name'] = '落地页链接'; + break; + case '4': + $item['type_name'] = '下载链接'; + break; + } + } + } $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); @@ -1249,9 +1274,15 @@ class MemberController extends ThinkController if (empty($type) || empty($tag)) { return $this->error("请填写完整信息"); } + if (\in_array($type, [3,4]) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $tag)) { + return $this->error("请填写正确的url地址"); + } if ($type == 2 && !preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag)) { return $this->error("请填写正确的ip信息，如127.0.0.1"); } + if ($type == 1 && (preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag) || preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $tag))) { + return $this->error("请填写正确的设备信息"); + } $map['type'] = $type; $map['tag'] = $tag; $item = M('device_bans', 'tab_')->where($map)->find(); diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index a1d9bc50f..b4a22e062 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -81,6 +81,8 @@ class MendController extends ThinkController { "order_time"=>$create['order_time'], "type"=>2, "shift_ids"=>[$create['user_id']], + "creator_type"=>0, + "creator_id"=>$_SESSION["onethink_admin"]["user_auth"]["uid"] ); if(!empty($create['remark'])){ $params['remark'] = $create['remark']; @@ -111,13 +113,16 @@ class MendController extends ThinkController { { $id = I('id'); $info = M("shift_task")->where("id = {$id} and status = 0")->find(); + if(empty($info)){ $this->error("补链不存在或已处理"); } $info['user_id'] = json_decode($info['shift_ids'])[0]; - $info['order_time'] = date("Y-m-d",$info['order_time']); + $info['order_time'] = date("Y-m-d",$info['order_time']); + $userid = $info['user_id']; + $info['account'] = M("User","tab_")->field("account")->where("id = '{$userid}'")->find()['account']; $this->assign('data',$info); $this->display(); } @@ -127,9 +132,9 @@ class MendController extends ThinkController { $id = I('id'); $status = M('ShiftTask')->where(['id' => $id,'status' => 0])->save(['status' => 2]); if ($status) { - $this->success('取消补链成功', U('lists'), 2); + $this->ajaxReturn(array("status"=>1,"url"=> U('lists'))); } else { - $this->error("取消失败，或补链已生效",U('lists')); + $this->ajaxReturn(array("status"=>0,"url"=> U('lists'))); } } } diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php index 3f3ee2da9..325a530f8 100644 --- a/Application/Admin/Controller/StatController.class.php +++ b/Application/Admin/Controller/StatController.class.php @@ -604,7 +604,11 @@ class StatController extends ThinkController ->where($map) ->group('user_id') ->find(); - $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + if (!empty($data[$key]['register_num'])) { + $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + } else { + $data[$key]['keep_num'] = 0; + } //充值 $map = $map_list; empty($game_name ) || $map['game_name'] = array('like','%'.$game_name.'%'); @@ -638,12 +642,24 @@ class StatController extends ThinkController $data[$key]['new_pop'] = $query[0]['num']; //付费率 - $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + if (!empty($data[$key]['act_user'])) { + $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + } else { + $data[$key]['spend_rate'] = 0; + } //ARPU - $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); - //ARPPU - $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + if (!empty($data[$key]['act_user'])) { + $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + } else { + $data[$key]['ARPU'] = 0; + } + //ARPPU + if (!empty($data[$key]['spend_people'])) { + $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + } else { + $data[$key]['ARPPU'] = 0; + } //累计付费玩家 $map = $map_list; empty($hasbindcoins) || $map['pay_way'] = $hasbindcoins['pay_way']; @@ -1144,7 +1160,11 @@ class StatController extends ThinkController ->join("right join tab_user_login_record as ur on ur.user_id = tab_user.id and FROM_UNIXTIME(ur.login_time,'%Y-%m-%d') = '{$login_time}'") ->where($mapl) ->find(); - $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + if (!empty($data[$key]['register_num'])) { + $data[$key]['keep_num'] = round($num['num']/$data[$key]['register_num'],4)*100; + } else { + $data[$key]['keep_num'] = 0; + } //充值 $mapl = $map_list; empty($game_name ) || $mapl['game_name'] = array('like','%'.$game_name.'%'); @@ -1157,15 +1177,26 @@ class StatController extends ThinkController //付费玩家数 $data[$key]['spend_people'] = $spend['people']; //付费率 - $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + if (!empty($data[$key]['act_user'])) { + $data[$key]['spend_rate'] = round($data[$key]['spend_people']/$data[$key]['act_user'],4)*100; + } else { + $data[$key]['spend_rate'] = 0; + } //ARPU - $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + if (!empty($data[$key]['act_user'])) { + $data[$key]['ARPU'] = round($data[$key]['spend']/$data[$key]['act_user'],2); + } else { + $data[$key]['ARPU'] = 0; + } //ARPPU - $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); - if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){ - unset($data[$key]); + if (!empty($data[$key]['spend_people'])) { + $data[$key]['ARPPU'] = round($data[$key]['spend']/$data[$key]['spend_people'],2); + } else { + $data[$key]['ARPPU'] = 0; } - +// if($data[$key]['register_num']==0&&$data[$key]['act_user']==0&&$data[$key]['keep_num']==0&&$data[$key]['spend']==0&&$data[$key]['spend_people']==0){ +// unset($data[$key]); +// } } $count=count($data); if($count > $row){ @@ -1180,6 +1211,7 @@ class StatController extends ThinkController $this->assign('list_data',$data); $this->display(); } + function game_analysis(){ if($_REQUEST['time-start']!=''&&$_REQUEST['time-end']!=''){ $start=$_REQUEST['time-start']; @@ -1375,7 +1407,7 @@ class StatController extends ThinkController $model = M('device_statistics','tab_'); if ($type == 0) { - $return = $model->sum('new_device'); + $return = $model->where(['time'=>['neq',0]])->sum('new_device'); // $return = $device->all_device(); } else if($type == 1) { $return = $model->where(['time'=>array('between',[$todaystart,$todaystart+86399])])->sum('new_device'); diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 5cd2b799a..2a089ff0e 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -141,9 +141,15 @@ class TimingController extends AdminController { //当日新增设备 $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>1])->group('unique_code')->select(false); $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count(); + $data['time'] = $startTime; echo $data['new_device'].' '; + $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])]); + $newSqls = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->group('unique_code')->select(false); + $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSqls . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7; + $data['version'] = 1; + $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->find(); echo "\n"; if (!$getStatistics) { @@ -151,13 +157,14 @@ class TimingController extends AdminController { } else { M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->save($data); } - + $data['duration7'] = 0; echo date("Y-m-d",$startTime).' 苹果 '; //当日新增设备 $newSql = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->where(['version'=>2])->group('unique_code')->select(false); $data['new_device'] = M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime,$startTime+86399])])->order('create_time')->count(); echo $data['new_device'].' '; + $data['version'] = 2; $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>2])->find(); echo "\n"; diff --git a/Application/Admin/View/Member/device_bans_edit.html b/Application/Admin/View/Member/device_bans_edit.html index 275ac0adc..5d1ba903d 100644 --- a/Application/Admin/View/Member/device_bans_edit.html +++ b/Application/Admin/View/Member/device_bans_edit.html @@ -11,10 +11,13 @@
  • - + +
  • diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html index e3549e2bf..9eb370005 100644 --- a/Application/Admin/View/Member/device_bans_list.html +++ b/Application/Admin/View/Member/device_bans_list.html @@ -48,6 +48,8 @@ + +
    @@ -95,7 +97,7 @@ {$data.id} - + {$data.type_name} {$data.tag} {:get_admin_nickname($data['operator_id'])} {$data.create_time|date='Y-m-d H:i:s',###} diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 93fd046e7..8de70f9e1 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -90,6 +90,21 @@
    +
    + + - +
    +
    + +
    @@ -139,6 +154,10 @@ + + 合计 + 　　登录玩家：{$user_count}人 + @@ -178,6 +197,7 @@ highlight_subnav("{:U('Member/login_record')}"); $(function () { + Think.setValue('{$key}', "{$vo}"); $(".select_gallery").select2(); @@ -276,6 +296,28 @@ $("#game_type").change(); }); $("#game_name").change(); + + var promote_id = "{:I('promote_id')}"; + $("#promote_level").change(function(){ + $.ajax({ + url:"{:U('Ajax/getPromotersByLevel')}", + type:"get", + data:{level:$("#promote_level option:selected").val()}, + dataType:'json', + success:function(response){ + str = ''; + data = response.data; + for (var i in data){ + str += "" + } + $("#promote_id").empty(); + $("#promote_id").append(str); + $("#promote_id").select2(); + } + }) + }); + $("#promote_level").change(); + }) diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html index 2e87bce63..8cb0c4723 100644 --- a/Application/Admin/View/Mend/lists.html +++ b/Application/Admin/View/Mend/lists.html @@ -107,6 +107,7 @@ 补链前渠道 补链后渠道 备注 + 切分时间 补链时间 操作人员 @@ -126,6 +127,7 @@ {:get_title($data['remark'])} + {$data.order_time|date='Y-m-d H:i:s',###} {$data.create_time|date='Y-m-d H:i:s',###} {$data.op_account} diff --git a/Application/Admin/View/Mend/shiftInfo.html b/Application/Admin/View/Mend/shiftInfo.html index dd6f0f9a8..050614e98 100644 --- a/Application/Admin/View/Mend/shiftInfo.html +++ b/Application/Admin/View/Mend/shiftInfo.html @@ -57,7 +57,7 @@ 用户账号 - + @@ -82,13 +82,13 @@ - + 备注 @@ -130,6 +130,7 @@ + - + + + + + + + + + + {$game['relation_game_name']} - - - - - + @@ -30,47 +31,326 @@ -
    -
    - - - - - - - + +
    +
    +
    + +
    +
    {$game['relation_game_name']}
    +
    {$game['features']}
    +
    + +
    免费安装
    + +
    免费安装
    + + +
    +
    +
    +
    +
    +
    + {$game['game_score']} +
    + + + + + +
    +
    +
    14.48K个评分
    +
    +
    + #{$game['recommend_level']} +
    网络游戏
    +
    +
    + 16+ +
    年龄
    +
    +
    +
    +
      + +
    • + +
      • +       +
    +
    +
    +
    简介
    +
    {$game['features']}
    +
    +
    +
    查看更多
    +
    +
    +
    +
    评分及评论
    +
    +
    + {$game['game_score']} + 满分5分 +
    +
    +
    +
    + + + + + +
    +
    +
    +
    +
    +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    14.48K个评分
    +
    +
    +
    +
    +
    新功能
    +
    更新说明：
    +
    1、优化用户体验
    +
    +
    +
    信息
    +
    + 大小 +
    {$game['game_size']}MB
    +
    +
    + 类别 +
    游戏
    +
    +
    + 语言 +
    英语，简体中文
    +
    +
    + 年龄分级 +
    限16岁以上
    +
    +
    + 价格 +
    免费
    +
    +
    隐私政策
    +
    +
    +
    +
    +
    闽ICP备19000000号-0
    +
    闽网文{2019}1554-099号
    +
    +
    抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。
    +
    适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。
    - - - - - \ No newline at end of file diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 9e7f9172f..98b80d789 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -31,6 +31,7 @@
    玩家充值 + 说明：充值数据不包含当日
    @@ -122,7 +123,7 @@ - 今日充值 + 昨日充值 @@ -200,6 +201,7 @@ $(function(){ $(".select_gallery").select2(); var date = "{$setdate}"; + console.log(date); $('#sdate').datetimepicker({ format: 'yyyy-mm-dd', language: "zh-CN", diff --git a/Application/Media/Controller/IndexController.class.php b/Application/Media/Controller/IndexController.class.php index 6c62afa6f..ddf4dd26a 100644 --- a/Application/Media/Controller/IndexController.class.php +++ b/Application/Media/Controller/IndexController.class.php @@ -361,7 +361,7 @@ class IndexController extends BaseController { $model = array( 'm_name'=>'Game', 'prefix'=>'tab_', - 'map' =>array('game_status'=>1,'recommend_status'=>1,'display_site'=>['like','%' . DISPLAY_SITE . '%']), + 'map' =>array('game_status'=>1,'recommend_status'=>2,'display_site'=>['like','%' . DISPLAY_SITE . '%']), 'field' =>'*,min(id) as id', 'order' =>'sort desc,id desc', 'group' =>'relation_game_id', @@ -375,7 +375,7 @@ class IndexController extends BaseController { S('index_reco',$reco); } } - $reco=game_merge($reco,$model['map']); + $reco = game_merge($reco,$model['map']); $this->assign('recommend',$reco); diff --git a/Application/Media/Controller/RechargeController.class.php b/Application/Media/Controller/RechargeController.class.php index d293f70e2..98392f8e6 100644 --- a/Application/Media/Controller/RechargeController.class.php +++ b/Application/Media/Controller/RechargeController.class.php @@ -98,15 +98,15 @@ class RechargeController extends BaseController case 'alipay': //判断是否开启支付宝充值 if (pay_set_status('alipay') == 0) { - $this->error("网站未启用支付宝充值", '', 1); - exit(); +// $this->error("网站未启用支付宝充值", '', 1); +// exit(); } echo $pay->buildRequestForm($vo); break; case 'weixin': if (pay_set_status('wei_xin') == 0 && pay_set_status('weixin') == 0&&pay_set_status('weixin_gf')==0 ) { - $this->error("网站未启用微信充值", '', 1); - exit(); +// $this->error("网站未启用微信充值", '', 1); +// exit(); } if (get_wx_type() == 0) {//微信官方 $data['pay_order_number'] = $data['order_no']; diff --git a/Application/Media/View/default/Index/business.html b/Application/Media/View/default/Index/business.html index db35bcb12..abf06a821 100644 --- a/Application/Media/View/default/Index/business.html +++ b/Application/Media/View/default/Index/business.html @@ -32,7 +32,7 @@
      - +
    • @@ -42,6 +42,7 @@
      • +
    diff --git a/Application/Media/View/default/Recharge/pay.html b/Application/Media/View/default/Recharge/pay.html index 0f5b0c2d4..06610c336 100644 --- a/Application/Media/View/default/Recharge/pay.html +++ b/Application/Media/View/default/Recharge/pay.html @@ -136,20 +136,25 @@
    - + + + + + + + + +
    支付宝 -
    -     - -
    微信支付
    -     + +
    竣付通
    @@ -180,8 +185,8 @@
    - 家长监护 - 客服帮助 + 家长监护 + 客服帮助
    diff --git a/Application/Media/View/default/Service/detail.html b/Application/Media/View/default/Service/detail.html index 170e43ce9..428fa6459 100644 --- a/Application/Media/View/default/Service/detail.html +++ b/Application/Media/View/default/Service/detail.html @@ -19,7 +19,6 @@ height: 30px; padding-left: 12px; padding-right: 30px; - font-size: 1rem; } .search-icon { diff --git a/Application/Mobile/Controller/UserController.class.php b/Application/Mobile/Controller/UserController.class.php index e967dbe33..48373ab45 100644 --- a/Application/Mobile/Controller/UserController.class.php +++ b/Application/Mobile/Controller/UserController.class.php @@ -203,16 +203,15 @@ class UserController extends BaseController } else { $pid = I('get.pid', 0); $gid = I('get.gid', 0); + $from = I('get.from', ""); if ($pid > 0 || $gid > 0) { cookie('pgInfo', json_encode(['pid' => $pid, 'gid' => $gid]), 3600 * 24); } - if ($_REQUEST['url']) { $this->assign('url', base64_decode(base64_decode($_REQUEST['url']))); } else { $this->assign('url', U('User/index')); } - $this->display(); } } @@ -403,7 +402,11 @@ class UserController extends BaseController $pgInfo = strval(cookie('pgInfo')); Log::write('register:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($_POST) . ' --- ' . $pgInfo, 'INFO'); if (isset($_POST['promote_id']) && !empty($_POST['promote_id'])) { - $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $_POST['promote_account'], $sex, $nickname, $head_img); + Log::write('cxj_register:' . date('Y-m-d H:i:s') . ' ---- post' . json_encode($_POST) .' --- INFO'); + $thisPromoteAccount = M('promote', 'tab_')->where(array('id' => $_POST['promote_id']))->getField('account'); + $thisPromoteAccount = !empty($thisPromoteAccount) ? $thisPromoteAccount : '自然注册'; + $promoteAccount = isset($_POST['promote_account']) ? $_POST['promote_account'] : $thisPromoteAccount; + $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, $_POST['promote_id'], $promoteAccount, $sex, $nickname, $head_img); } else { $pid = $this->suser->register($phone, $password, $phone, $register_way, $register_type, '', '', $sex, $nickname, $head_img); } @@ -1008,10 +1011,10 @@ class UserController extends BaseController if (!$invidcard) { $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码填写不正确', 'url' => U('User/userauth'))); } - $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); - if ($cardd) { - $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); - } + // $cardd = M('User', 'tab_')->where(array('idcard' => $_POST['idcard']))->find(); + // if ($cardd) { + // $this->ajaxReturn(array('status' => -1, 'info' => '身份证号码已被使用', 'url' => U('User/userauth'))); + // } } if (C('tool_age.status') == 0) { diff --git a/Application/Mobile/View/User/login.html b/Application/Mobile/View/User/login.html index d25a26c11..a01e69225 100644 --- a/Application/Mobile/View/User/login.html +++ b/Application/Mobile/View/User/login.html @@ -29,7 +29,7 @@
    忘记密码？
    -
    还没有账号？ 账号注册 | 手机注册
    +
    还没有账号？ 账号注册 | 手机注册
    还没有账号？ 账号注册 | 手机注册
    @@ -40,17 +40,41 @@
    - +
    + +
    +
    +
    + + + 首页 + +
    +
    + + + 企业简介 +
    +
    + + + 招商合作 + +
    +
    + + + 我的 + +
    +
    +
    @@ -26,7 +26,7 @@
    -
    +
    diff --git a/Application/Mobile/View/User/register.html b/Application/Mobile/View/User/register.html index 87ca0f859..3dab79e91 100644 --- a/Application/Mobile/View/User/register.html +++ b/Application/Mobile/View/User/register.html @@ -59,12 +59,13 @@ var tis = this,that = $(tis); if (that.hasClass('disabled')) {return false;} var mobile = $.trim($('#mobile').val()); + var data = {'phone':mobile}; if (mobile) { if (/^1[0-9]{10}$/.test(mobile)) { $.ajax({ type:'POST', url:'{:U("sendsafecode")}', - data:{'phone':mobile}, + data:data, async: false, dataType:"Json", success:function(data){ diff --git a/Application/Mobile/View/User/userphone.html b/Application/Mobile/View/User/userphone.html index a2a6babdf..e71abec7a 100644 --- a/Application/Mobile/View/User/userphone.html +++ b/Application/Mobile/View/User/userphone.html @@ -100,8 +100,12 @@ $(e).removeClass('g-btn').addClass('g-btntn'); var a = setInterval(function() { r--; - $(e).text('成功'+r + '秒后重发'), - 0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), $(e).text('获取短信验证码'), clearInterval(a)) + $(e).text(r + '秒'), + $(e).css("background", "rgba(169,169,169)"); + 0 == r && ($(e).removeClass('g-btntn').addClass('g-btn'), + $(e).text('获取短信验证码'), + $(e).css("background", "rgba(33,177,235,1)"), + clearInterval(a)) },1e3) } }; diff --git a/Application/Mobile/View/User/userset.html b/Application/Mobile/View/User/userset.html index a423563cf..fb9891378 100644 --- a/Application/Mobile/View/User/userset.html +++ b/Application/Mobile/View/User/userset.html @@ -138,34 +138,7 @@
    - -
    -
    -
    - - - 首页 - -
    -
    - - - 企业简介 -
    -
    - - - 招商合作 - -
    -
    - - - 我的 - -
    -
    -
    +
    diff --git a/Application/Sdk/View/default/Spend/pay_success.html b/Application/Sdk/View/default/Spend/pay_success.html index 2e07525ba..22c772766 100644 --- a/Application/Sdk/View/default/Spend/pay_success.html +++ b/Application/Sdk/View/default/Spend/pay_success.html @@ -137,28 +137,19 @@ $("#back_success").click(function() { }catch(err){ } */ - var Scheme=$('.Scheme').val(); - var orderno=$('.orderno').val(); - var u = navigator.userAgent; - var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 - if(isAndroid){ - window.mengchuang.getPayResult('succeed'); - }else{ - - - window.location.href = Scheme+"://1&back"; - - - - - window.location.href = "mengchuang://showWapPayResult_btnType_?1&back"; - - - } + // var Scheme=$('.Scheme').val(); + // var orderno=$('.orderno').val(); + // var u = navigator.userAgent; + // var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 + // if(isAndroid){ + // window.mengchuang.getPayResult('succeed'); + // }else{ + window.location.href = '/mobile.php?s=/User/index.html'; + // } }); $("#back_error").click(function() { - + window.location.href = '/mobile.php?s=/User/index.html'; /* var orderno=$('.orderno').val(); var u = navigator.userAgent; var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 @@ -171,22 +162,22 @@ $("#back_error").click(function() { }catch(err){ } */ - var Scheme=$('.Scheme').val(); - var orderno=$('.orderno').val(); - var u = navigator.userAgent; - var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 - if(isAndroid){ - window.mengchuang.getPayResult('fail'); - }else{ - - if (!Scheme) - ; - else - window.location.href = Scheme+"://0&back"; - - window. location.href = "mengchuang://showWapPayResult_btnType_?0&back"; - - } + // var Scheme=$('.Scheme').val(); + // var orderno=$('.orderno').val(); + // var u = navigator.userAgent; + // var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端 + // if(isAndroid){ + // window.mengchuang.getPayResult('fail'); + // }else{ + // + // if (!Scheme) + // ; + // else + // window.location.href = Scheme+"://0&back"; + // + // window. location.href = "mengchuang://showWapPayResult_btnType_?0&back"; + // + // } }); diff --git a/Data/update.sql b/Data/update.sql index 14be61b6d..1490c7dbf 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -585,4 +585,31 @@ VALUES ('contact_cs', '联系客服', '[{\"name\":\"support\",\"title\":\"\\u8054\\u7cfb\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"2\",\"act\":\"3007567814\",\"ios_url\":\"3007567814\",\"sort\":\"1\",\"id\":1,\"icon\":\"\",\"cover\":\"\"}]', '', 5, 1, 1571723212 ); INSERT INTO `tab_tool` (`name`, `title`, `config`, `template`, `type`, `status`, `create_time` ) VALUES - ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 ); \ No newline at end of file + ('sdk_menu', 'SDK用户菜单', '[{\"name\":\"mine\",\"title\":\"\\u6211\\u7684\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"my\",\"ios_url\":\"\",\"sort\":\"1\",\"id\":\"1\",\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd524dfd76fa.png\",\"cover\":\"1980\"},{\"name\":\"gift\",\"title\":\"\\u793c\\u5305\",\"menu_version\":\"0\",\"url\":\"\\/sdk.php\\/GameGiftPage\\/gift_list\",\"type\":\"0\",\"act\":\"gift\",\"ios_url\":\"?action=gift\",\"sort\":\"2\",\"id\":2,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd52509f3767.png\",\"cover\":\"1981\"},{\"name\":\"support\",\"title\":\"\\u5ba2\\u670d\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"support\",\"ios_url\":\"\",\"sort\":\"3\",\"id\":3,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd5251e0aee3.png\",\"cover\":\"1982\"},{\"name\":\"message\",\"title\":\"\\u6d88\\u606f\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"msg\",\"ios_url\":\"\",\"sort\":\"4\",\"id\":4,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525606ff53.png\",\"cover\":\"1983\"},{\"name\":\"logout\",\"title\":\"\\u9000\\u51fa\",\"menu_version\":\"0\",\"url\":\"\",\"type\":\"1\",\"act\":\"logout\",\"ios_url\":\"\",\"sort\":\"5\",\"id\":5,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525d99ed99.png\",\"cover\":\"1984\"},{\"name\":\"suppersign\",\"title\":\"\\u8d85\\u7ea7\\u7b7e\",\"menu_version\":\"2\",\"url\":\"\\/mobile.php\\/ssg\\/home\",\"type\":\"2\",\"act\":\"suppersign\",\"ios_url\":\"http:\\/\\/m.wmtxkj.cn\\/mobile.php\\/ssg\\/home\",\"sort\":\"6\",\"id\":6,\"icon\":\"\\/Uploads\\/Picture\\/2019-11-20\\/5dd525f388843.png\",\"cover\":\"1985\"}]', '', 5, 1, 1571723212 ); + +-- 修改迁移 +ALTER TABLE `tab_mend` +ADD COLUMN `order_time` int(11) NOT NULL DEFAULT 0 COMMENT '订单时间' AFTER `remark`; +ALTER TABLE `sys_shift_task` +CHANGE COLUMN `create_promote_id` `creator_id` int(11) NOT NULL DEFAULT 0 COMMENT '创建渠道ID' AFTER `status`; +ALTER TABLE `sys_shift_task` +ADD COLUMN `creator_type` tinyint(1) NOT NULL DEFAULT 0 COMMENT '创建者类型 0 后台管理员 1 推广员' AFTER `creator_id`; +ALTER TABLE `tab_mend` +ADD COLUMN `op_type` tinyint(0) NOT NULL DEFAULT 0 COMMENT '0 管理员 1 推广员' AFTER `op_account`; + +--补链新增切分时间 chenzhi +UPDATE `sys_model` SET `list_grid` = 'id:编号 +user_account:账号 +user_nickname:昵称 +promote_id:推广员编号 +promote_account:推广员账号 +promote_id_to:修改后编号 +promote_account_to:修改后账号 +remark:备注 +create_time:时间 +op_account:操作人账号 +order_time:切分时间' WHERE `id` = 29; + +--新增风控类型 +ALTER TABLE `tab_device_bans` +MODIFY COLUMN `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`; diff --git a/Public/Mobile/css/remove.css b/Public/Mobile/css/remove.css index 08e5de8c5..127d48c3d 100644 --- a/Public/Mobile/css/remove.css +++ b/Public/Mobile/css/remove.css @@ -37,7 +37,7 @@ height:0.6rem; background:rgba(33,177,235,1); border-radius:0.3rem; - font-size:0.15rem; + font-size:0.28rem; font-family:PingFang SC; font-weight:400; color:rgba(255,255,255,1);