Merge remote-tracking branch 'origin/hotfix/test_order' into hotfix/test_order

# Conflicts:
#	Application/Admin/View/TestOrder/lists.html

Application/Admin/Controller/TestOrderController.class.php

@@ -46,4 +46,22 @@ class TestOrderController extends ThinkController
     public function addOrder(){
         $this->display();
     }
+
+    public function saveOrder() {
+
+        $data = $_GET;
+
+//        dump($data);die();
+        $data['add_time'] = time();
+        $data['game_name'] = get_gamename($data['game_id']);
+
+        $isSuccess = M('test_order','tab_')->add($data);
+
+        if ($isSuccess) {
+            $this->ajaxReturn(['status'=>1]);
+        } else {
+            $this->ajaxReturn(['status'=>0]);
+        }
+
+    }
 }

Application/Admin/View/TestOrder/addOrder.html

@@ -85,7 +85,7 @@
             <tr>
                 <td class="l">订单类型：</td>
                 <td class="r">
-                    <select id="order_type" name="server_type" class="select_gallery">
+                    <select id="order_type" name="order_type" class="select_gallery">
                         <option value="1">sdk充值订单</option>
                         <option value="2">平台币充值订单</option>
                         <option value="3">超级签充值订单</option>
@@ -96,19 +96,19 @@
             <tr>
                 <td class="l">支付订单号：</td>
                 <td class="r">
-                    <input type="text" class="txt" name="link_phone" value="" placeholder="请输入支付订单号">
+                    <input type="text" class="txt" name="order_no" id="order_no" value="" placeholder="请输入支付订单号">
                 </td>
             </tr>
             <tr>
                 <td class="l">CP订单号：</td>
                 <td class="r">
-                    <input type="text" class="txt" name="address" value="" placeholder="请输入CP订单号">
+                    <input type="text" class="txt" name="cp_order_no" id="cp_order_no" value="" placeholder="请输入CP订单号">
                 </td>
             </tr>
             <tr>
                 <td class="l">测试账号：</td>
                 <td class="r">
-                    <input type="text" class="txt" name="company_tax_no" value="" placeholder="请输入测试账号">
+                    <input type="text" class="txt" name="user_account" id="user_account" value="" placeholder="请输入测试账号">
                 </td>
             </tr>
             <tr>
@@ -122,13 +122,13 @@
             <tr>
                 <td class="l">订单金额：</td>
                 <td class="r">
-                    <input type="text" class="txt" name="company_tax_no" value="" placeholder="请输入订单金额">
+                    <input type="text" class="txt" name="order_amount" id="order_amount" value="" placeholder="请输入订单金额">
                 </td>
             </tr>
             <tr>
                 <td class="l">实付金额：</td>
                 <td class="r">
-                    <input type="text" class="txt" name="company_tax_no" value="" placeholder="请输入实付金额">
+                    <input type="text" class="txt" name="pay_amount" id="pay_amount" value="" placeholder="请输入实付金额">
                 </td>
             </tr>
             <tr>
@@ -159,7 +159,7 @@
             </tbody>
         </table>
         <div class="jssearch fl cf search_list" style="width: 100%;text-align: center">
-            <a class="sch-btn" href="javascript:;" id="search" url="{:U('Query/marketList','model='.$model['name'] .'&row='.I('row'),false)}" style="width: 120px">提交保存</a>
+            <a class="sch-btn" href="javascript:;" id="jssearch" url="{:U('TestOrder/saveOrder','model='.$model['name'] .'&row='.I('row'),false)}" style="width: 120px">提交保存</a>
         </div>
     </div>
 </div>
@@ -203,6 +203,94 @@
     }
 
     get_game_list();
+
+</script>
+
+<script type="text/javascript">
+    //搜索功能
+    $("#jssearch").click(function(){
+        var starttime = $.trim($('#time-start').val());
+        var endtime = $.trim($('#time-end').val());
+
+        if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
+
+        var url = $(this).attr('url');
+        var query  = $('table').find('input').serialize();
+        query  += "&" + $('table').find('select').serialize();
+        query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
+        query = query.replace(/^&/g,'');
+
+        if( url.indexOf('?')>0 ){
+            url += '&' + query;
+        }else{
+            url += '?' + query;
+        }
+
+        if (!$('#server_type').val()) {
+            layer.msg("服务器类型不能为空");
+            return;
+        }
+        if (!$('#order_type').val()) {
+            layer.msg("订单类型不能为空");
+            return;
+        }
+        if (!$('#order_no').val()) {
+            layer.msg("支付订单号不能为空");
+            return;
+        }
+        if (!$('#cp_order_no').val()) {
+            layer.msg("cp订单号不能为空");
+            return;
+        }
+        if (!$('#user_account').val()) {
+            layer.msg("测试账号不能为空");
+            return;
+        }
+        if (!$('#game_name').val()) {
+            layer.msg("游戏不能为空");
+            return;
+        }
+        if (!$('#order_amount').val()) {
+            layer.msg("订单金额不能为空");
+            return;
+        }
+        if (!$('#pay_amount').val()) {
+            layer.msg("实付不能为空");
+            return;
+        }
+        if (!$('#pay_way').val()) {
+            layer.msg("支付方式不能为空");
+            return;
+        }
+        if (!$('#datetimepicker').val()) {
+            layer.msg("充值时间不能为空");
+            return;
+        }
+
+        $.ajax({
+            url:url,
+            type:"post",
+            dataType:'json',
+            success:function(data){
+                console.log(data);
+                if (data.status == 1) {
+                    window.parent.reload();
+                } else {
+                    layer.msg("测试订单录入失败");
+                }
+
+            }
+        })
+
+    });
+
+    //回车自动提交
+    $('.jssearch').find('input').keyup(function(event){
+        if(event.keyCode===13){
+            $("#search").click();
+        }
+    });
 </script>
 
 </body>

Application/Admin/View/TestOrder/lists.html

@@ -207,6 +207,7 @@
   <script type="text/javascript">
     $(".select_gallery").select2();
     $(function(){
+
       $('.page a').click(function () {
         var href = $(this).attr('href');
         $(this).removeAttr('href');