Merge branch 'zjl_iteration_20181127' into development

resources/views/detail/content.blade.php

@@ -497,7 +497,7 @@
                     @endif 
 
                     <tr>
-                        <td>订单总额：</td>
+                        <td>{{ isset($order_temp_info) && $order_temp_info['order_type'] == 3 ? '（自营内部采购下单享95折优惠）' : '' }}订单总额：</td>
                         <td>
                         <span style="color:red;font-size:20px">{{$currency}}
                             <span class="amount">{{$order_info['order_amount']}}</span>