Merge branch 'test'

application/index/view/collection/getCollection.html

@@ -281,7 +281,7 @@
 												<div class="text-right">
 													<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
 													<span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
-													<span class="money_total_two ld-Marheight ">收款总额：</span><span id="money_total" class="money_total_two fore-span ld-Marheight"></span>
+													<span class="money_total_two ld-Marheight ">收款总额：</span><span id="money_total" class="money_total_two"></span>
 													<!--<span class="money_total_two fore-span ld-Marheight ">实付总额：</span><span id="money_total" class="money_total_two_shifu fore-span ld-Marheight">1268</span>元-->
 													<span class="btn btn-info btn3 ld-Marheight" id="export">导出报表</span>
 												</div>

application/model/AAgents.php

@@ -664,11 +664,7 @@ class AAgents extends BaseModel
      */
     public function searchAgentsByKeyword($field, $params)
     {
-        if(isset($params["status"]) && $params["status"] == "-1"){
-           unset($params["status"]);
-        }else{
-            $params["status"] = array("in","0,3");
-        }
+        $params["status"] = array("in","0,3");
         $result = Db::table($this->table)
             ->field($field)
             ->where($params)