diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 5306bc473..ddfb070e8 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -130,13 +130,13 @@ class BehaviorLogController extends ThinkController $show_data = []; foreach($data as $k => $v) { if($v['tab'] == 'spend') { - $order_detail = M('spend', 'tab_')->field('order_number,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); + $order_detail = M('spend', 'tab_')->field('extend,pay_time,user_account,promote_account,game_name,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['pay_time']; } elseif($v['tab'] == 'deposit') { $order_detail = M('deposit', 'tab_')->field('order_number,create_time,user_account,promote_account,pay_amount,pay_way')->where(['pay_order_number' => $v['pay_order_number']])->find(); $re_data['pay_time'] = $order_detail['create_time']; } - $re_data['order_number'] = !empty($order_detail['order_number']) ? $order_detail['order_number'] : '-'; + $re_data['order_number'] = isset($order_detail['extend']) ? $order_detail['extend'] : '-'; $re_data['user_account'] = $order_detail['user_account']; $re_data['promote_account'] = $order_detail['promote_account']; $re_data['game_name'] = !empty($order_detail['game_name']) ? $order_detail['game_name'] : '-'; diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index a8325b244..93b94e43f 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -3519,11 +3519,14 @@ class ExportController extends Controller // } $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/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/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/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index c1d2aafa9..bb612b71a 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -6,6 +6,7 @@ + diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 7844de6d9..f4e2a5487 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,6 +638,7 @@ border: 0; outline: 0; font-size: 0.24rem; + width: 4rem; } .input-code{ width: 4.6rem; @@ -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; @@ -813,7 +814,7 @@ margin-top: 0.46rem; } .title-two{ - margin-top: 0.77rem; + margin-top: 0.67rem; color: #292929; font-size: 0.28rem; font-weight: bold; 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