From 747c97ceec90e102b535a79d4862fb8147b60c8b Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 3 Dec 2019 18:47:27 +0800 Subject: [PATCH 01/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index f505a8857..fff5f82d7 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -259,28 +259,21 @@ class PromoteController extends BaseController $whereUser['promote_id'] = ['IN', $promoteId]; - if ($type == 1) { - $pay_time = total(1); - $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); - $end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1; - $whereUser['register_time'] = ['between', array($start, $end - 1)]; - $userId = M('user', 'tab_')->field('id')->where($whereUser)->select(); - - } else if ($type == 2) { - $pay_time = total(3); - $start = mktime(0, 0, 0, date('m'), 1, date('Y')); - $end = mktime(0, 0, 0, date('m') + 1, 1, date('Y')) - 1; + if (in_array($type, [1, 2])) { + if ($type == 1) { + $pay_time = total(1); + $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); + $end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1; + } else { + $pay_time = total(3); + $start = mktime(0, 0, 0, date('m'), 1, date('Y')); + $end = mktime(0, 0, 0, date('m') + 1, 1, date('Y')) - 1; + } $whereUser['register_time'] = ['between', array($start, $end - 1)]; - $userId = M('user', 'tab_')->field('id')->where($whereUser)->select(); + $userId = M('user', 'tab_')->where($whereUser)->getField('id', true); } -// if ($userId) { -// var_dump($userId); -// } if ($userId) { - - $userId = implode(',', array_column($userId, 'id')); -// var_dump($userId); $map1['user_id'] = $map['user_id'] = ['IN', $userId]; } else if (!$userId && $type != 0) { return array('sum_mounth' => 0, 'sum_today' => 0); @@ -333,9 +326,6 @@ class PromoteController extends BaseController } $data[] = $dbdata; } -// if ($userId) { -// echo $spend->_sql();die(); -// } foreach ($data as $key => $value) { $value['count'] ?: 0; $value['today'] ?: 0; @@ -353,8 +343,6 @@ class PromoteController extends BaseController $total = $this->data_total($data); return $total; -// - } public function data_total($data) From 34b53c4ec18bfbfa01732113919e159e29d16a43 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 4 Dec 2019 10:54:38 +0800 Subject: [PATCH 02/77] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 653bf0c53..c5e747409 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1639,10 +1639,10 @@ class DownloadController extends BaseController { $nowTime = date('Y-m-d'); $begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $endtime1 = $nowTime; - $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]]; + $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1) + 3600*24]]; } if(!empty($begtime) && !empty($endtime)) { - $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]]; + $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]]; } $serverField = ''; $serverJoin = ''; @@ -1841,12 +1841,12 @@ class DownloadController extends BaseController { $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $params['begin_time'] = $begTime; - $params['end_time'] = $endTime +3600 * 24 -1; + $params['end_time'] = $endTime -1; if(!empty($map['apply_time'][1])) { $begTime = $map['apply_time'][1][0]; $endTime = $map['apply_time'][1][1]; $params['begin_time'] = $begTime; - $params['end_time'] = $endTime + 3600 * 24 -1; + $params['end_time'] = $endTime -1; unset($map['apply_time']); } if(!empty($map['tab_server.server_id'])) { From 1c83185aaf5aaf4d9ffba453175dfc3d6f5400e2 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 4 Dec 2019 12:03:35 +0800 Subject: [PATCH 03/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From e8a4da70cc8231510e4c6ffcccc45d24e5e63545 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 4 Dec 2019 14:33:38 +0800 Subject: [PATCH 04/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 122 +++++++----------- 1 file changed, 46 insertions(+), 76 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index fff5f82d7..b718673a8 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -240,26 +240,25 @@ class PromoteController extends BaseController private function caculateSpend($pay_time, $condition, $create = [], $type = 0) { - $map1['promote_id'] = $map['promote_id'] = array('egt', 0); + $map['promote_id'] = array('egt', 0); $spend = M('Spend', 'tab_'); - $map1['pay_status'] = $map['pay_status'] = 1; + $map['pay_status'] = 1; $today = total(1); $yesterday = total(5); $week = total(2); $mounth = total(3); - unset( $map['create_time']); + $this->getLoginPromote(); - $promote_id = get_pid(); - - $promoteId = M("promote", "tab_") - ->field("id") - ->where(array('chain' => ['like', '/'.$promote_id . '/%'],'id'=>$promote_id,'_logic'=>'or')) - ->select(); - $promoteId = implode(',',array_column($promoteId,'id')); + $promoteId = $this->loginPromote['id']; - $whereUser['promote_id'] = ['IN', $promoteId]; + $promoteIds = M("promote", "tab_") + ->where(array('chain' => ['like', $this->loginPromote['chain'] . $promoteId . '/%'])) + ->getField('id', true); + $promoteIds[] = $promoteId; + $map['promote_id'] = ['IN', $promoteIds]; if (in_array($type, [1, 2])) { + $whereUser['promote_id'] = $map['promote_id']; if ($type == 1) { $pay_time = total(1); $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); @@ -271,78 +270,49 @@ class PromoteController extends BaseController } $whereUser['register_time'] = ['between', array($start, $end - 1)]; $userId = M('user', 'tab_')->where($whereUser)->getField('id', true); - } - if ($userId) { - $map1['user_id'] = $map['user_id'] = ['IN', $userId]; - } else if (!$userId && $type != 0) { - return array('sum_mounth' => 0, 'sum_today' => 0); + if ($userId) { + $map['user_id'] = ['IN', $userId]; + } else if (!$userId && $type != 0) { + return array('sum_mounth' => 0, 'sum_today' => 0); + } } - //获取所有会长 - $promote_map = "`chain` = '%/{$promote_id}/%' OR id = {$promote_id}"; - - $promote = M("promote","tab_")->field("id,account")->where($promote_map)->select(); - $data =array(); - for ($i=0; $i < count($promote); $i++) { - # code... - $proid = M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select(); - $str = ''; - for($k=0; $kfield(' - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count, - floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today, + $data = $spend + ->field(' + floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as sum_count, + floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as sum_today, floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100) as yesterday, - floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week, - floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') - ->where($map) - ->where("pay_time".$pay_time) - ->find(); - $dbdata['promote_account'] = $promote[$i]['account']; - } else { - $dbdata = $spend - ->field(' - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count, - floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today, + floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as sum_week, + floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as sum_mounth') + ->where($map) + ->where("pay_time".$pay_time) + ->find(); + } else { + $data = $spend + ->field(' + floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as sum_count, + floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as sum_today, floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100) as yesterday, - floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week, - floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') - ->where($map) - ->where("pay_time".$pay_time) - ->find(); - $dbdata['promote_account'] = $promote[$i]['account']; - } - $data[] = $dbdata; - } - foreach ($data as $key => $value) { - $value['count'] ?: 0; - $value['today'] ?: 0; - $value['week'] ?: 0; - $value['mounth'] ?: 0; - static $i = 0; - $i++; - $data[$key]['rand'] = $i; - $data[$key]['count'] = $value['count'] / 100; - $data[$key]['today'] = $value['today'] / 100; - $data[$key]['yesterday'] = $value['yesterday'] / 100; - $data[$key]['week'] = $value['week'] / 100; - $data[$key]['mounth'] = $value['mounth'] / 100; - } - $total = $this->data_total($data); + floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as sum_week, + floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as sum_mounth') + ->where($map) + ->where("pay_time".$pay_time) + ->find(); + } + $data['sum_count'] = empty($data['sum_count']) ? 0 : bcdiv($data['sum_count'], 100 ,2); + $data['sum_today'] = empty($data['sum_today']) ? 0 : bcdiv($data['sum_today'], 100 ,2); + $data['yesterday'] = empty($data['yesterday']) ? 0 : bcdiv($data['yesterday'], 100 ,2); + $data['sum_week'] = empty($data['sum_week']) ? 0 : bcdiv($data['sum_week'], 100 ,2); + $data['sum_mounth'] = empty($data['sum_mounth']) ? 0 : bcdiv($data['sum_mounth'], 100 ,2); - return $total; + return $data; } public function data_total($data) From 84fc4e367b0e88c55c11cab2de45a6d674a36d49 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 6 Dec 2019 10:04:06 +0800 Subject: [PATCH 05/77] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 1a8be9429c68ad723e043b34d3dff7bbb6a999b7 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 6 Dec 2019 14:33:16 +0800 Subject: [PATCH 06/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From 9c3b872cb9d19c704391277cc35481655e435738 Mon Sep 17 00:00:00 2001 From: "elf@home" <360197197@qq.com> Date: Sat, 7 Dec 2019 00:01:51 +0800 Subject: [PATCH 07/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 45f061d81cc740bc79dbcb9ad21c5b603bd48508 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 9 Dec 2019 11:27:30 +0800 Subject: [PATCH 08/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 16 +++++++++++++++- .../Home/View/default/Query/recharge.html | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index d928c9914..3cb662551 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -22,6 +22,11 @@ class QueryController extends BaseController 2 => '微信', ]; + public static $payStatus = [ + 0 => '下单未支付', + 1 => '充值成功', + ]; + public function recharge($p = 0) { $page = intval(I('p', 1)); @@ -85,8 +90,14 @@ class QueryController extends BaseController } } } + if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') { + $payStatus = intval(I('pay_status')); + + if (in_array($payStatus, array_keys(QueryController::$payStatus))) { + $map['tab_spend.pay_status'] = $payStatus; + } + } $map['tab_spend.pay_time'] = ['between', [$begTime, $endTime - 1]]; - $map['tab_spend.pay_status'] = 1; $map['tab_spend.is_check'] = ['neq', 2]; $data = []; @@ -161,6 +172,8 @@ class QueryController extends BaseController break; } $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); + $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态'; + $list['sdk_version'] = getSDKTypeName($list['sdk_version']); //订单隐藏算法 $orderLen = strlen($list['pay_order_number']); @@ -210,6 +223,7 @@ class QueryController extends BaseController $this->assign('serverData', $serverData['data']); $this->assign('ownId', $ownId); $this->assign('payWayData', QueryController::$payWay); + $this->assign('payStatusData', QueryController::$payStatus); $this->meta_title = "订单查询"; $this->display(); } diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 2fba74b25..c3a078c79 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -144,6 +144,19 @@ +
+ +
+
@@ -169,8 +182,10 @@ 玩家账号 游戏订单 支付方式 + 充值状态 订单金额 游戏名称 + 设备类型 区服 角色名 部门长 @@ -192,8 +207,10 @@ {$vo.user_account} {$vo.pay_order_number} {:get_pay_way($vo['pay_way'])} + {$vo.pay_status} {$vo.pay_amount} {$vo.game_name} + {$vo.sdk_version} {$vo.server_name} {$vo.game_player_name} {$vo.p_p_pro_account}({$vo.p_p_pro_real_name}) From 4aa33ad48bd3ae4f9dace568fb3ffb5079afc20c Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 14:12:55 +0800 Subject: [PATCH 09/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=A7=86?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 9fefb9e17..f434e83df 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -1,3 +1,11 @@ +.home-video{ + width: 100%; + height: 4.22rem; +} +.home-video video{ + width: 100%; + height: 100%; +} .home{ width: 100%; font-family:PingFang SC; From fb5d9afded071c192d0c119a21fa3c8e499c5663 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 14:19:02 +0800 Subject: [PATCH 10/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E4=B8=8A=E4=BC=A0=E5=92=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FileController.class.php | 4 +++- Application/Admin/Controller/GameController.class.php | 1 + Application/Home/Controller/HomeController.class.php | 3 ++- Application/Home/View/default/Home/landingPage.html | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FileController.class.php b/Application/Admin/Controller/FileController.class.php index c96c5d31d..bb6b721df 100644 --- a/Application/Admin/Controller/FileController.class.php +++ b/Application/Admin/Controller/FileController.class.php @@ -86,7 +86,9 @@ class FileController extends AdminController if (I('get.typee') == 1) { $uploader->set('path', './Uploads/Ios/description'); } - + if (strpos(I('type'),'video') !== false) { + $uploader->set('path', './Uploads/Video'); + } // var_dump($_POST); // exit; //用于断点续传，验证指定分块是否已经存在，避免重复上传 diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 6cf6890e9..c77d8e563 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -346,6 +346,7 @@ class GameController extends ThinkController $phone['back_describe'] = $sibling['back_describe']; $phone['dow_icon'] = $sibling['dow_icon']; $phone['back_map'] = $sibling['back_map']; + $phone['flooring_page_video'] = $sibling['flooring_page_video']; M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save(); //同时修改代充游戏折扣 $set_fidel['status'] = 1; diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 07d67af4e..7a99c684a 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -177,7 +177,8 @@ class HomeController extends Controller 'game_score', 'recommend_level', 'game_size', - 'introduction' + 'introduction', + 'flooring_page_video', ]; $map = ['id' => intval($gameId)]; $game = M('game', 'tab_')->field($columns)->where($map)->find(); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 33b897948..5269cd9c2 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -42,6 +42,11 @@
+ +
+ +
+
From 7bcbb6c9d1398086646c013cfc254ab6a1d359a9 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 9 Dec 2019 14:26:10 +0800 Subject: [PATCH 11/77] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 8b6c93ea7..c39f5d109 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -36,6 +36,11 @@ class DownloadController extends BaseController { 1 => '汇款中', 2 => '已汇款', ]; + + public static $payStatus = [ + 0 => '下单未支付', + 1 => '充值成功', + ]; /** * excel @@ -1204,9 +1209,15 @@ class DownloadController extends BaseController { empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%']; empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number'); - $map['tab_spend.pay_status'] = 1; + // $map['tab_spend.pay_status'] = 1; $map['tab_spend.is_check'] = ['neq', 2]; - + if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') { + $payStatus = intval(I('pay_status')); + + if (in_array($payStatus, array_keys(self::$payStatus))) { + $map['tab_spend.pay_status'] = $payStatus; + } + } $conditions = json_encode($map,TRUE); $addtime = time(); $data = [ @@ -3114,7 +3125,9 @@ class DownloadController extends BaseController { '游戏订单', '订单金额', '支付方式', + '充值状态', '游戏名称', + '设备类型', '区服', '角色名', '部门长', @@ -3184,6 +3197,8 @@ class DownloadController extends BaseController { // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); $value1['user_account'] = $this->encryption($value1['user_account']); $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); + $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态"; + $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']); switch ($value1['level']) { case 3: $value1['p_p_pro_account'] = $promoteData[$value1['parent_id']]['account']; @@ -3212,7 +3227,9 @@ class DownloadController extends BaseController { $csvData["pay_order_number"] = $value1["pay_order_number"]; $csvData["pay_amount"] = $value1["pay_amount"]; $csvData["pay_way"] = $value1["pay_way"]; + $csvData['pay_status'] = $value1['pay_status']; $csvData["game_name"] = $value1["game_name"]; + $csvData["sdk_version"] = $value1['sdk_version']; $csvData["server_name"] = $value1["server_name"]; $csvData["game_player_name"] = $value1["game_player_name"]; $csvData["p_p_proinfo"] = $value1["p_p_proinfo"]; @@ -3239,7 +3256,9 @@ class DownloadController extends BaseController { $csvData1["pay_order_number"] = "--"; $csvData1["pay_amount"] = $income; $csvData1["pay_way"] = "--"; + $csvData1['pay_status'] = "--"; $csvData1["game_name"] = "--"; + $csvData1["sdk_version"] = "--"; $csvData1["server_name"] = "--"; $csvData1["game_player_name"] = "--"; $csvData1["p_p_proinfo"] = "--"; From b0748243b9dbdf67ed5da8e0f016715e099c0d22 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 14:39:25 +0800 Subject: [PATCH 12/77] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=B8=B8=E6=88=8F-?= =?UTF-8?q?=E3=80=8B=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 169 ++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 26 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 2fe741463..fd89a7899 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -215,7 +215,7 @@ - + 游戏资料中心： @@ -355,6 +355,37 @@ 横版游戏建议尺寸：16：9，1280*720px及以上；竖版游戏建议尺寸：9：16，720*1280px及以上，用于游戏详情页内展示 + + + 落地页视频 + + +
+
+
上传视频
+
+ +
+ + + +
+

{$name}删除

+ +
+ +
+
+ + + + + + + + 知识产权 @@ -1092,6 +1123,92 @@ } }); + //上传落地页视屏 + var uploaderVideo = WebUploader.create({ + // 选完文件后，是否自动上传。 + auto: true, + // swf文件路径 + swf: '__STATIC__/webuploader/Uploader.swf', + // 文件接收服务端。 + server: backEndUrl, + // 选择文件的按钮。可选。 + // 内部根据当前运行是创建，可能是input元素，也可能是flash. + pick: {id:'#pickerVideo'}, + // dnd: true, + paste: document.body, + accept: { + title: '视频', + extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv', + mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv', + }, + // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ + resize: false, + disableGlobalDnd: true, + fileNumLimit:1, + threads:3, + compress: false, + prepareNextFile: true, + formData: function(){return $.extend(true, {}, userInfo);}, + duplicate: true + }); + + // 当有文件被添加进队列的时候 + uploaderVideo.on( 'fileQueued', function( file ) { + $("#up_status").remove(); + $("#video_thelist").html( '
' + + '

' + file.name + '

' + + '

等待上传...

' + + '
' ); + }); + + // 文件上传过程中创建进度条实时显示。 + uploaderVideo.on( 'uploadProgress', function(file, percentage) { + var $li = $( '#'+file.id ), + $percent = $li.find('.progress .progress-bar'); + // 避免重复创建 + if ( !$percent.length ) { + $percent = $('
' + + '
' + + '
' + + '
').appendTo( $li ).find('.progress-bar'); + } + $li.find('p.state').text('上传中'); + $percent.css( 'width', percentage * 100 + '%' ); + $percent.text( (percentage * 100).toFixed(0) + '%' ); + }); + + $('#beforeuploadvideo').children('.info').children('.jsdelvideo').click(function() { + $("#video_url").val(''); + $('#beforeuploadvideo').remove(); + return false; + }); + + uploaderVideo.on( 'uploadSuccess', function( file , response) { + console.log(file); + $( '#'+file.id ).find('p.state').text('已上传').fadeOut(800); + //alert(JSON.stringify(response)); + $('#'+file.id).find('h4.info').append('删除'); + + var url = response.path + "/" +response.name; + $('#'+file.id).find('h4.info').after(""); + $("#video_url").val(url); + $('#'+file.id).find('.jsdelvideo').on('click',function() { + console.log(file); + $("#video_url").val(''); + $('#'+file.id).remove(); + uploaderVideo.removeFile( file.id ); + return false; + }); + }); + + uploaderVideo.on( 'uploadError', function( file ) { + $( '#'+file.id ).find('p.state').text('上传出错'); + }); + + uploaderVideo.on( 'uploadComplete', function(file) { + $( '#'+file.id ).find('.progress').fadeOut(); + }); + var uploaderFile = WebUploader.create({ // 选完文件后，是否自动上传。 auto: true, @@ -1179,7 +1296,7 @@ uploaderFile.on( 'uploadComplete', function(file) { $( '#'+file.id ).find('.progress').fadeOut(); }); - + //游戏截图 var uploaderImg = WebUploader.create({ // 选完文件后，是否自动上传。 @@ -1215,7 +1332,7 @@ }); - + var imgListData = []; @@ -1392,7 +1509,7 @@ ); } - + - - From d690c0e4abf5b6a4f4bc15cab56c793ab8bb9aed Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 14:46:10 +0800 Subject: [PATCH 13/77] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index c1c337020..4a25ce0d3 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -652,3 +652,6 @@ CREATE TABLE `tab_server_notice` ( INSERT INTO `sys_model` ( `name`, `title`, `extend`, `relation`, `need_pk`, `field_sort`, `field_group`, `attribute_list`, `attribute_alias`, `template_list`, `template_add`, `template_edit`, `list_grid`, `list_row`, `search_key`, `search_list`, `create_time`, `update_time`, `status`, `engine_type`) VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"288\",\"290\",\"291\",\"293\",\"292\",\"287\",\"286\",\"282\",\"281\",\"283\",\"284\",\"285\",\"280\"]}', '1:基础', '', '', '', '', '', 'id:编号\r\ngame_name:游戏名称\r\nserver_name:区服名称\r\nshow_status|get_info_status:区服状态\r\nstart_time|set_show_time:开服时间\r\nserver_version:运营平台\r\ndevelopers:开发商\r\nid:操作:[EDIT]&id=[id]|编辑,ServerNotice/del?ids=[id]|删除', '10', '', '', '1480318911', '1493879217', '1', 'MyISAM'); + +--游戏表新增字段-落地页视频 liuweiwen 2019-12-09 +ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频'; From a1bdc4b9364c35b9d9a5ddda6cbb0f2e46313b39 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 14:57:54 +0800 Subject: [PATCH 14/77] =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index fd89a7899..9de61c925 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -380,7 +380,7 @@
- + 视频大小不能超过20M From 14258a01a91dbcf82f3be315c8e09b49d6a80282 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 15:26:55 +0800 Subject: [PATCH 15/77] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91=E7=9A=84=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E4=B8=8E=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 9de61c925..64b2f611b 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -1134,11 +1134,12 @@ // 选择文件的按钮。可选。 // 内部根据当前运行是创建，可能是input元素，也可能是flash. pick: {id:'#pickerVideo'}, + fileSingleSizeLimit:11*1024*1024, //设定单个文件大小 // dnd: true, paste: document.body, accept: { title: '视频', - extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv', + extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,', mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv', }, // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ @@ -1184,7 +1185,6 @@ }); uploaderVideo.on( 'uploadSuccess', function( file , response) { - console.log(file); $( '#'+file.id ).find('p.state').text('已上传').fadeOut(800); //alert(JSON.stringify(response)); $('#'+file.id).find('h4.info').append('删除'); @@ -1201,6 +1201,17 @@ }); }); + /** + * 验证文件格式以及文件大小 + */ + uploaderVideo.on("error",function (type){ + if (type=="Q_TYPE_DENIED"){ + layer.msg("不支持该视频格式"); + }else if(type=="F_EXCEED_SIZE"){ + layer.msg("视频大小不能超过20M"); + } + }); + uploaderVideo.on( 'uploadError', function( file ) { $( '#'+file.id ).find('p.state').text('上传出错'); }); From 563b672c215e983a94fb062baa133bb7763fa0a1 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 15:28:18 +0800 Subject: [PATCH 16/77] =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 64b2f611b..3315c28b0 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -1123,7 +1123,7 @@ } }); - //上传落地页视屏 + //上传落地页视频 var uploaderVideo = WebUploader.create({ // 选完文件后，是否自动上传。 auto: true, @@ -1134,7 +1134,7 @@ // 选择文件的按钮。可选。 // 内部根据当前运行是创建，可能是input元素，也可能是flash. pick: {id:'#pickerVideo'}, - fileSingleSizeLimit:11*1024*1024, //设定单个文件大小 + fileSingleSizeLimit:20*1024*1024, //设定单个文件大小 // dnd: true, paste: document.body, accept: { From dfa14fbbc7410c404c46576b4ea8df9057494dc7 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 15:33:01 +0800 Subject: [PATCH 17/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 5269cd9c2..6d725bbb0 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -44,7 +44,7 @@
- +
From 53a4038622d114ef9120952896f5db5ff9cb7da1 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 15:41:02 +0800 Subject: [PATCH 18/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 6d725bbb0..368ac25d9 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -44,7 +44,7 @@
- +
From 5697e8d2c69fbf2c32eb43d5ee2ecf05c9d915a3 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 15:43:05 +0800 Subject: [PATCH 19/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 368ac25d9..1848ae692 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -44,7 +44,7 @@
- +
@@ -296,6 +296,11 @@ + + + diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index f434e83df..68b8e0aa1 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -1,3 +1,21 @@ + +.home{ + width: 100%; + font-family:PingFang SC; +} +.home-box{ + padding: 0.5rem 0.37rem 0 0.31rem; +} +.home-fiexd{ + height: 4.22rem; + width: 100%; +} +.home-fiexdBox{ + position: fixed; + width: 100%; + top: 0; + left: 0; +} .home-video{ width: 100%; height: 4.22rem; @@ -6,12 +24,45 @@ width: 100%; height: 100%; } -.home{ +.fiexd-heard{ width: 100%; - font-family:PingFang SC; + height: 1.2rem; + background: rgba(255, 255, 255, 0); } -.home-box{ - padding: 0.5rem 0.37rem 0 0.31rem; +.fiexd-heardBox{ + padding: 0 0.3rem; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 0.32rem; + color: #007AFF; + line-height: 1.2rem; +} +.fiexd-heardBox>img{ + width: 0.6rem; + height: 0.6rem; + border-radius: 0.1rem; + margin-left: 1rem; +} +.fiexd-pay{ + display: flex; + align-items: center; +} +.fiexd-pay>span{ + color: #A9A9A9; + font-size: 0.2rem; + margin-right: 0.14rem; +} +.fiexd-pay>div{ + width: 1.5rem; + height: 0.6rem; + background-color: #007AFF; + border-radius: 0.3rem; + color: 0.32rem; + text-align: center; + line-height: 0.6rem; + color: #fff; + font-weight: 500; } .heard{ width: 100%; @@ -519,3 +570,5 @@ font-weight: 500; } + + From 52b134fe90c3c0f7476e37943738cd8262656d14 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Mon, 9 Dec 2019 18:25:00 +0800 Subject: [PATCH 23/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 2 +- Public/Home/css/index2.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 923835524..3aee218ee 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -55,7 +55,7 @@
- - 横版游戏建议尺寸：16：9，1280*720px及以上；竖版游戏建议尺寸：9：16，720*1280px及以上，用于游戏详情页内展示 + 建议尺寸：750*1334，图片大小不超过3M @@ -1562,6 +1562,7 @@ id:'#screenshot', multiple:true }, + fileSingleSizeLimit:3*1024*1024, //设定单个文件大小 // dnd: false, paste: document.body, accept: { @@ -1655,6 +1656,15 @@ $percent.text( (percentage * 100).toFixed(0) + '%' ); }); + /** + * 验证文件格式以及文件大小 + */ + uploaderVideo.on("error",function (type){ + if(type=="F_EXCEED_SIZE"){ + layer.msg("视频大小不能超过3M"); + } + }); + uploaderImgScreen.on( 'uploadSuccess', function( file , response) { imgListScreenData.push(Number(response.id)); console.log(imgListScreenData) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index ff6301680..aab22d5cf 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -209,6 +209,13 @@ class HomeController extends Controller } $game['flooring_page_imgs'] = $imageUrls; + $screenshotIds = explode(',', $game['screenshot']) ?? []; + $screenshotUrls = []; + foreach ($screenshotIds as $screenshotId) { + $screenshotUrls[] = get_cover($screenshotId, 'path'); + } + $game['screenshot'] = $screenshotUrls; + $isNewIos = false; if ($gameSource['is_new_sdk'] == 1) { $isNewIos = true; diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index bdca5ba6e..fab68793e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -113,7 +113,7 @@
    - +
    • From c451921b92725e3256049984133414bffadfaca7 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 17:07:38 +0800 Subject: [PATCH 37/77] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0IOS?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoPackController.class.php | 2 +- Application/Admin/Event/SourceEvent.class.php | 1 - Application/Admin/View/GameSource/add.html | 10 ++++++++++ Application/Admin/View/GameSource/edit.html | 11 ++++++++++- Application/Base/Service/GameSourceService.class.php | 5 +++-- Application/Home/Controller/HomeController.class.php | 6 +++--- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 622619e61..e7da748cd 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -319,7 +319,7 @@ class AutoPackController extends Think $launchCountList = M('apply_launch', 'tab_')->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); $launchCountList = index_by_column('apply_id', $launchCountList); - $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select(); + $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id', 'is_new_sdk'])->where(['game_id' => ['in', $gameIds]])->select(); $gameSources = index_by_column('game_id', $gameSources); $gameSourceService = new GameSourceService(); diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 8627141d9..64c9862bb 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -96,7 +96,6 @@ class SourceEvent extends Controller } } $data['source_version'] = $game_source['source_version'] + 1; - $version = ''; $packageName = ''; if ($data['file_type'] == 1) { diff --git a/Application/Admin/View/GameSource/add.html b/Application/Admin/View/GameSource/add.html index aeabae76f..1c9c6d83f 100644 --- a/Application/Admin/View/GameSource/add.html +++ b/Application/Admin/View/GameSource/add.html @@ -91,6 +91,14 @@ + + 是否新包 + + + + + + *上传原包 @@ -420,8 +428,10 @@ $("#game_id").change(function(){ $("#game_name").val($("#game_id option:selected").text()); $("#file_type").val(type); if (type == 2){ + $('#is-new-sdk').show(); $('#apply_bz').show(); }else{ + $('#is-new-sdk').hide(); $('#apply_bz').hide(); } //if(type == 1){$('.pack_name_class').show();}else{$('.pack_name_class').hide();} diff --git a/Application/Admin/View/GameSource/edit.html b/Application/Admin/View/GameSource/edit.html index 251a72ceb..9f4d450a8 100644 --- a/Application/Admin/View/GameSource/edit.html +++ b/Application/Admin/View/GameSource/edit.html @@ -78,7 +78,16 @@     - + + + 是否新包 + + + + + + + 上传原包 diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..595b13c3b 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() @@ -92,7 +92,8 @@ class GameSourceService { return false; } - if (self::IS_FIXED_IOS13 && $game['sdk_version'] == 2) { + $isNewSdk = (isset($gameSource['is_new_sdk']) && $gameSource['is_new_sdk'] == 1); + if ($isNewSdk && $game['sdk_version'] == 2) { $channelFolder = $this->getChannelConfigFolder($zip, $packData); return $this->packChannelFolder($zip, $channelFolder); } else { diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 5a0a198ad..d10d69ff0 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -198,7 +198,7 @@ class HomeController extends Controller ->find(); $game['icon'] = get_cover($game['icon'], 'path'); - $gameSource = M('GameSource', 'tab_')->field(['create_time', 'org_plist_url'])->where(array('game_id' => $game['id']))->find(); + $gameSource = M('GameSource', 'tab_')->field(['create_time', 'org_plist_url', 'is_new_sdk'])->where(array('game_id' => $game['id']))->find(); $imageIds = explode(',', $game['flooring_page_imgs']) ?? []; $imageUrls = []; @@ -208,9 +208,9 @@ class HomeController extends Controller $game['flooring_page_imgs'] = $imageUrls; $isNewIos = false; - /* if ($gameSource['create_time'] > strtotime(date('2019-11-27 00:00:00'))) { + if ($gameSource['is_new_sdk'] == 1) { $isNewIos = true; - } */ + } $downloadUrl = ''; if (!$isNewIos && $isIOS13) { From 6f7a930c255fb14297a4863e6de7ed51719b3e5c Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 17:09:14 +0800 Subject: [PATCH 38/77] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 1490c7dbf..476391786 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -613,3 +613,6 @@ 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`; + +-- 新旧IOS打包标识 +ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; From 188abdcbdd7cf6799fd47933600127ebf81b51c5 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 18:26:21 +0800 Subject: [PATCH 39/77] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=BD=AE=E9=A1=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 25 ++++++++ .../Home/Controller/HomeController.class.php | 3 +- .../Home/View/default/Home/landingPage.html | 60 ++++++++++++++----- Data/update.sql | 1 + Public/Home/css/index2.css | 4 +- 5 files changed, 74 insertions(+), 19 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 49f205480..9bfe4fbee 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -384,6 +384,31 @@ + + ios视频是否置顶： + + + + + + + + + + + + + + + diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index aab22d5cf..c709b6208 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -179,7 +179,8 @@ class HomeController extends Controller 'game_size', 'introduction', 'flooring_page_video', - 'supersign_status' + 'supersign_status', + 'ios_video_top' ]; $map = ['id' => intval($gameId)]; $game = M('game', 'tab_')->field($columns)->where($map)->find(); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index fab68793e..0dce88c12 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -45,6 +45,8 @@
    + +
    style="height: 0" >
    @@ -57,17 +59,29 @@
    + + +
    +
    + +
    + +
    + +
    @@ -335,17 +349,30 @@ @@ -355,6 +382,7 @@ var video = document.getElementById("shakeVideo"); + console.log(video) video.play(); document.addEventListener('WeixinJSBridgeReady',function(){ video.play(); diff --git a/Data/update.sql b/Data/update.sql index 21e61074f..c4b7e0a93 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -656,3 +656,4 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2 --游戏表新增字段-落地页视频 liuweiwen 2019-12-09 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频'; ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭'; +ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶'; diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 9cef35936..3a43af57a 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -40,6 +40,7 @@ font-size: 0.32rem; color: #007AFF; line-height: 1.2rem; + height: 100%; } .fiexd-heardBox>img{ width: 0.6rem; @@ -55,7 +56,7 @@ font-size: 0.2rem; margin-right: 0.14rem; } -.fiexd-pay>div{ +.download{ width: 1.5rem; height: 0.6rem; background-color: #007AFF; @@ -65,7 +66,6 @@ line-height: 0.6rem; color: #fff; font-weight: 500; - margin-top: 0.3rem; } .heard{ width: 100%; From 48ae252b4e072452d85dd72722fc225df0b79d21 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 18:27:45 +0800 Subject: [PATCH 40/77] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=A7=86=E9=A2=91=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/Data/update.sql b/Data/update.sql index c365cc758..93eda7d90 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -653,6 +653,7 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2 --游戏表新增字段-落地页视频 liuweiwen 2019-12-09 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频'; ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭'; +ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶'; -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; From 46dda0848f4b364a8ba34b4aef4cacc4ede15a29 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Wed, 11 Dec 2019 09:24:26 +0800 Subject: [PATCH 41/77] =?UTF-8?q?=E5=90=88=E6=9C=8D=20=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 93eda7d90..68d6fd901 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -657,3 +657,41 @@ ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落 -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; + +-- 合服游戏区服表 tping +CREATE TABLE `tab_server_union` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增', + `game_id` int(11) NOT NULL COMMENT '游戏id', + `game_name` varchar(30) NOT NULL COMMENT '游戏名称', + `server_name` varchar(30) NOT NULL COMMENT '区服名称', + `server_num` int(11) DEFAULT NULL COMMENT '对接区服id', + `recommend_status` tinyint(2) DEFAULT '1' COMMENT '推荐状态(0:否,1:是)', + `show_status` tinyint(2) DEFAULT '1' COMMENT '显示状态(0:否,1:是)', + `stop_status` tinyint(2) DEFAULT '0' COMMENT '是否停服(0:否,1:是)', + `server_status` tinyint(2) DEFAULT '0' COMMENT '区服状态(0:正常,1拥挤,2爆满)', + `icon` int(11) DEFAULT NULL COMMENT '区服图标', + `start_time` int(11) DEFAULT NULL COMMENT '开始时间', + `desride` varchar(300) DEFAULT NULL COMMENT '描述', + `prompt` varchar(300) DEFAULT NULL COMMENT '停服提示', + `parent_id` int(11) DEFAULT NULL COMMENT '父类id', + `create_time` int(11) DEFAULT NULL COMMENT '创建时间', + `server_version` tinyint(2) DEFAULT NULL COMMENT '运营平台 1and 2ios 0双平台', + `developers` int(11) DEFAULT '0' COMMENT '开发商', + `server_id` varchar(50) NOT NULL DEFAULT '' COMMENT '对接区服id', + PRIMARY KEY (`id`), + KEY `game_id` (`game_id`), + KEY `show_status` (`show_status`), + KEY `start_time` (`start_time`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表'; + +-- 用户行为 +ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `server_id` int(11) DEFAULT '0' COMMENT '区服id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `server_name` varchar(30) DEFAULT '' COMMENT '区服名称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) DEFAULT '0' COMMENT '玩家游戏内id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; +ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; \ No newline at end of file From 289b40329f472555433fa6f9416f92b36c9e5f78 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 11 Dec 2019 10:59:49 +0800 Subject: [PATCH 42/77] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8D=A2=E7=BB=91?= =?UTF-8?q?=E6=97=B6=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PromoteService.class.php | 11 ++++++++++- Data/update.sql | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 79fa51a05..3fe67e73d 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -330,12 +330,20 @@ class PromoteService { $map = []; $map['promote_id'] = $fromPromote['id']; + $spendMap = $map; if (count($shiftIds) > 0) { - $map['id'] = ['in', $shiftIds]; + $spendMap['user_id'] = $map['id'] = ['in', $shiftIds]; } $users = M('user', 'tab_')->field(['id', 'account', 'nickname'])->where($map)->select(); + $spendMap['pay_time'] = ['egt', $orderTime]; + $payAmountRows = M('spend', 'tab_') + ->field(['user_id', 'sum(pay_amount) payAmount']) + ->where($spendMap) + ->select(); + $payAmountRows = index_by_column('user_id', $payAmountRows); + $mends = []; foreach ($users as $item) { $mends[] = [ @@ -349,6 +357,7 @@ class PromoteService { 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark, 'order_time' => $orderTime, 'create_time' => time(), + 'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0, 'op_id' => $creator ? $creator['id'] : 0, 'op_account' => $opAccount, 'op_type' => $task['creator_type'], diff --git a/Data/update.sql b/Data/update.sql index c365cc758..3fd4261d7 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -656,3 +656,4 @@ ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超 -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; +ALTER TABLE `tab_mend` ADD COLUMN `pay_amount` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '换绑时归属前推广员的充值金额' AFTER `promote_account_to`; From ff2481cdc415061e6ff9c3ef877f7ff3801b1dff Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 11:27:12 +0800 Subject: [PATCH 43/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5>=E5=AE=89=E5=8D=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage2.html | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 9b9c9e634..006f0cce6 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -17,6 +17,27 @@ + @@ -33,12 +54,21 @@
    - + +
    + + +
    + +
    + + +
    From a120ce86b4c3a086c174123629c4044fc0cf8458 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 11 Dec 2019 12:37:14 +0800 Subject: [PATCH 44/77] =?UTF-8?q?=E5=88=A0=E9=99=A4phpinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- phpinfo.php | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 phpinfo.php diff --git a/phpinfo.php b/phpinfo.php deleted file mode 100644 index 2fa593917..000000000 --- a/phpinfo.php +++ /dev/null @@ -1,2 +0,0 @@ - Date: Wed, 11 Dec 2019 15:21:37 +0800 Subject: [PATCH 45/77] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/BehaviorLog/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index 0ee33fb7f..446c5a642 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -29,8 +29,8 @@
    -

    行为日志

    -

    说明：玩家在游戏里的行为日志

    +

    游戏充值预下单

    +

    说明：玩家点击游戏内道具购买时生成一条新订单

    From 387fe5c007695a5f5398ab1dbbfafb5b920699d3 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 11 Dec 2019 15:30:45 +0800 Subject: [PATCH 46/77] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index 4c9cac958..71a494b3a 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -693,6 +693,6 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT ALTER TABLE `tab_pay_info` ADD COLUMN `server_id` int(11) DEFAULT '0' COMMENT '区服id'; ALTER TABLE `tab_pay_info` ADD COLUMN `server_name` varchar(30) DEFAULT '' COMMENT '区服名称'; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id'; -ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) DEFAULT '0' COMMENT '玩家游戏内id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id'; ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; From 98f7653f2abb988901b81a2a6fbb8446e497e916 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 11 Dec 2019 15:44:58 +0800 Subject: [PATCH 47/77] =?UTF-8?q?pc=E5=AE=98=E7=BD=91-=E3=80=8B=E5=AE=B6?= =?UTF-8?q?=E9=95=BF=E7=9B=91=E6=8A=A4-=E3=80=8B=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E5=AE=B6=E9=95=BF=E7=9B=91=E6=8A=A4=E5=BC=95=E5=AF=BC=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Article/article/detail1.html | 41 ++++++++++++++----- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/Application/Media/View/default/Article/article/detail1.html b/Application/Media/View/default/Article/article/detail1.html index b32639c92..54b746cfa 100644 --- a/Application/Media/View/default/Article/article/detail1.html +++ b/Application/Media/View/default/Article/article/detail1.html @@ -70,7 +70,7 @@
  • 监护工程概述
  • 申请服务流程
    • -
  • 介绍详细说明
    • +
  • 家长监护申请引导
  • 健康提示
  • 纠纷处理
    • @@ -121,15 +121,36 @@
    -
    介绍详细说明
    -

    网络游戏未成年人家长监护工程”是一项由文化部指导，义乌市其豪网络科技有限公司旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的行业自律行动。

    -

    2010年2月5日，首批试点的六家企业共同启动“监护工程”，开始了游戏企业与未成年人家长联合共同预防未成年人沉迷网络游戏的有益尝试。实践中一些成功的案例让我们看到 “监护工程”提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷网游成为可能。

    -

    “监护工程”引导家长和未成年人正确面对网络游戏文化，加强相互沟通，在共同约定和认可的时间或规则下健康游戏，既保护了未成年人不受过度沉迷的伤害，也为家长指导未成年人健康游戏提供了有力的技术保障。

    -

    其豪网络科技有限公司已贯彻实施“家长监护工程”的四项具体要求，即专人负责、有专线电话、有专区设置、有季度报告。

    -

    (一)专人负责

    -

    1．已指定专门的负责人，已将指定负责人及联络方式向海南省文化厅备案；

    -

    2．培训专门服务人员对“家长监护工程”提供专业咨询解答和服务支持；帮助家长了解被监护人游戏行为，提供家长与被监护人进行沟通的建议；

    -

    3．指定客服人员会定期跟踪、与家长沟通。如若家长有需要帮助，负责人会根据实际的情况提供相应的协助。

    +
    家长监护申请引导
    +
    +

    “网络游戏未成年人家长监护工程”是一项由聚侠网根据国家有关规定而发起的一个项目，旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的社会性公益行动。它提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷游戏的行为成为可能。该项社会公益行动充分反映了中国网络游戏行业高度的社会责任感，对未成年玩家合法权益的关注及对用实际行动营造和谐社会的愿望。

    +

    具体实施细则如下：

    + +

    申请条件：

    +

    1、 申请人需为被监护未成年人的法定监护人；

    +

    2、 申请人的被监护人年龄小于18周岁；

    +

    3、 申请人需为大陆公民，不含港、澳、台人士。

    +

    申请需提交材料：（点击下载申请表格）

    +

    1、监护人信息表（包含监护人的身份证明复印件）；

    +

    2、被监护人信息表（包含被监护人所玩游戏相关信息及身份证明复印件）；

    +

    3、填写网络游戏未成年人家长监护申请书、保证书、授权书并手工签字（需下载，填写并打印，签字）；

    +

    4、申请人与被监护人的监护关系证明文件（户口簿或有关机关出具的证明文件）。

    + +

    申请方式：

    +

    1.电话服务 监护人可以通过来专线电话来咨询，专线：0793-8179522

    +

    2.传真服务 监护人可以通过传真发送相关信息，进行申请，传真号码：0793-8179533

    +

    3.邮寄服务 监护人可以通过邮寄提交相关信息，邮寄地址：江西省上饶市信州区三清山东大道168号数字经济服务园9楼站群一部

    + +

    其他要求：

    +

    1.申请人应提交较完备的申请材料，对未提供的信息要及时补充；可请熟知电脑、互联网、游戏的人员进行协助，以便提供详实资料；

    +

    2.申请人应保证提交的信息真实有效；对于提供虚假信息或伪造证件，我司将保留进一步追究法律责任的权利。

    + + +

    监督方式：

    +

    封停账号

    +

    根据监护人意愿封停被监护人账号。直至被监护人年满18周岁，并提出申请。

    + +
    From 49408030f0000ee545d6ed38024ab1953d3f2022 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 11 Dec 2019 15:57:36 +0800 Subject: [PATCH 48/77] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 139 +++++++ .../Controller/PlayersController.class.php | 133 +++++++ .../Home/View/default/Players/playAction.html | 352 ++++++++++++++++++ .../View/default/Public/promote_base.html | 17 +- 4 files changed, 629 insertions(+), 12 deletions(-) create mode 100644 Application/Home/Controller/PlayersController.class.php create mode 100644 Application/Home/View/default/Players/playAction.html diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index b19f68679..45a84c811 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1133,6 +1133,83 @@ class DownloadController extends BaseController { } $this->success('添加下载成功',U('listsIndex')); } + + public function players_data_export() { + $begTime = I('begtime'); + $endTime = I('endtime'); + $map1['chain'] = ['like','%'.'/'.PID.'/'.'%']; + $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select(); + $childPromoteIds = ''; + if(empty($rs)) { + $map['tab_pay_info.promote_id'] = PID; + }else { + foreach ($rs as $rsKey => $rsValue) { + $id = $rsValue['id']; + $childPromoteIds .= $id.','; + } + $childPromoteIds = rtrim($childPromoteIds, ','); + $childPromoteIds .= ',' . PID; + $map['tab_pay_info.promote_id'] = ['in', $childPromoteIds]; + } + + $levelPromote = $this->getLevelPromote(); + $queryPromote = $this->getQueryPromote($levelPromote); + $map2[] = [ + '_logic' => 'or', + 'id' => $queryPromote['id'], + 'chain' => ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'] + ]; + $ids = M('promote', 'tab_')->where($map2)->getField('id', true); + if(empty($ids)) { + $ids = array(); + } + if(empty($levelPromote)) { + array_push($ids,PID); + + } + array_push($ids,$queryPromote['id']); + if (!empty($ids)) { + $map['tab_pay_info.promote_id'] = ['in',$ids]; + + }else { + $map['_string'] = '1<>1'; + } + + empty(I('relation_game_id')) || $map['tab_pay_info.relation_game_id'] = I('relation_game_id'); + empty(I('sdk_version')) || $map['tab_pay_info.sdk_version'] = I('sdk_version'); + empty(I('server_id')) || $map['tab_pay_info.server_id'] = I('server_id'); + empty(I('game_player_name')) || $map['tab_pay_info.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; + empty(I('user_account')) || $map['tab_pay_info.user_account'] = ['like', '%' . I('user_account') . '%']; + empty(I('extend')) || $map['tab_pay_info.extend'] = I('extend'); + empty(I('user_id')) || $map['tab_pay_info.user_id'] = I('user_id'); + if (!empty($begTime) && !empty($endTime)) { + $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) - 1]]; + }else if (empty($begTime) && !empty($endTime)) { + $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime)]; + }else if (!empty($begTime) && empty($endTime)) { + $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime)]; + } + + $conditions = json_encode($map,TRUE); + $addtime = time(); + $data = [ + 'logid' => 'players_'.time(), + 'promote_id' => PID, + 'type' => '/Home/Players/playaction', + 'dataname' => '玩家行为日志', + 'status' => 0, + 'addtime' => $addtime, + 'begintime' => 0, + 'content' => '', + 'conditions' =>$conditions + ]; + $res = M('downloadlog','tab_')->add($data); + if (!$res) { + // $this->ajaxReturn(array("status" => -1, "msg" => "添加导出日志失败", 'ret' => $res)); + $this->error('添加下载失败'); + } + $this->success('添加下载成功',U('listsIndex')); + } /** * 充值明细添加下载 * @author sunke @@ -1761,11 +1838,73 @@ class DownloadController extends BaseController { case "平台币充值": $this->orderlistExcelInfo($id,$map); break; + case "玩家行为日志"; + $this->playactionExcelInfo($id,$map); + break; default: break; } } + + public function playactionExcelInfo($id,$map) { + $xlsName = "玩家行为日志"; + $xlsCell = array( + 'cp订单号', + '充值时间', + '玩家账号', + '游戏名称', + '所属推广员', + '游戏区服', + '角色ID', + '角色名称', + '订单金额' + ); + $model = M('pay_info','tab_'); + $data1 = $model->field('id')->where($map)->select(); + $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('gb2312', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 + $accessNum = '100000';//从数据库获取总量，假设是十万 + $accessNum = count($data1)?:0 ; + + $perSize = 5000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + for($i = 1; $i <= $pages; $i++) { + $data = $model->where($map)->order('tab_pay_info.create_time desc') + ->limit(($i-1)*$perSize ,$perSize)->select(); + foreach($data as $key => $v) { + $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); + $v['promote_id']= $promoteInfo['nickname']; + $csvData['extend'] = $this->encryption($v['extend']); + $csvData['create_time'] = $v['create_time']; + $csvData['user_account'] = $v['user_account']; + $csvData['game_name'] = $v['game_name']; + $csvData['promote_id'] = $v['promote_id']; + $csvData['server_name'] = $v['server_name']; + $csvData['user_id'] = $v['user_id']; + $csvData['game_player_name'] = $v['game_player_name']; + $csvData['price'] = $v['price']; + mb_convert_variables('GBK', 'UTF-8', $csvData); + fputcsv($fp, $csvData); + } + unset($csvData); + ob_flush(); + flush(); + } + fclose($fp); + $this->backSuccessExport($id); + + } //注册明细excel信息 public function registerExcelInfo($id,$map) { diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php new file mode 100644 index 000000000..427ae9b5a --- /dev/null +++ b/Application/Home/Controller/PlayersController.class.php @@ -0,0 +1,133 @@ +getLevelPromote(); + $queryPromote = $this->getQueryPromote($levelPromote); + // $loginPromote = $this->getLoginPromote(); + $map = []; + + $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; + $ids = M('promote', 'tab_')->where($map)->getField('id', true); + $ids[] = $queryPromote['id']; + $map = []; + $map['tab_pay_info.promote_id'] = ['in', $ids]; + + if (!empty($relationGameId)) { + $map['tab_pay_info.relation_game_id'] = $relationGameId; + } + if (!empty($sdkVersion)) { + $map['tab_pay_info.sdk_version'] = $sdkVersion; + } + if (!empty($serverId)) { + $map['tab_pay_info.server_id'] = $serverId; + } + if (!empty($gamePlayerName)) { + $map['tab_pay_info.game_player_name'] = $gamePlayerName; + } + if (!empty($userAccount)) { + $map['tab_pay_info.user_account'] = $userAccount; + } + if (!empty($extend)) { + $map['tab_pay_info.extend'] = $extend; + } + if (!empty($userId)) { + $map['tab_pay_info.user_id'] = $userId; + } + if (!empty($begTime) && !empty($endTime)) { + $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime - 1]]; + }else if (empty($begTime) && !empty($endTime)) { + $map['tab_pay_info.create_time'] = ['elt',$endTime]; + }else if (!empty($begTime) && empty($endTime)) { + $map['tab_pay_info.create_time'] = ['EGT',$begTime]; + } + $page = intval(I('get.p', 1)); + $page = $page ? $page : 1; //默认显示第一页数据arraypage + $row=10; + $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc') + ->page($page, $row)->select(); + foreach($rs as $key => $v) { + $rs[$key]['extend'] = encryption($v['extend']); + $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); + $rs[$key]['promote_id']= $promoteInfo['nickname']; + } + $count = M('pay_info', 'tab_') + ->field('tab_pay_info.id') + ->where($map) + ->select(); + $count = count($count); + + //分页 + $parameter['p'] = $page; + $parameter['row'] = $row; + $parameter['begtime'] = $initBegTime; + $parameter['endtime'] = $initEndTime; + $parameter['relation_game_id'] = $relationGameId; + $parameter['sdk_version'] = $sdkVersion; + $parameter['server_id'] = $serverId; + $parameter['game_player_name'] = $gamePlayerName; + $parameter['user_account'] = $userAccount; + $parameter['extend'] = $extend; + $parameter['user_id'] = $user_id; + $parameter['level_promote_2'] = $levelPromote[0]; + $parameter['level_promote_3'] = $levelPromote[1]; + $parameter['level_promote_4'] = $levelPromote[2]; + $page = set_pagination($count, $row, $parameter); + if ($page) { + $this->assign('_page', $page); + } + $this->assign('listData',$rs); + $this->assign('initBegTime', I('begtime')); + $this->assign('initEndTime', I('endtime')); + $this->display(); + } + + private function getLevelPromote() + { + $levelPromote = []; + $levelPromote[] = I('level_promote_2', 0); + $levelPromote[] = I('level_promote_3', 0); + $levelPromote[] = I('level_promote_4', 0); + return $levelPromote; + } + + private function getQueryPromote($levelPromote) + { + $queryPromote = null; + $promote = $this->getLoginPromote(); + $queryPromoteId = 0; + foreach ($levelPromote as $item) { + if ($item != 0) { + $queryPromoteId = $item; + } + } + if ($queryPromoteId == 0) { + $queryPromote = $this->getLoginPromote(); + } else { + $queryPromote = M('promote', 'tab_')->where(['id' => $queryPromoteId])->find(); + } + return $queryPromote; + } +} \ No newline at end of file diff --git a/Application/Home/View/default/Players/playAction.html b/Application/Home/View/default/Players/playAction.html new file mode 100644 index 000000000..c3b1f63f1 --- /dev/null +++ b/Application/Home/View/default/Players/playAction.html @@ -0,0 +1,352 @@ + + + + + + + + + + +
    +
    +
    +
    当前位置：玩家管理>行为日志
    +
    + + 说明 + 玩家在游戏内的行为日志 +
    +
    +
    + + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    + + +
    + +
    + + + +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    cp订单号充值时间玩家账号游戏名称所属推广员游戏区服角色ID角色名称订单金额
    + +

    暂无数据

    +
    {$vo.extend}{$vo.create_time}{$vo.user_account}{$vo.game_name}{$vo.promote_id}{$vo.server_name}{$vo.user_id}{$vo.game_player_name}{$vo.price}
    +
    +
    + + 导出 + + {$_page} +
    +
    +
    +
    +     + + + + + + + + + + + diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index cd8f6eab3..1e53ffa9a 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -127,18 +127,11 @@ 平台币充值
    - - - - - - - - - - - - + +
    玩家管理
    +
    + 行为日志 +
    From b27906d470780a3096f704131f28a4cabd21be0c Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 16:13:37 +0800 Subject: [PATCH 49/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoController.class.php | 61 +++++++++++++++++++ .../Home/Controller/QueryController.class.php | 14 ++++- .../Home/View/default/Home/landingPage2.html | 6 +- .../View/default/Query/userRecharges.html | 24 ++++++++ Data/update.sql | 13 ++++ 5 files changed, 110 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php index c704aec94..31037e19a 100644 --- a/Application/Admin/Controller/AutoController.class.php +++ b/Application/Admin/Controller/AutoController.class.php @@ -1034,4 +1034,65 @@ public function auto_rrdae(){ ]; return $ret; } + + //玩家角色每日登录记录 + public function userPlayLoginRecordByDayCount($time = '') + { + if ($time == '') { + $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); + } else { + $time = strtotime(date('Y-m-d 00:00:00', strtotime($time))); + } + $res = M('user_play_login_record_by_day', 'tab_')->where(array('create_time' => $time))->find(); + if (empty($res)) { + $map['login_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]]; + + $this->userPlayLoginRecordByDayByMap($map); + } + } + + //玩家角色每日登录记录--初始化 + public function userPlayLoginRecordByDayInitial() + { + $res = M('user_play_login_record_by_day', 'tab_')->order('id asc')->find(); + if (empty($res)) { + ini_set('memory_limit','800M'); + $time = strtotime(date('Y-m-d 00:00:00', time())); + $map['login_time'] = ['lt', $time]; + + $this->userPlayLoginRecordByDayByMap($map); + echo '初始化成功'; + } else { + echo '表存在记录，无法初始化'; + } + } + + //玩家角色每日登录记录 + private function userPlayLoginRecordByDayByMap($map = []) + { + if (isset($map['login_time'])) { + $map['game_id'] = ['gt', 0]; + $field = 'FROM_UNIXTIME(login_time, "%Y-%m-%d") as day,user_id,game_id'; + $loginData = M('user_game_login_record', 'tab_')->field($field) + ->where($map) + ->group('day,game_id,user_id') + ->select(); + + if (!empty($loginData)) { + $data = []; + foreach ($loginData as &$list) { + $data[] = [ + 'user_id' => $list['user_id'], + 'game_id' => $list['game_id'], + 'server_id' => '', + 'role_id' => '', + 'create_time' => strtotime($list['day']), + ]; + unset($list); + } + unset($loginData); + M('user_play_login_record_by_day', 'tab_')->addAll($data); + } + } + } } diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 3cb662551..b667996d0 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1759,7 +1759,7 @@ class QueryController extends BaseController $lastSortName = trim(I('last_sort_name', '')); $sortName = trim(I('sort_name', '')); $sort = intval(I('sort', 1)); - $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day']; + $sortNameData = ['recharge_cost', 'recharge_count', 'recharge_cost_today', 'unlogin_day', 'create_time', 'user_game_login_count']; $nowTime = date('Y-m-d', time() - 3600 * 24); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime'); @@ -1855,8 +1855,15 @@ class QueryController extends BaseController $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]]; $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; - $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version"; - $field = $fieldUC . ',' . $fieldUI; + $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; + + $loginRecordMap['lr.create_time'] = $map['uc.create_time']; + $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id'; + $fieldLR = M('user_play_login_record_by_day', 'tab_')->alias('lr') + ->field("count(*) as count") + ->where($loginRecordMap) + ->buildSql(); + $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') @@ -1883,6 +1890,7 @@ class QueryController extends BaseController $list['role_level'] = empty($list['role_level']) ? '--' : $list['role_level']; $list['unlogin_day'] = empty($list['play_time']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $list['play_time']))) / (24 * 3600)); $list['play_time'] = empty($list['play_time']) ? '--' : date('Y-m-d H:i:s', $list['play_time']); + $list['create_time'] = empty($list['create_time']) ? '--' : date('Y-m-d H:i:s', $list['create_time']); $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account']; } } diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 006f0cce6..ff3b72c39 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -26,17 +26,13 @@ .home-video video { margin-left: 0.45%; width: 84.75%; + border-radius: 4.5%; } @media(min-width:580px){ .home-video { max-width:580px; } } - @media(min-height:580px){ - .home-video { - max-width:580px; - } - } diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index fbc9d3f99..007453957 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -145,6 +145,28 @@ + 玩家游戏累计登录天数 + + + + + + + + + + + 注册时间 + + + + + + + + + + 最后登录时间 推广员账号 @@ -163,6 +185,8 @@ {$record.recharge_count} {$record.recharge_cost_today} {$record.unlogin_day} + {$record.user_game_login_count} + {$record.create_time} {$record.play_time} {$record.promote_account} diff --git a/Data/update.sql b/Data/update.sql index c365cc758..9e638d22b 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -656,3 +656,16 @@ ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超 -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; + +--2019-12-11 cxj +--玩家角色每日登录记录表 +CREATE TABLE `tab_user_play_login_record_by_day` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL DEFAULT 0 COMMENT '玩家id', + `game_id` int(11) NOT NULL DEFAULT 0 COMMENT '游戏id', + `server_id` varchar(30) NOT NULL DEFAULT '' COMMENT '区服id', + `role_id` varchar(30) NOT NULL DEFAULT '' COMMENT '角色id', + `create_time` int(10) NOT NULL DEFAULT 0 COMMENT '创建时间', + PRIMARY KEY (`id`), + INDEX `search`(`user_id`, `game_id`, `create_time`) USING BTREE +); \ No newline at end of file From 701bb6a8189e8cb57fa022c7f09c15fcc174c7ce Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 11 Dec 2019 16:14:37 +0800 Subject: [PATCH 50/77] =?UTF-8?q?sql=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 71a494b3a..c47374790 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -696,3 +696,5 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id'; ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; +-- 菜单(游戏充值预下单) +INSERT INTO `platform`.`sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); \ No newline at end of file From 8a1a65c77126eb03f996db87ff953f7da45467d7 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 11 Dec 2019 16:15:15 +0800 Subject: [PATCH 51/77] =?UTF-8?q?sql=E6=B7=BB=E5=8A=A0=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index c47374790..ec8fee41a 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -697,4 +697,4 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' C ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; -- 菜单(游戏充值预下单) -INSERT INTO `platform`.`sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); \ No newline at end of file +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); \ No newline at end of file From 0a7973ae3c1be42164794fa4e5819f8904ac623f Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 16:17:34 +0800 Subject: [PATCH 52/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index ec8fee41a..49226d3df 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -697,4 +697,17 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' C ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; -- 菜单(游戏充值预下单) -INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); \ No newline at end of file +INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); + +--2019-12-11 cxj +--玩家角色每日登录记录表 +CREATE TABLE `tab_user_play_login_record_by_day` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `user_id` int(11) NOT NULL DEFAULT 0 COMMENT '玩家id', + `game_id` int(11) NOT NULL DEFAULT 0 COMMENT '游戏id', + `server_id` varchar(30) NOT NULL DEFAULT '' COMMENT '区服id', + `role_id` varchar(30) NOT NULL DEFAULT '' COMMENT '角色id', + `create_time` int(10) NOT NULL DEFAULT 0 COMMENT '创建时间', + PRIMARY KEY (`id`), + INDEX `search`(`user_id`, `game_id`, `create_time`) USING BTREE +); \ No newline at end of file From 9d09913bd02770c39363a8f2a5d73da2ce23fe9b Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 16:32:02 +0800 Subject: [PATCH 53/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoController.class.php | 61 ------------------- .../Home/Controller/QueryController.class.php | 2 +- Data/update.sql | 13 ---- 3 files changed, 1 insertion(+), 75 deletions(-) diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php index 31037e19a..c704aec94 100644 --- a/Application/Admin/Controller/AutoController.class.php +++ b/Application/Admin/Controller/AutoController.class.php @@ -1034,65 +1034,4 @@ public function auto_rrdae(){ ]; return $ret; } - - //玩家角色每日登录记录 - public function userPlayLoginRecordByDayCount($time = '') - { - if ($time == '') { - $time = strtotime(date('Y-m-d 00:00:00', time() - (3600 * 24))); - } else { - $time = strtotime(date('Y-m-d 00:00:00', strtotime($time))); - } - $res = M('user_play_login_record_by_day', 'tab_')->where(array('create_time' => $time))->find(); - if (empty($res)) { - $map['login_time'] = ['between', [$time, strtotime(date('Y-m-d 23:59:59', $time))]]; - - $this->userPlayLoginRecordByDayByMap($map); - } - } - - //玩家角色每日登录记录--初始化 - public function userPlayLoginRecordByDayInitial() - { - $res = M('user_play_login_record_by_day', 'tab_')->order('id asc')->find(); - if (empty($res)) { - ini_set('memory_limit','800M'); - $time = strtotime(date('Y-m-d 00:00:00', time())); - $map['login_time'] = ['lt', $time]; - - $this->userPlayLoginRecordByDayByMap($map); - echo '初始化成功'; - } else { - echo '表存在记录，无法初始化'; - } - } - - //玩家角色每日登录记录 - private function userPlayLoginRecordByDayByMap($map = []) - { - if (isset($map['login_time'])) { - $map['game_id'] = ['gt', 0]; - $field = 'FROM_UNIXTIME(login_time, "%Y-%m-%d") as day,user_id,game_id'; - $loginData = M('user_game_login_record', 'tab_')->field($field) - ->where($map) - ->group('day,game_id,user_id') - ->select(); - - if (!empty($loginData)) { - $data = []; - foreach ($loginData as &$list) { - $data[] = [ - 'user_id' => $list['user_id'], - 'game_id' => $list['game_id'], - 'server_id' => '', - 'role_id' => '', - 'create_time' => strtotime($list['day']), - ]; - unset($list); - } - unset($loginData); - M('user_play_login_record_by_day', 'tab_')->addAll($data); - } - } - } } diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index b667996d0..2d52f6888 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1859,7 +1859,7 @@ class QueryController extends BaseController $loginRecordMap['lr.create_time'] = $map['uc.create_time']; $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id'; - $fieldLR = M('user_play_login_record_by_day', 'tab_')->alias('lr') + $fieldLR = M('login_daily_record', 'tab_')->alias('lr') ->field("count(*) as count") ->where($loginRecordMap) ->buildSql(); diff --git a/Data/update.sql b/Data/update.sql index 49226d3df..95adabd49 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -698,16 +698,3 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMME ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; -- 菜单(游戏充值预下单) INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); - ---2019-12-11 cxj ---玩家角色每日登录记录表 -CREATE TABLE `tab_user_play_login_record_by_day` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `user_id` int(11) NOT NULL DEFAULT 0 COMMENT '玩家id', - `game_id` int(11) NOT NULL DEFAULT 0 COMMENT '游戏id', - `server_id` varchar(30) NOT NULL DEFAULT '' COMMENT '区服id', - `role_id` varchar(30) NOT NULL DEFAULT '' COMMENT '角色id', - `create_time` int(10) NOT NULL DEFAULT 0 COMMENT '创建时间', - PRIMARY KEY (`id`), - INDEX `search`(`user_id`, `game_id`, `create_time`) USING BTREE -); \ No newline at end of file From bb2996dbee602faf5c287a450bd862974f8cc03a Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 11 Dec 2019 16:44:20 +0800 Subject: [PATCH 54/77] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PromoteService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 3fe67e73d..5d4547d60 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -396,7 +396,7 @@ class PromoteService { $orderMap1 = $otherMap; $orderMap1['pay_time'] = ['egt', $orderTime]; - M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2']])->save($updateData); // 只改未对账的数据 + M('spend', 'tab_')->where($orderMap1)->where(['is_check' => ['in','1,2'], 'settle_check' => 0])->save($updateData); // 只改未对账的数据 M('bind_spend', 'tab_')->where($orderMap1)->save($updateData); $orderMap2 = $otherMap; From d426395607e8e5494271452c9e5105d3c3ca2aef Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 11 Dec 2019 17:08:38 +0800 Subject: [PATCH 55/77] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=A2=9E=E5=8A=A0=E6=B8=B8=E6=88=8F=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1=E7=99=BB=E9=99=86=E5=A4=A9=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 45a84c811..f72b18ac6 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3115,6 +3115,8 @@ class DownloadController extends BaseController { '充值次数', '昨日充值', '未登录天数', + '玩家游戏累计登陆天数', + '注册时间', '最后登录时间', '推广员账号', @@ -3172,8 +3174,14 @@ class DownloadController extends BaseController { //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id'; $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; - $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version"; - $field = $fieldUC . ',' . $fieldUI; + $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; + $loginRecordMap['lr.create_time'] = $map['uc.create_time']; + $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id'; + $fieldLR = M('login_daily_record', 'tab_')->alias('lr') + ->field("count(*) as count") + ->where($loginRecordMap) + ->buildSql(); + $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') @@ -3227,6 +3235,8 @@ class DownloadController extends BaseController { $csvData['recharge_count'] = empty($value['recharge_count']) ? 0 : $value['recharge_count']; $csvData['recharge_cost_today'] = empty($value['recharge_cost_today']) ? 0 : $value['recharge_cost_today']; $csvData['unlogin_day'] = empty($value['play_time']) ? '--' : intval((strtotime(date('Y-m-d 00:00:00')) - strtotime(date('Y-m-d 00:00:00', $value['play_time']))) / (24 * 3600)); + $csvData['user_game_login_count'] = empty($value['user_game_login_count']) ? 0 : $value['user_game_login_count']; + $csvData['create_time'] = empty($value['create_time']) ? '--' : date('Y-m-d H:i:s', $value['create_time']); $csvData['play_time'] = empty($value['play_time']) ? '--' :date('Y-m-d H:i:s',$value['play_time']); $csvData['promote_account'] = empty($value['promote_account']) ? '--' :$value['promote_account']; @@ -3248,6 +3258,8 @@ class DownloadController extends BaseController { $allData['recharge_count'] = $total['recharge_count']; $allData['recharge_cost_today'] = $total['recharge_cost_today']; $allData['unlogin_day'] = '--'; + $allData['user_game_login_count'] = '--'; + $allData['create_time'] = '--'; $allData['play_time'] = '--'; $allData['promote_account'] = '--'; mb_convert_variables('GBK', 'UTF-8', $allData); From 0b67ef8eb34c6fdf77b147e989591d04e9b68932 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 11 Dec 2019 17:20:35 +0800 Subject: [PATCH 56/77] =?UTF-8?q?pc=E5=AE=98=E7=BD=91-=E3=80=8B=E5=AE=B6?= =?UTF-8?q?=E9=95=BF=E7=9B=91=E6=8A=A4=E9=A1=B5-=E3=80=8B=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/css/supervise.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Public/Media/css/supervise.css b/Public/Media/css/supervise.css index b7973f266..d2deb104a 100644 --- a/Public/Media/css/supervise.css +++ b/Public/Media/css/supervise.css @@ -39,7 +39,7 @@ margin-left: 0.12rem; } .service_left .list li{ - width: 1.2rem; + /*width: 1.2rem;*/ height: 0.5rem; font-size: 0.16rem; color: #292929; @@ -49,6 +49,7 @@ text-align: center; line-height: 0.5rem; margin-right: 0.05rem; + padding: 0 0.05rem; } .service_left .list li.selected{ background-color: #00A3E1; From 08e2cc6eaf482a8ec111f7e6a71bec5faa0656c4 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 11 Dec 2019 17:30:29 +0800 Subject: [PATCH 57/77] =?UTF-8?q?pc=E5=AE=98=E7=BD=91=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Media/View/default/Article/article/detail1.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Media/View/default/Article/article/detail1.html b/Application/Media/View/default/Article/article/detail1.html index 54b746cfa..c92008b8c 100644 --- a/Application/Media/View/default/Article/article/detail1.html +++ b/Application/Media/View/default/Article/article/detail1.html @@ -70,7 +70,7 @@
  • 监护工程概述
  • 申请服务流程
    • -
  • 家长监护申请引导
    • +
  • 监护申请引导
  • 健康提示
  • 纠纷处理
    • @@ -121,7 +121,7 @@
    -
    家长监护申请引导
    +
    监护申请引导

    “网络游戏未成年人家长监护工程”是一项由聚侠网根据国家有关规定而发起的一个项目，旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的社会性公益行动。它提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷游戏的行为成为可能。该项社会公益行动充分反映了中国网络游戏行业高度的社会责任感，对未成年玩家合法权益的关注及对用实际行动营造和谐社会的愿望。

    具体实施细则如下：

    From 9475a54dec243ce6561521fbe39ff41f31f6a501 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 17:32:14 +0800 Subject: [PATCH 58/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage2.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index ff3b72c39..da62da54e 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -24,8 +24,7 @@ top: 23.28%; } .home-video video { - margin-left: 0.45%; - width: 84.75%; + width: 84.7222222%; border-radius: 4.5%; } @media(min-width:580px){ From 946c99ff61c8d8a9226a9163930cf40264f18109 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 18:08:34 +0800 Subject: [PATCH 59/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage2.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index da62da54e..24acbd9db 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -54,7 +54,7 @@
    - +
    From 756e0a342e4fec121e6711c9138bef5527864abd Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 11 Dec 2019 18:10:44 +0800 Subject: [PATCH 60/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/userRecharges.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 007453957..eae3266d3 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -204,6 +204,8 @@ -- -- -- + -- + -- From ad7c276fdffd8cbd59f58ed4094e51ca730aaed0 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 11 Dec 2019 18:25:57 +0800 Subject: [PATCH 61/77] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/PromoteController.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index b718673a8..08dfda390 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -1893,6 +1893,11 @@ class PromoteController extends BaseController public function shift() { + $this->ajaxReturn([ + 'status' => false, + 'msg'=>'该功能暂时关闭' + ]); + $loginPromote = $this->getLoginPromote(); $params = $_POST; $params['creator_id'] = $loginPromote['id']; From 54f288133ec8463a7c902cf53ef40f62939ae70e Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Thu, 12 Dec 2019 10:29:09 +0800 Subject: [PATCH 62/77] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index f72b18ac6..7e4bbc698 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3115,8 +3115,8 @@ class DownloadController extends BaseController { '充值次数', '昨日充值', '未登录天数', - '玩家游戏累计登陆天数', - '注册时间', + '游戏累计登陆天数', + '创角时间', '最后登录时间', '推广员账号', From e9c804413ff4300990a09c6a3fbdc331fe38b416 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 12 Dec 2019 13:46:56 +0800 Subject: [PATCH 63/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage2.html | 4 ++++ Application/Home/View/default/Query/userRecharges.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 24acbd9db..1c4b741e8 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -70,6 +70,10 @@
    -
    +
    -
    -
    -

    基本信息

    -

    说明：此处显示本站玩家账号的相关信息

    -
    - -
    - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
    玩家账号 - - 玩家登录账号，一经注册，全平台通用 -
    登录密码 - - 不可查看，只能更改密码 -
    用户昵称 - - — — - - - - 初次登录，默认玩家为账号，用户可自行设置昵称 -
    账号状态 + +
    +

    基本信息

    +

    说明：此处显示本站玩家账号的相关信息

    +
    + +
    + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + 需玩家认证真实姓名和身份证号码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - -
    玩家账号 + + 玩家登录账号，一经注册，全平台通用 +
    登录密码 + + 不可查看，只能更改密码 +
    用户昵称 + + — — + + + + 初次登录，默认玩家为账号，用户可自行设置昵称 +
    账号状态 - 可设置玩家账号的登录状态，锁定即无法登录本平台 -
    用户头像 + 可设置玩家账号的登录状态，锁定即无法登录本平台 +
    用户头像 点击查看原图 - 初次登录默认头像，用户可以自行修改 -
    VIP等级 + 初次登录默认头像，用户可以自行修改 +
    VIP等级 VIP {:get_vip_level($recharge_total)} - -
    实名认证 + +
    实名认证 未认证 @@ -96,158 +96,153 @@ 意外数据 - - 需玩家认证真实姓名和身份证号码 -
    真实姓名 - - - - - -
    身份证号 - - - - - -
    QQ号 - - - - - -
    手机号码 - - 点击修改 - 玩家绑定的手机号，可通过点击修改，更换玩家的绑定手机（慎重使用） -
    注册时间 - -
    注册ip - -
    真实姓名 + + + + + +
    身份证号 + + 点击修改 +
    QQ号 + + + + + +
    手机号码 + + 点击修改 + 玩家绑定的手机号，可通过点击修改，更换玩家的绑定手机（慎重使用） +
    注册时间 + +
    注册ip + + +
    最后登录时间 + +
    最后登录IP + +
    平台币余额 + + 显示该用户平台币的账户余额 +
    绑定平台币余额 + 点击查看 + 显示该用户各个游戏的绑定平台币余额（点击弹出显示，可以手动修改） +
    游戏付费记录 + 点击查看 + 此处显示该玩家游戏内的充值记录；不包含玩家账户充值平台币的记录 +
    最后登录时间 - -
    最后登录IP - -
    平台币余额 - - 显示该用户平台币的账户余额 -
    绑定平台币余额 - 点击查看 - 显示该用户各个游戏的绑定平台币余额（点击弹出显示，可以手动修改） -
    游戏付费记录 - 点击查看 - 此处显示该玩家游戏内的充值记录；不包含玩家账户充值平台币的记录 -
    金币余额 +
    金币余额 - 显示该用户的金币余额 -
    金币提现记录 - 点击查看 - 此处显示该玩家的金币提现记录 -
    角色信息 - 点击查看 - 点击查看该用户游戏角色信息 -
    游戏登录记录 - 点击查看 - 点击查看该用户游戏登录记录 -
    -
    - - - - - 返回 - -
    -
    -
    + 显示该用户的金币余额 +
    金币提现记录 + 点击查看 + 此处显示该玩家的金币提现记录 +
    角色信息 + 点击查看 + 点击查看该用户游戏角色信息 +
    游戏登录记录 + 点击查看 + 点击查看该用户游戏登录记录 +
    +
    + + + + + 返回 + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    -
    + 已添加添加至常用设置
    - -
    - -
    - - -
    - 已添加添加至常用设置 -
    - @@ -289,7 +284,7 @@ var href = $(this).attr('href'); layer.open({ type: 2, title: "绑定平台币余额", shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [href , 'no'] + content: [href , 'no'] }); return false; }); @@ -300,7 +295,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/chax/id/' + id + '' , 'no'] + content: [url + 'admin.php?s=/Member/chax/id/' + id + '' , 'no'] }); }); @@ -311,24 +306,24 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/role_list/user_id/' + id + '' , 'no'] + content: [url + 'admin.php?s=/Member/role_list/user_id/' + id + '' , 'no'] }); }); - - $('#tixian').click(function() { - layer.open({ + + $('#tixian').click(function() { + layer.open({ type: 2, title: "【金币提现记录】列表", shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no'] + content: [url + 'admin.php?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no'] }); - }); - + }); + $('#lookheadpic').click(function() { - var url = $(this).attr('src'); - layer.open({ + var url = $(this).attr('src'); + layer.open({ type: 1, title: "", shadeClose: true, @@ -345,7 +340,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/denglu/id/' + id + '', 'no'] + content: [url + 'admin.php?s=/Member/denglu/id/' + id + '', 'no'] }); }); $("#bind_balance").click(function () { @@ -356,9 +351,45 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/bind_balance/id/' + id + '', 'no'] + content: [url + 'admin.php?s=/Member/bind_balance/id/' + id + '', 'no'] + }); + }); + + $("#idcard").click(function () { + layer.prompt({ + formType: 3, + title: "请输入身份证号码", + value: '' + }, function (idcard) { + var jsid = $('#selfid').val(); + var regIdNo = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; + if(!regIdNo.test(idcard)){ + layer.msg("身份证号填写有误"); + return false; + } + $.ajax({ + url: '{:U("changepidcard")}', + type: 'post', + dataType: 'json', + data: {idcard:idcard,id:jsid}, + success: function (data) { + if (data.status > 0) { + layer.msg(data.msg) + setTimeout(function(){ + self.location.reload(true); + },1500); + + } else { + layer.msg(data.msg) + } + }, + error: function () { + alert("服务器故障！"); + } + }); }); }); + $("#phone").click(function () { layer.prompt({ formType: 3, @@ -380,10 +411,10 @@ success: function (data) { if (data.status > 0) { layer.msg(data.msg) - setTimeout(function(){ + setTimeout(function(){ self.location.reload(true); },1500); - + } else { layer.msg(data.msg) } diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 62cb6dc49..a9acb9286 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -284,7 +284,7 @@ - {$data.device_number} + {$data.device_number|encryptStr} 已{:get_info_status($data['lock_status'],4)} From aebd5bd396e40f38ea66752bf7672d438bb20475 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 12 Dec 2019 15:43:21 +0800 Subject: [PATCH 67/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage2.html | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 9f84ab498..72168ce92 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -48,29 +48,34 @@ -
    -
    - -
    - - -
    - -
    - - - - - - - -
    -     +
    +
    +
    + +
    + + +
    + +
    + + + + + + + +
    +     +
    +
    -
    +
    -
    -
    -

    基本信息

    -

    说明：此处显示本站玩家账号的相关信息

    -
    - -
    - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
    玩家账号 - - 玩家登录账号，一经注册，全平台通用 -
    登录密码 - - 不可查看，只能更改密码 -
    用户昵称 - - — — - - - - 初次登录，默认玩家为账号，用户可自行设置昵称 -
    账号状态 + +
    +

    基本信息

    +

    说明：此处显示本站玩家账号的相关信息

    +
    + +
    + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + 需玩家认证真实姓名和身份证号码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - -
    玩家账号 + + 玩家登录账号，一经注册，全平台通用 +
    登录密码 + + 不可查看，只能更改密码 +
    用户昵称 + + — — + + + + 初次登录，默认玩家为账号，用户可自行设置昵称 +
    账号状态 - 可设置玩家账号的登录状态，锁定即无法登录本平台 -
    用户头像 + 可设置玩家账号的登录状态，锁定即无法登录本平台 +
    用户头像 点击查看原图 - 初次登录默认头像，用户可以自行修改 -
    VIP等级 + 初次登录默认头像，用户可以自行修改 +
    VIP等级 VIP {:get_vip_level($recharge_total)} - -
    实名认证 + +
    实名认证 未认证 @@ -96,158 +96,153 @@ 意外数据 - - 需玩家认证真实姓名和身份证号码 -
    真实姓名 - - - - - -
    身份证号 - - - - - -
    QQ号 - - - - - -
    手机号码 - - 点击修改 - 玩家绑定的手机号，可通过点击修改，更换玩家的绑定手机（慎重使用） -
    注册时间 - -
    注册ip - -
    真实姓名 + + + + + +
    身份证号 + + 点击修改 +
    QQ号 + + + + + +
    手机号码 + + 点击修改 + 玩家绑定的手机号，可通过点击修改，更换玩家的绑定手机（慎重使用） +
    注册时间 + +
    注册ip + + +
    最后登录时间 + +
    最后登录IP + +
    平台币余额 + + 显示该用户平台币的账户余额 +
    绑定平台币余额 + 点击查看 + 显示该用户各个游戏的绑定平台币余额（点击弹出显示，可以手动修改） +
    游戏付费记录 + 点击查看 + 此处显示该玩家游戏内的充值记录；不包含玩家账户充值平台币的记录 +
    最后登录时间 - -
    最后登录IP - -
    平台币余额 - - 显示该用户平台币的账户余额 -
    绑定平台币余额 - 点击查看 - 显示该用户各个游戏的绑定平台币余额（点击弹出显示，可以手动修改） -
    游戏付费记录 - 点击查看 - 此处显示该玩家游戏内的充值记录；不包含玩家账户充值平台币的记录 -
    金币余额 +
    金币余额 - 显示该用户的金币余额 -
    金币提现记录 - 点击查看 - 此处显示该玩家的金币提现记录 -
    角色信息 - 点击查看 - 点击查看该用户游戏角色信息 -
    游戏登录记录 - 点击查看 - 点击查看该用户游戏登录记录 -
    -
    - - - - - 返回 - -
    -
    -
    + 显示该用户的金币余额 +
    金币提现记录 + 点击查看 + 此处显示该玩家的金币提现记录 +
    角色信息 + 点击查看 + 点击查看该用户游戏角色信息 +
    游戏登录记录 + 点击查看 + 点击查看该用户游戏登录记录 +
    +
    + + + + + 返回 + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    -
    + 已添加添加至常用设置
    - -
    - -
    - - -
    - 已添加添加至常用设置 -
    - @@ -289,7 +284,7 @@ var href = $(this).attr('href'); layer.open({ type: 2, title: "绑定平台币余额", shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [href , 'no'] + content: [href , 'no'] }); return false; }); @@ -300,7 +295,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/chax/id/' + id + '' , 'no'] + content: [url + 'admin.php?s=/Member/chax/id/' + id + '' , 'no'] }); }); @@ -311,24 +306,24 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/role_list/user_id/' + id + '' , 'no'] + content: [url + 'admin.php?s=/Member/role_list/user_id/' + id + '' , 'no'] }); }); - - $('#tixian').click(function() { - layer.open({ + + $('#tixian').click(function() { + layer.open({ type: 2, title: "【金币提现记录】列表", shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no'] + content: [url + 'admin.php?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no'] }); - }); - + }); + $('#lookheadpic').click(function() { - var url = $(this).attr('src'); - layer.open({ + var url = $(this).attr('src'); + layer.open({ type: 1, title: "", shadeClose: true, @@ -345,7 +340,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/denglu/id/' + id + '', 'no'] + content: [url + 'admin.php?s=/Member/denglu/id/' + id + '', 'no'] }); }); $("#bind_balance").click(function () { @@ -356,9 +351,45 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url + 'admin.php?s=/Member/bind_balance/id/' + id + '', 'no'] + content: [url + 'admin.php?s=/Member/bind_balance/id/' + id + '', 'no'] + }); + }); + + $("#idcard").click(function () { + layer.prompt({ + formType: 3, + title: "请输入身份证号码", + value: '' + }, function (idcard) { + var jsid = $('#selfid').val(); + var regIdNo = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/; + if(!regIdNo.test(idcard)){ + layer.msg("身份证号填写有误"); + return false; + } + $.ajax({ + url: '{:U("changepidcard")}', + type: 'post', + dataType: 'json', + data: {idcard:idcard,id:jsid}, + success: function (data) { + if (data.status > 0) { + layer.msg(data.msg) + setTimeout(function(){ + self.location.reload(true); + },1500); + + } else { + layer.msg(data.msg) + } + }, + error: function () { + alert("服务器故障！"); + } + }); }); }); + $("#phone").click(function () { layer.prompt({ formType: 3, @@ -380,10 +411,10 @@ success: function (data) { if (data.status > 0) { layer.msg(data.msg) - setTimeout(function(){ + setTimeout(function(){ self.location.reload(true); },1500); - + } else { layer.msg(data.msg) } From 381fa8d6338c40c6ee7ed97c00cf5af5e9632884 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Thu, 12 Dec 2019 17:20:36 +0800 Subject: [PATCH 73/77] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BB=84-=E7=8E=A9=E5=AE=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=8F=E6=84=9F=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Member/user_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 62cb6dc49..a9acb9286 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -284,7 +284,7 @@ - {$data.device_number} + {$data.device_number|encryptStr} 已{:get_info_status($data['lock_status'],4)} From 25ea7569cdd353042a504f467ace8375b2fdeec7 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 12 Dec 2019 17:21:12 +0800 Subject: [PATCH 74/77] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage2.html | 108 +++++++++++++++++- 1 file changed, 105 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 63e573c16..dbb0b66af 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -15,6 +15,8 @@ + +