Merge remote-tracking branch 'origin/dev' into dev

Application/Home/Controller/QueryController.class.php

@@ -84,11 +84,15 @@ class QueryController extends BaseController
             $map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
         }
 
-        if (I('pay_way') !== null && I('pay_way') !== '') {
+        if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') {
-            if (I('pay_way') == 2) {
+            $payWay = intval(I('pay_way'));
-                $map['tab_spend.pay_way'] = ['in', '2,3,4'];
+
-            } else {
+            if (in_array($payWay, array_keys(QueryController::$payWay))) {
-                $map['tab_spend.pay_way'] = I('pay_way');
+                if ($payWay == 2) {
+                    $map['tab_spend.pay_way'] = ['in', '2,3,4'];
+                } else {
+                    $map['tab_spend.pay_way'] = $payWay;
+                }
             }
         }
 
@@ -668,7 +672,7 @@ class QueryController extends BaseController
             'grand_id' => $promote['id'],
         ];
         $ids = M('promote', 'tab_')->where($map)->getField('id', true);
-        
+
         $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']])->select();
         $games = $this->getGamesByPromote($promote);
 

Application/Home/View/default/Query/recharge.html

@@ -142,7 +142,7 @@
 
         <div class="form-group normal_space fl">
           <select id="pay_way" name="pay_way" class="reselect select_gallery" style="min-width:130px;">
-            <option value="">支付方式</option>
+            <option value="-2">支付方式</option>
             <foreach name="payWayData" item="vo" key="k">
               <if condition="$k eq I('pay_way',-2)">
                 <option value="{$k}" selected>{$vo}</option>