From cbb0e82db1290abc7f86197cc17e6109bff631e6 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 6 Jul 2020 18:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=B1=87=E6=80=BB=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketPercentageController.class.php         |  1 +
 .../View/MarketPercentage/showbonuslist.html     | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 74a336a2a..454b799cd 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/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")
diff --git a/Application/Admin/View/MarketPercentage/showbonuslist.html b/Application/Admin/View/MarketPercentage/showbonuslist.html
index 332adc445..268c48e84 100644
--- a/Application/Admin/View/MarketPercentage/showbonuslist.html
+++ b/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="开始时间" />