diff --git a/Application/Admin/Controller/TestOrderController.class.php b/Application/Admin/Controller/TestOrderController.class.php
index ad37f8bbe..f857bf28d 100644
--- a/Application/Admin/Controller/TestOrderController.class.php
+++ b/Application/Admin/Controller/TestOrderController.class.php
@@ -10,7 +10,35 @@ use Org\WeixinSDK\Weixin;
 class TestOrderController extends ThinkController
 {
     public function lists($p = 0) {
-        $order_list = M('test_order', 'tab_')->select();
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $arraypage = $page;
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+
+        $map['1'] = "1";
+        if (!empty($_REQUEST['server_type'])) {
+            $map['server_type'] = $_REQUEST['server_type'];
+        }
+        if (!empty($_REQUEST['order_type'])) {
+            $map['order_type'] = $_REQUEST['order_type'];
+        }
+        if (!empty($_REQUEST['order_no'])) {
+            $map['order_no'] = $_REQUEST['order_no'];
+        }
+        if (!empty($_REQUEST['user_account'])) {
+            $map['user_account'] = $_REQUEST['user_account'];
+        }
+        if (!empty($_REQUEST['pay_way'])) {
+            $map['pay_way'] = $_REQUEST['pay_way'];
+        }
+
+
+        $order_list = M('test_order', 'tab_')->where($map)->select();
         $this->assign('datas', $order_list);
         $this->display();
     }
diff --git a/Application/Admin/View/TestOrder/lists.html b/Application/Admin/View/TestOrder/lists.html
index aa099e5bb..1e873e577 100644
--- a/Application/Admin/View/TestOrder/lists.html
+++ b/Application/Admin/View/TestOrder/lists.html
@@ -40,29 +40,33 @@
     <div class="jssearch fl cf search_list">
       <!--游戏类型搜索END-->
 
-      <!--<div class="input-list">
-        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
-      </div>-->
-      <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
-      <input type="hidden" name="game_id" value="{$_GET['game_id']}"/>
-      <input type="hidden" name="game_name" value="{$_GET['game_name']}"/>
-      <input type="hidden" name="model" value="{$_GET['model']}"/>
-
-      <div class="input-list">
-        <input type="text"  name="pay_order_number" placeholder="请输入支付订单号" class="" value="{:I('pay_order_number')}" style="width: 180px"/>&nbsp;
+      <div class="input-list input-list-server search_label_rehab">
+        <select id="server_type" name="server_type" class="select_gallery"  style="width:120px;">
+          <option value="">选择服务器类型</option>
+          <option value="1"  <if condition="$_GET['server_type']  eq '1'">selected</if>>测试内网</option>
+          <option value="2"  <if condition="$_GET['server_type']  eq '2'">selected</if>>测试外网</option>
+        </select>
+      </div>
+      <div class="input-list input-list-server search_label_rehab">
+        <select id="order_type" name="order_type" class="select_gallery"  style="width:120px;">
+          <option value="">选择订单类型</option>
+          <option value="1" <if condition="$_GET['order_type']  eq '1'">selected</if>>sdk充值订单</option>
+          <option value="2" <if condition="$_GET['order_type']  eq '2'">selected</if>>平台币充值订单</option>
+          <option value="3" <if condition="$_GET['order_type']  eq '3'">selected</if>>超级签充值订单</option>
+          <option value="0" <if condition="$_GET['order_type']  eq '0'">selected</if>>未知</option>
+        </select>
       </div>
       <div class="input-list">
-        <input type="text"  name="order_number" placeholder="请输入CP订单号" class="" value="{:I('order_number')}" style="width: 180px"/>&nbsp;
+        <input type="text"  name="order_no" placeholder="请输入支付订单号" class="" value="{:I('order_no')}" style="width: 180px"/>&nbsp;
       </div>
       <div class="input-list">
         <input type="text"  name="user_account" placeholder="请输入测试账号" class="" value="{:I('user_account')}" style="width: 180px"/>&nbsp;
       </div>
       <div class="input-list">
-        <input type="text" readonly id="time-start" name="timestart" class="" value="{$startDate}" placeholder="开始时间" autocomplete="off"/>
+        <input type="text" readonly id="time-start" name="timestart" class="" value="{:I('timestart')}" placeholder="开始时间" autocomplete="off"/>
         -
         <div class="input-append date" id="datetimepicker" style="display:inline-block">
-          <input type="text" readonly id="time-end" name="timeend" class="" value="{$endDate}"
-                 placeholder="结束时间" autocomplete="off"/>
+          <input type="text" readonly id="time-end" name="timeend" class="" value="{:I('timeend')}" placeholder="结束时间" autocomplete="off"/>
           <span class="add-on"><i class="icon-th"></i></span>
         </div>
       </div>
@@ -70,23 +74,23 @@
       <div class="input-list input-list-server search_label_rehab">
         <select id="pay_way" name="pay_way" class="select_gallery"  style="width:120px;">
           <option value="">请选择支付渠道</option>
-          <option value="1">支付宝</option>
-          <option value="2">微信(扫码)</option>
-          <option value="3">微信app</option>
-          <option value="4">威富通</option>
-          <option value="5">聚宝云</option>
-          <option value="6">竣付通</option>
-          <option value="7">金猪</option>
-          <option value="9">双乾支付-支付宝</option>
-          <option value="10">双乾支付-银联</option>
-          <option value="15">双乾支付-快捷</option>
-          <option value="0">平台币</option>
-          <option value="-1">绑币</option>
+          <option value="1" <if condition="$_GET['pay_way']  eq '1'">selected</if>>支付宝</option>
+          <option value="2" <if condition="$_GET['pay_way']  eq '2'">selected</if>>微信(扫码)</option>
+          <option value="3" <if condition="$_GET['pay_way']  eq '3'">selected</if>>微信app</option>
+          <option value="4" <if condition="$_GET['pay_way']  eq '4'">selected</if>>威富通</option>
+          <option value="5" <if condition="$_GET['pay_way']  eq '5'">selected</if>>聚宝云</option>
+          <option value="6" <if condition="$_GET['pay_way']  eq '6'">selected</if>>竣付通</option>
+          <option value="7" <if condition="$_GET['pay_way']  eq '7'">selected</if>>金猪</option>
+          <option value="9" <if condition="$_GET['pay_way']  eq '9'">selected</if>>双乾支付-支付宝</option>
+          <option value="10" <if condition="$_GET['pay_way']  eq '10'">selected</if>>双乾支付-银联</option>
+          <option value="15" <if condition="$_GET['pay_way']  eq '15'">selected</if>>双乾支付-快捷</option>
+          <option value="0" <if condition="$_GET['pay_way']  eq '0'">selected</if>>平台币</option>
+          <option value="-1" <if condition="$_GET['pay_way']  eq '-1'">selected</if>>绑币</option>
         </select>
       </div>
 
       <div class="input-list">
-        <a class="sch-btn" href="javascript:;" id="search" url="{:U('PayChannel/testDetail','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
+        <a class="sch-btn" href="javascript:;" id="search" url="{:U('TestOrder/lists','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
 
         <!--<if condition="$_GET['all'] neq 1">
           <a class="sch-btn" href="{:U('PayChannel/export_testDetail',
@@ -180,14 +184,6 @@
               </volist>
             </td>
           </tr>
-          <tr>
-            <td><span>支付渠道</span></td>
-            <td colspan="25">
-              <volist name="sumData" id="sumData">
-                {$sumData.pay_way}：{$sumData.pay_amount} &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-              </volist>
-            </td>
-          </tr>
         </notemtpy>
 
         </tbody>
@@ -208,16 +204,9 @@
   <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
-  <script>
-    <volist name=":I('get.')" id="vo">
-            Think.setValue('{$key}',"{$vo}");
-    </volist>
-  </script>
   <script type="text/javascript">
-    //导航高亮
-   /* highlight_subnav('{:U('PayChannel/index')}');*/
+    $(".select_gallery").select2();
     $(function(){
-
       $('.page a').click(function () {
         var href = $(this).attr('href');
         $(this).removeAttr('href');
@@ -286,58 +275,6 @@
           $("#search").click();
         }
       });
-      $(".ljcz").click(function(){
-        var id = $(this).attr('data-value');
-        var game_name = "{:I('game_name')}";
-        var server_name = "{:I('server_id')}";
-        layer.open({
-          type: 2,
-          title: '游戏消费记录',
-          shadeClose: true,
-          shade: 0.8,
-          area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
-        });
-      });
-
-      $("#game_id").change(function(){
-        $.ajax({
-          url:"{:U('Ajax/getSpendServer')}",
-          type:"post",
-          data:{game_id:$("#game_id option:selected").attr('game-id')},
-          dataType:'json',
-          success:function(data){
-            str = "<option value=''>请选择区服</option>";
-            for (var i in data){
-              str += "<option value='"+data[i].server_name+"'>"+data[i].server_name+"</option>"
-            }
-            $("#server_id").empty();
-            $("#server_id").append(str);
-            $("#server_id").select2();
-
-          }
-        })
-      });
-      var game_id = "{:I('game_name')}";
-      var game_server = "{:I('server_id')}";
-      if(game_id){
-        $.ajax({
-          url:"{:U('Ajax/getSpendServer')}",
-          type:"post",
-          data:{game_id:game_id,type:2},
-          dataType:'json',
-          success:function(data){
-            str = "<option value=''>请选择区服</option>";
-            for (var i in data){
-              str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
-            }
-            $("#server_id").empty();
-            $("#server_id").append(str);
-            $("#server_id").select2();
-
-          }
-        })
-      }
     })
 
     $("#upstream").click(function () {
@@ -350,6 +287,5 @@
         content:'/admin.php?s=/TestOrder/addOrder/'
       });
     });
-
   </script>
 </block>