Merge branch 'zjl_account_20180911' into development

app/Http/Controllers/OrderController.php

@@ -1003,7 +1003,12 @@ Class OrderController extends Controller
     {
     {
         $info = $this->orderDetail($request, $id);
         $info = $this->orderDetail($request, $id);
 
 
-        //待审核才可以
+        // 账期订单跳转到详情页
+        if ($info['order_info']['status'] == 4) {
+            return redirect('/details/'.$id);
+        }
+
+        // 待审核才可以
         if(!in_array($info['order_info']['status'], [-1, 1, 2])){ 
         if(!in_array($info['order_info']['status'], [-1, 1, 2])){ 
             return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);       
             return redirect('/prompt')->with(['message'=>"该订单不符合人工审单条件~【status:{$info['order_info']['status']}】",'url' =>$_SERVER['HTTP_REFERER'], 'jumpTime'=>3,'status'=>false]);       
         }
         }

public/js/order.js

@@ -992,10 +992,10 @@
                 $('input[name=order_pay_type]').click(function(){
                 $('input[name=order_pay_type]').click(function(){
                     var val = $(this).val();
                     var val = $(this).val();
 
 
-                    if (val == 1) {
-                        $('.show-advance-pay').hide();
-                    } else {
+                    if (val == 2) {
                         $('.show-advance-pay').show();
                         $('.show-advance-pay').show();
+                    } else {
+                        $('.show-advance-pay').hide();
                     }
                     }
                 })
                 })