Merge branch 'zjl_adjust_20181026' into development

public/css/detail.css

@@ -222,7 +222,7 @@ li {
 
 
 	.test-order { width: 130px !important; }
 	.test-order { width: 130px !important; }
 
 
-	.Wdate{ width: 90px !important; }
+	.Wdate{ width: 80px !important; }
 
 
     .btn-group { width: 220px; }
     .btn-group { width: 220px; }
 
 

resources/views/detail/changeOrder.blade.php

@@ -2,7 +2,7 @@
 <div class="tabs-box">
 <div class="tabs-box">
     <div class="order-change-main">
     <div class="order-change-main">
         @if ($order_info['status'] == 1)
         @if ($order_info['status'] == 1)
-        <form id="checkOrderForm" class="form-horizontal">
+        <form id="checkOrderForm" class="form-horizontal table-responsive">
             <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
             <input type="hidden" name="order_sn" value="{{$order_info['order_sn']}}">
             <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
             <input type="hidden" name="user_id" value="{{$order_info['user_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
@@ -348,7 +348,7 @@
 
 
 <div class="tabs-box adjusted_order" style="display: none;">
 <div class="tabs-box adjusted_order" style="display: none;">
     <div class="order-change-main">
     <div class="order-change-main">
-        <form id="adjustedOrderForm" class="form-horizontal">
+        <form id="adjustedOrderForm" class="form-horizontal table-responsive">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="order_id" value="{{$order_info['order_id']}}">
             <input type="hidden" name="sale_id" value="{{$order_info['sale_id']}}">
             <input type="hidden" name="sale_id" value="{{$order_info['sale_id']}}">
             <input type="hidden" name="extra_fee" value="{{$order_temp_info['extra_fee']}}">
             <input type="hidden" name="extra_fee" value="{{$order_temp_info['extra_fee']}}">