diff --git a/Application/Admin/Controller/ApplyController.class.php b/Application/Admin/Controller/ApplyController.class.php
index 575d541eb..adea430bd 100644
--- a/Application/Admin/Controller/ApplyController.class.php
+++ b/Application/Admin/Controller/ApplyController.class.php
@@ -418,7 +418,8 @@ class ApplyController extends ThinkController
 
     public function android_del($model = null, $ids = null)
     {
-
+        echo "不允许删除";
+        return ;
         \Think\Log ::actionLog('Apply/android_del', 'Apply', 1);
         $this -> del($model, $ids);
     }
diff --git a/Application/Admin/View/Apply/and_lists.html b/Application/Admin/View/Apply/and_lists.html
index 2d532e612..0c0793d81 100644
--- a/Application/Admin/View/Apply/and_lists.html
+++ b/Application/Admin/View/Apply/and_lists.html
@@ -49,7 +49,9 @@
                 <div class="tools">
                     <a class=" ajax-post " target-form="ids" url="{:U("Apply/android_set",array("status"=>1,"msg_type"=>5,"field"=>"status"))}"><span class="button_icon button_icon9"></span>审 核</a>
                     <a class="  pack" id="org" target-form="ids" url="{:U("Apply/allpackage",array('p'=>$_GET['p'],'type'=>$_GET['type']))}" ><span class="button_icon button_icon23"></span>打 包</a>
+                    <!-- 
                     <a class=" ajax-post confirm " target-form="ids" url="{:U('android_del?model='.$model['id'])}"><span class="button_icon button_icon2"></span>删 除</a>
+                     -->
                     <if condition="C(SET_AUTO_PACK) eq 0">
                         <a class="ajax-get" target-form="ids" url='{:U("set_config_auto_audit",array("val"=>1,"config_key"=>"SET_AUTO_PACK"))}'><span class="button_icon button_icon4"></span>开启自动审核</a>
                         <else/>
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 0c3222223..5e6dbd698 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -48,6 +48,14 @@ class QueryController extends BaseController
         $begTime = strtotime($initBegTime);
         $endTime = strtotime($initEndTime);
         $endTime += 3600 * 24;
+        
+        $payedBegTime = I("payed_begtime", ''); 
+        if ($payedBegTime) $payedBegTime = strtotime($payedBegTime);
+        $payedEndTime = I("payed_endtime", '');
+        if ($payedEndTime) {
+            $payedEndTime = strtotime($payedEndTime) + 3600 * 24;
+        }
+        
         $levelPromote = $this->getLevelPromote();
         $queryPromote = $this->getQueryPromote($levelPromote);
         $loginPromote = $this->getLoginPromote();
@@ -100,6 +108,9 @@ class QueryController extends BaseController
             }
         }
         $map['tab_spend.spend_time'] = ['between', [$begTime, $endTime - 1]];
+        if ($payedBegTime && $payedEndTime) {
+            $map['tab_spend.payed_time'] = ['between', [$payedBegTime, $payedEndTime - 1]];
+        }
 
         $data = [];
         $count = 0;
@@ -175,6 +186,7 @@ class QueryController extends BaseController
                         break;
                 }
                 $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
+                $list['spend_time'] = date('Y-m-d H:i:s', $list['spend_time']);
                 $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--';
                 $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态';
                 $list['sdk_version'] = getSDKTypeName($list['sdk_version']);
@@ -224,6 +236,8 @@ class QueryController extends BaseController
         $this->assign('income', $income);
         $this->assign('initBegTime', $initBegTime);
         $this->assign('initEndTime', $initEndTime);
+        $this->assign('payedBegTime', I("payed_begtime", ''));
+        $this->assign('payedEndTime', I("payed_endtime", ''));
         $this->assign('setdate', date("Y-m-d"));
         $this->assign('serverData', $serverData['data']);
         $this->assign('ownId', $ownId);
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index 476c2891e..c9805aafe 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -116,7 +116,7 @@
         </div>
 
         <div class="form-group normal_space">
-          <label class="form-title select-title" style="position: relative;">起止时间：</label>
+          <label class="form-title select-title" style="position: relative;">下单时间：</label>
           <div class="select-time">
             <input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
           </div>
@@ -125,6 +125,17 @@
             <input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
           </div>
         </div>
+        
+        <div class="form-group normal_space">
+          <label class="form-title select-title" style="position: relative;">到账时间：</label>
+          <div class="select-time">
+            <input type="text" readonly id="payed_sdate" class="txt" name="payed_begtime" placeholder="开始时间" value="{$payedBegTime}">
+          </div>
+          <label class="form-title select-title zhi_color">&nbsp;—&nbsp;</label>
+          <div class="select-time">
+            <input type="text" readonly id="payed_edate" class="txt" name="payed_endtime" placeholder="结束时间" value="{$payedEndTime}">
+          </div>
+        </div>
 
         <div class="form-group normal_space">
           <input type="text" name="pay_order_number" class="txt normal_txt" placeholder="请输入订单号"
@@ -191,7 +202,8 @@
               <th>部门长</th>
               <th>组长</th>
               <th>推广员</th>
-              <th>付款时间</th>
+              <th>下单时间</th>
+              <th>到账时间</th>
 <!--              <th>操作</th>-->
             </tr>
             <empty name="listData">
@@ -216,6 +228,7 @@
                   <td>{$vo.p_p_pro_account}({$vo.p_p_pro_real_name}/{$vo.p_p_pro_group_remark})</td>
                   <td>{$vo.p_pro_account}({$vo.p_pro_real_name}/{$vo.p_pro_group_remark})</td>
                   <td>{$vo.pro_account}({$vo.pro_real_name})</td>
+                  <td>{$vo.spend_time}</td>
                   <td>{$vo.pay_time}</td>
 <!--                  <td>-->
 <!--                    <a href="{:U('Query/viewSpendDetailed',array('id'=>$vo['id']))}" style="cursor: pointer"-->
@@ -292,6 +305,30 @@
               scrollInput: false,
               endDate: date
           });
+          
+          $('#payed_sdate').datetimepicker({
+              format: 'yyyy-mm-dd',
+              language: "zh-CN",
+              minView: 2,
+              autoclose: true,
+              scrollMonth: false,
+              scrollTime: false,
+              scrollInput: false,
+              endDate: date
+          });
+
+          $('#payed_edate').datetimepicker({
+              format: 'yyyy-mm-dd',
+              language: "zh-CN",
+              minView: 2,
+              autoclose: true,
+              pickerPosition: 'bottom-left',
+              scrollMonth: false,
+              scrollTime: false,
+              scrollInput: false,
+              endDate: date
+          });
+          
 
           function showPromoteSelect(html)
           {
@@ -373,13 +410,30 @@
               var sdate = Date.parse($('#sdate').val()) / 1000;
               var edate = Date.parse($('#edate').val()) / 1000;
               if (sdate > edate) {
-                  layer.msg('开始时间必须小于等于结束时间');
+                  layer.msg('下单开始时间必须小于等于结束时间');
                   return false;
               }
               if ((edate - sdate) > 2592000) {
-                  layer.msg('时间间隔不能超过31天，请重新选择日期');
+                  layer.msg('下单时间间隔不能超过31天，请重新选择日期');
+                  return false;
+              }
+              
+              var payed_sdate = Date.parse($('#payed_sdate').val()) / 1000;
+              var payed_edate = Date.parse($('#payed_edate').val()) / 1000;
+              if (payed_sdate > payed_edate) {
+                  layer.msg('到账开始时间必须小于等于结束时间');
                   return false;
               }
+              if ((payed_edate - payed_sdate) > 2592000) {
+                  layer.msg('到账时间间隔不能超过31天，请重新选择日期');
+                  return false;
+              }
+              if (payed_sdate && !payed_edate) {
+            	  layer.msg('到账结束时间不能为空');
+              }
+			  if (!payed_sdate && payed_edate) {
+				  layer.msg('到账开始时间不能为空');
+              }
 
               var url = $(this).attr('url');
               console.log(url);