From d9d66dc5bf1e3311c7b7cc828758ae090a4f1e82 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 29 Jul 2020 18:56:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/PayMerchantController.class.php | 4 ++-- Application/Admin/View/PayMerchant/index.html | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/PayMerchantController.class.php b/Application/Admin/Controller/PayMerchantController.class.php index ae6ad4fb8..83592b2d6 100644 --- a/Application/Admin/Controller/PayMerchantController.class.php +++ b/Application/Admin/Controller/PayMerchantController.class.php @@ -51,9 +51,9 @@ class PayMerchantController extends ThinkController } if ($_REQUEST['pay_way']) { - $data_map['pay_way'] = [$_REQUEST['type'],$_REQUEST['pay_way']]; + $data_map['pay_way'] = [trim($_REQUEST['type']),$_REQUEST['pay_way']]; } - +// var_dump($data_map);die(); //游戏充值金额 $data = M("spend use index(pay_channel)","tab_") ->field("SUM(CASE WHEN merchant.id is not null and tab_test_white_list.user_id is null THEN pay_amount ELSE 0 END) as cash_amount, diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html index 8a3167e72..5aad8cf2a 100644 --- a/Application/Admin/View/PayMerchant/index.html +++ b/Application/Admin/View/PayMerchant/index.html @@ -151,15 +151,14 @@ - + +
搜索 - 导出 + 导出