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 01/13] =?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 1409846ac3782ed4421630dafaae935e60f40809 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 9 Dec 2019 20:00:45 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=88=87=E6=8D=A2IOS=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E6=89=93=E5=8C=85?= 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 a2de4bed7bce60fc31bd057ee1e55537eb303226 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 11:27:20 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=88=87=E6=8D=A2IOS=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E6=89=93=E5=8C=85=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 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 92accdc727c98560164264648463befd92b0c2ab Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 14:06:24 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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 40472088719c8297d7e2458bf9c893454e2ef6d0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 10 Dec 2019 14:18:19 +0800 Subject: [PATCH 05/13] =?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 --- Application/Home/View/default/Query/recharge.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index c3a078c79..a7f02d908 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -227,6 +227,7 @@ 合计 -- -- + -- {$income} -- -- From 14644b44a246a0d80a3453fb9b4990268215ab2b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 16:46:45 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 12 +++++++++++- Application/Home/Controller/HomeController.class.php | 7 +++++++ Application/Home/View/default/Home/landingPage.html | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index a49fa8538..49f205480 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -333,7 +333,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 @@