Merge branch 'hotfix/market_percentage' of wmtx/platform into release

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,

Application/Admin/View/PayMerchant/index.html

@@ -151,15 +151,14 @@
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>
-
+      <input type="text" name="type" class="" value="{$_GET['type']}" style="display: none"/>
+      <input type="text" name="pay_way" class="" value="{$_GET['pay_way']}" style="display: none"/>
       <input type="hidden" name="" value="" class="sortBy">
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('PayMerchant/index','model='.$model['name'].'&row='.I('row'),false)}"
            style="width: 100px;border: #3C95C8 solid 1px;">搜索</a>
         <if condition="$role_export_check eq true ">
-          <a class="sch-btn" href="{:U('/PayMerchant/index/export/1',
-                  array_merge(array('export'=>1),I('get.'))
-                  ,false)}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+          <a class="sch-btn" href="{:U('/PayMerchant/index/export/1', array_merge(array('export'=>1),$_GET),false)}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
         </if>
       </div>
     </div>