From 44407cdb8901d53f83a396cf2b4a47f48067b428 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Dec 2019 17:36:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=AC=E5=8F=B8=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/FinancePromote/gameStatistics.html | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index b74f6856a..3ae3429f6 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -288,20 +288,6 @@ $("#search").click(); } }); - // $(".ljcz").click(function(){ - // var id = $(this).attr('data-value'); - // var game_name = "{:I('game_name')}"; - // var server_name = "{:I('server_id')}"; - // layer.open({ - // type: 2, - // title: '游戏消费记录', - // shadeClose: true, - // shade: 0.8, - // area: ['70%', '80%'], - // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); - // }); - function get_game_list() { var game_name = "{:I('game_name')}"; @@ -358,16 +344,16 @@ // console.log(str); $("#partner_id").empty(); $("#partner_id").append(str); - // $("#server_id").select2(); + $("#partner_id").select2(); } }) } - $("#game_name, #game_type").change(function(){ - get_partnet_list(); - }); + // $("#game_name, #game_type").change(function(){ + // get_partnet_list(); + // }); - $("#game_name").change(); + // $("#game_name").change(); }) From ea3cdf26d8bdfd307dab3416477bda03345f6554 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 24 Dec 2019 17:42:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=88=E4=BD=9C=E5=85=AC=E5=8F=B8=E4=B8=8E?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=81=94=E5=8A=A8=20=E7=9B=B4=E5=85=85?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E6=98=8E=E7=BB=86=E5=A4=9A=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=AF=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/Finance/gameStatistics.html | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 95c02a6b0..c105152c1 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -276,7 +276,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url, 'no'] + content: url }); }); @@ -318,21 +318,8 @@ $("#search").click(); } }); - $(".ljcz").click(function(){ - var id = $(this).attr('data-value'); - var game_name = "{:I('game_name')}"; - var server_name = "{:I('server_id')}"; - layer.open({ - type: 2, - title: '游戏消费记录', - shadeClose: true, - shade: 0.8, - area: ['70%', '80%'], - content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - }); - }); - /* function get_game_list() + function get_game_list() { var game_name = "{:I('game_name')}"; var partner_id = $("#partner_id option:selected").val(); @@ -353,14 +340,18 @@ // console.log(str); $("#game_name").empty(); $("#game_name").append(str); - // $("#server_id").select2(); + $("#game_name").select2(); } }) } $("#partner_id, #sdk_type").change(function(){ get_game_list(); - });*/ + }); + + $("#game_name, #sdk_type").change(function(){ + get_partnet_list(); + }); $('#time-start').datetimepicker({ format: 'yyyy-mm-dd', @@ -396,11 +387,9 @@ return false; }); - /* $("#partner_id").change(); - function get_partnet_list() { - var partner_id = "{:I('partner_id')}"; + var partner_id = $('#partner_id').val(); $.ajax({ url:"{:U('Finance/getPartnetList')}", type:"post", @@ -414,7 +403,7 @@ // console.log(str); $("#partner_id").empty(); $("#partner_id").append(str); - // $("#server_id").select2(); + $("#partner_id").select2(); } }) @@ -423,11 +412,6 @@ get_partnet_list(); }); - $("#game_name").change(); - if ("{:I('get.game_name')}") { - $('#select2-game_name-container').text("{:I('get.game_name')}"); - }*/ - }) From 3244238849ac24dcdf923c1d981c117c30576e64 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 24 Dec 2019 17:46:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/gameStatistics.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index c105152c1..11f33657e 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -92,7 +92,7 @@