Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_iteration_20200714

resources/views/changeOrder/content.blade.php

@@ -223,7 +223,7 @@
                     <textarea name="kefu_remark" id="kefu_remark" class="form-control" placeholder="客服备注信息" style="resize: none;">{{$order_temp_info['kefu_remark']}}</textarea>
                     <textarea name="kefu_remark" id="kefu_remark" class="form-control" placeholder="客服备注信息" style="resize: none;">{{$order_temp_info['kefu_remark']}}</textarea>
                     
                     
                     @if ($order_info['order_goods_type'] == 2)
                     @if ($order_info['order_goods_type'] == 2)
-                    <table class="table table-bordered table-hover" style="margin-top:10px;">
+                    <!--<table class="table table-bordered table-hover" style="margin-top:10px;">
                         <tr>
                         <tr>
                             <th width="20%">批量调价</th>
                             <th width="20%">批量调价</th>
                             <td>
                             <td>
@@ -231,7 +231,7 @@
                                 <span class="text-danger">（批量设置单价，默认值1，折扣范围 0 < 值 <= 1）</span>
                                 <span class="text-danger">（批量设置单价，默认值1，折扣范围 0 < 值 <= 1）</span>
                             </td>
                             </td>
                         </tr>
                         </tr>
-                    </table>
+                    </table> -->
                     @endif
                     @endif
                     
                     
                     <?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>
                     <?php $extend_fee_items = json_decode($order_temp_info['extend_fee_items'], true); ?>