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

提现汇总表时间检索bug修正

Application/Admin/Controller/MarketPercentageController.class.php

@@ -636,6 +636,7 @@ class MarketPercentageController extends ThinkController
             sum(if(status > 0, wait_performance_commission, '0.00')) + sum(if(status > 0, wait_achievement_commission,'0.00')) wait_extend_commission,
             sum(if(status = 0, wait_performance_commission, '0.00')) + sum(if(status = 0, wait_achievement_commission, '0.00')) wait_commission, remark,level,status")
             ->where($map);
+
         if ($_REQUEST['export']) {
             $data = $data
                 ->order("pay_time DESC")

Application/Admin/View/MarketPercentage/showbonuslist.html

@@ -51,14 +51,14 @@
             <div class="input-list search-title-box">
                 <label>搜索：</label>
             </div>
-            <div class="input-list input-list-promote search_label_rehab">
-                <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">
-                    <option value="">请选择月份</option>
-                    <volist name=":getMonth()" id="vo">
-                        <option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>
-                    </volist>
-                </select>
-            </div>
+<!--            <div class="input-list input-list-promote search_label_rehab">-->
+<!--                <select id="pay_time" name="pay_time" class="select_gallery" style="width:150px;">-->
+<!--                    <option value="">请选择月份</option>-->
+<!--                    <volist name=":getMonth()" id="vo">-->
+<!--                        <option value="{$vo}" <if condition="$vo eq $_GET['pay_time']">selected=selected</if>>{$vo}</option>-->
+<!--                    </volist>-->
+<!--                </select>-->
+<!--            </div>-->
 
             <div class="input-list">
                 <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="开始时间" />