From 6f7e0de83d4649f9f1eb3dcac815c429e602ff96 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 25 Mar 2020 14:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B9=B3=E5=8F=B0=E5=B8=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 3 +++ .../Admin/Controller/FinancePromoteController.class.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 18a0546c0..0d85156b8 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -894,6 +894,9 @@ function clearGameNameType($game_name) //设备名称词典 function getGameTypeName($id,$chinese=true) { + if(!$id){ + return '无'; + } $android = 'Android'; $ios = 'ios'; if($chinese){ diff --git a/Application/Admin/Controller/FinancePromoteController.class.php b/Application/Admin/Controller/FinancePromoteController.class.php index 3a3fe5c64..73a4f30c2 100644 --- a/Application/Admin/Controller/FinancePromoteController.class.php +++ b/Application/Admin/Controller/FinancePromoteController.class.php @@ -461,6 +461,10 @@ class FinancePromoteController extends AdminController $value['sdk_version'] =getGameTypeName($value['sdk_version']); if(!$value['game_name']) $value['game_name'] = "无"; + //按类型判断pid + if($_REQUEST['promote_type'] == 2 && $_REQUEST['promote_id']){ + $value['p_id'] = $_REQUEST['promote_id']; + } } if (isset($_REQUEST['export'])) { @@ -1013,6 +1017,7 @@ class FinancePromoteController extends AdminController } $_POST['promote_level'] = $level; // } + // dd($map); }