Merge branch 'zjl_adjust_20181026' into development

resources/views/detail/content.blade.php

@@ -202,7 +202,6 @@
                         @else
                             <th>收货地址</th>
                         @endif
-                        <th>客户备注</th>
                     </tr>
                     <tr>
                         <td>
@@ -230,8 +229,6 @@
                                 {{$order_address_info['province_val']}}&nbsp;&nbsp;{{$order_address_info['city_val']}}&nbsp;&nbsp;{{$order_address_info['district_val']}}&nbsp;&nbsp;{{$order_address_info['address']}}
                             </td>
                         @endif
-
-                        <td>{{$order_info['order_remark']}}</td>
                     </tr>       
                 </table>
             </div>

resources/views/selfOrder/content.blade.php

@@ -18,6 +18,7 @@
                                                 <li class="order_type_tab active" data-val="">会员账号</li>
                                                 <li class="order_type_tab" data-val="1">订单编号</li>
                                                 <li class="order_type_tab" data-val="2">型号名称</li>
+                                                <li class="order_type_tab" data-val="3">发票抬头</li>
                                             </ul>
                                         </div>
                                     </dd>
@@ -47,7 +48,7 @@
                                         </div>
                                     </dd>
                                 </dl> 
-                                <dl>
+                                <!-- <dl>
                                     <dt>客服：</dt>
                                     <dd style="width: 115px;">
                                         <div class="droplist"  data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
@@ -59,7 +60,7 @@
                                             </ul>
                                         </div>
                                     </dd>
-                                </dl>
+                                </dl> -->
                                 <!-- 京东自营角色不显示订单来源 -->
                                 @if ($role != 6)
                                 <dl>