diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 2b99a255e..93b94e43f 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3512,23 +3512,27 @@ class ExportController extends Controller $start_time = $start = strtotime($start); $end_time = $end = strtotime($end) + 86400; - if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) { - $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt'); + // if (is_file(RUNTIME_PATH.'/access_data_ltv.txt')) { + // $filetxt = file_get_contents(RUNTIME_PATH.'/access_data_ltv.txt'); - $data = json_decode($filetxt, true); - } + // $data = json_decode($filetxt, true); + // } $map = " 1=1 "; $game_map = ""; - if (isset($_REQUEST['game_name'])) { + if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); - $map .= " AND game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")"; + $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_id'])) { + $game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' "; + $map .= " AND server_id = '{$_REQUEST['server_id']}' "; + }; + $game_map .= ") "; + } else if (isset($_REQUEST['game_name'])) { + $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); + $map .= " AND game_id in ({$game_ids})"; + $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; $game_map .= ") "; - } - - if (isset($_REQUEST['server_name'])) { - $map .= " AND server_name = '{$_REQUEST['server_name']}' "; } // 获取包含的用户id diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 0774439ec..dc5d31e2c 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -432,7 +432,7 @@ class PlatformController extends ThinkController unset($_REQUEST['game_name']); } if (isset($_REQUEST['server_id'])) { - $play_info_map .= " and upi.server_name = '{$_REQUEST['server_id']}' "; + $play_info_map .= " and upi.server_id = '{$_REQUEST['server_id']}' "; } $today = total(1); @@ -489,6 +489,7 @@ class PlatformController extends ThinkController ->group('tp1.id') ->order('register_time') ->select(); + // dd($tdata);die(); $tmdata = []; foreach($data as $k=>$v){ @@ -497,19 +498,18 @@ class PlatformController extends ThinkController $v['mounth'] = 0; $tmdata[$v['id']] = $v; } - foreach ($tdata as $k => $v) { - - $tmdata[$v['id']]['today'] = $v['today']; - $tmdata[$v['id']]['week'] = $v['week']; - $tmdata[$v['id']]['mounth'] = $v['mounth']; - - if (!$tmdata[$v['id']]['promote_account']) { - $tmdata[$v['id']]['promote_account'] = $v['promote_account']; - $tmdata[$v['id']]['count'] = 0; + if(!empty($tdata)){ + foreach ($tdata as $k => $v) { + $tmdata[$v['id']]['today'] = $v['today']; + $tmdata[$v['id']]['week'] = $v['week']; + $tmdata[$v['id']]['mounth'] = $v['mounth']; + if (!$tmdata[$v['id']]['promote_account']) { + $tmdata[$v['id']]['promote_account'] = $v['promote_account']; + $tmdata[$v['id']]['count'] = 0; + } } - - } + $data = []; foreach($tmdata as $k => $v){ $data[] = $v; @@ -519,7 +519,8 @@ class PlatformController extends ThinkController unset($map['tp1.chain']); unset($tmap['tp1.chain']); unset($tmap['tp1.chain']); - $map['promote_id'] = 0; + $map['u.promote_id'] = 0; + $tmap['u.promote_id'] = 0; $authorityData['count'] = 0; //如果有官方渠道权限 @@ -527,7 +528,8 @@ class PlatformController extends ThinkController if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { //官方渠道数据添加 $authorityData = M('user', 'tab_')->alias('u') - ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(id) as count') + ->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time,count(u.id) as count') + ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->where($map) ->find(); $tauthorityData = M('user', 'tab_')->alias('u') @@ -536,6 +538,7 @@ class PlatformController extends ThinkController count(IF(register_time ' . $week . ',1,null)) as week, count(IF(register_time ' . $mounth . ',1,null)) as mounth') ->where($tmap) + ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false) ->find(); $authorityData['today'] = $tauthorityData['today']; $authorityData['week'] = $tauthorityData['week']; diff --git a/Application/Admin/Controller/StatisticsController.class.php b/Application/Admin/Controller/StatisticsController.class.php index 5bb786fd6..467be7f9c 100644 --- a/Application/Admin/Controller/StatisticsController.class.php +++ b/Application/Admin/Controller/StatisticsController.class.php @@ -1035,11 +1035,14 @@ class StatisticsController extends ThinkController { $map = " 1=1 "; $game_map = ""; - if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_name'])) { + if (isset($_REQUEST['game_name']) && isset($_REQUEST['server_id'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); $map .= " AND game_id in ({$game_ids})"; $game_map = " AND EXISTS (SELECT upi.user_id FROM tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id "; - if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' "; + if (isset($_REQUEST['server_id'])) { + $game_map .= " AND upi.server_id = '{$_REQUEST['server_id']}' "; + $map .= " AND server_id = '{$_REQUEST['server_id']}' "; + }; $game_map .= ") "; } else if (isset($_REQUEST['game_name'])) { $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')); diff --git a/Application/Admin/View/Platform/promote_statistics.html b/Application/Admin/View/Platform/promote_statistics.html index 78e9e9ea8..bc83d84e4 100644 --- a/Application/Admin/View/Platform/promote_statistics.html +++ b/Application/Admin/View/Platform/promote_statistics.html @@ -286,14 +286,15 @@ $("#game_id").change(function(){ $.ajax({ - url:"{:U('Ajax/getUserServer')}", + url:"{:U('getSpendServer')}", type:"post", data:{game_id:$("#game_id option:selected").attr('game-id')}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } $("#server_id").empty(); $("#server_id").append(str); @@ -306,14 +307,15 @@ var game_server = "{:I('server_id')}"; if(game_id){ $.ajax({ - url:"{:U('Ajax/getUserServer')}", + url:"{:U('getSpendServer')}", type:"post", - data:{game_id:game_id,type:2}, + data:{game_name:game_id}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } $("#server_id").empty(); $("#server_id").append(str); diff --git a/Application/Admin/View/Promote/linkInfo.html b/Application/Admin/View/Promote/linkInfo.html index 4609a2a0e..11a562686 100644 --- a/Application/Admin/View/Promote/linkInfo.html +++ b/Application/Admin/View/Promote/linkInfo.html @@ -65,7 +65,7 @@ diff --git a/Application/Admin/View/Statistics/ltv.html b/Application/Admin/View/Statistics/ltv.html index 21d660723..fe5a31fd4 100644 --- a/Application/Admin/View/Statistics/ltv.html +++ b/Application/Admin/View/Statistics/ltv.html @@ -64,7 +64,7 @@
-
@@ -128,7 +128,7 @@ 'end'=>I('end',date('Y-m-d',strtotime('-1 day'))), 'game_name'=>I('game_name'), 'game_type'=>I('game_type'), - 'server_name'=>I('server_name'), + 'server_id'=>I('server_id'), 'xlsname'=>'统计_ltv统计' ),false)}">导出 {$_page|default=''} @@ -222,7 +222,7 @@ $(function(){ pickerPosition:'bottom-right' }); - var game_server = "{:I('server_name')}"; + var game_server = "{:I('server_id')}"; $("#game_type").change(function(){ console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}) $.ajax({ @@ -234,11 +234,11 @@ $(function(){ console.log(data) str = ""; for (var i in data){ - str += "" + str += "" } - $("#server_name").empty(); - $("#server_name").append(str); - $("#server_name").select2(); + $("#server_id").empty(); + $("#server_id").append(str); + $("#server_id").select2(); } }) }); diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 0c8145339..aaed98006 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -42,7 +42,13 @@ class HomeController extends Controller $secret = 'd3219c70a45c5e1954be4608b288d38b'; $tokenUrl = 'https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=' . $appid . '&secret=' . $secret; - $content = file_get_contents(RUNTIME_PATH . 'Data/wechat_ticket'); + $tempDataDir = RUNTIME_PATH . 'Data'; + if(!is_dir($tempDataDir)) { + @mkdir($tempDataDir); + } + + $content = file_get_contents($tempDataDir . '/wechat_ticket'); + $ticketData = null; if ($content) { $ticketData = json_decode($content, true); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index c1d2aafa9..279e4f0d1 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -6,6 +6,7 @@ + @@ -467,7 +468,7 @@
注册即表示同意
- 《用户协议》 + 《用户协议》
diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 7844de6d9..2d467bbcf 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -440,7 +440,7 @@ width: 4.40rem; height:0.7rem; margin: 0.15rem 0; - background:linear-gradient(0deg,rgba(210,211,211,1),rgba(209,209,209,1)); + background:linear-gradient(0deg,rgba(196,196,196,1),rgba(217,218,218,1)); box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17); border-radius:0.35rem; text-align: center; @@ -588,7 +588,7 @@ } .register-box{ width: 6rem; - height: 7.2rem; + height: 7.4rem; background-color: #fff; border-radius: 0.3rem; } @@ -624,7 +624,7 @@ .input-box{ display: flex; align-items: center; - width: 4.6rem; + width: 4.4rem; border-bottom: 1px solid #C9C9C9; padding-bottom: 0.14rem; margin-bottom: 0.51rem; @@ -638,9 +638,10 @@ border: 0; outline: 0; font-size: 0.24rem; + width: 4rem; } .input-code{ - width: 4.6rem; + width: 4.4rem; display: flex; align-items: flex-end; justify-content: space-between; @@ -689,7 +690,7 @@ line-height: 0.7rem; } .register-forget{ - width: 5.4rem; + width: 4.8rem; display: flex; align-items: center; justify-content: space-between; @@ -782,6 +783,7 @@ color: #292929; font-size: 0.28rem; font-weight: bold; + width: 4.6rem; } .title-one>img{ width: 0.3rem; @@ -801,7 +803,7 @@ font-weight: 400; } .mounting-btn{ - width:4.4rem; + width:4.6rem; height:0.7rem; background:linear-gradient(0deg,rgba(33,177,235,1),rgba(88,197,240,1)); box-shadow:0px 0.11rem 0.27rem 0px rgba(24,24,24,0.17); @@ -813,10 +815,11 @@ margin-top: 0.46rem; } .title-two{ - margin-top: 0.77rem; + margin-top: 0.67rem; color: #292929; font-size: 0.28rem; font-weight: bold; + width: 4.6rem; } diff --git a/Public/Home/images/20191225/biaoshi.png b/Public/Home/images/20191225/biaoshi.png new file mode 100644 index 000000000..fb07436ee Binary files /dev/null and b/Public/Home/images/20191225/biaoshi.png differ