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

resources/views/detail/detail_items_info.php

@@ -103,7 +103,7 @@
                         <td>
                             <?php 
                                 if ($v['order_goods_type'] == 1) {
-                                    echo '联营';
+                                    echo '专营';
                                 } else {
                                     echo $v['sale_type'] == 1 ? '现货' : '预售';
                                 }

resources/views/orderlist/content.blade.php

@@ -324,7 +324,7 @@
                             <td class="show-list">
                                 @if ($v['is_type'] == 1) 
                                     <p class="show-title" title="{{ preg_match('/\d/', $v['order_remark']) ? '' : $v['order_remark'] }}" style="width: 200px;">{{ preg_match('/^\d$/', $v['order_remark']) ? '' : $v['order_remark'] }}</p>
-                                @elseif ($v['order_type'] == 1)
+                                @else
                                     <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
                                 @endif
                             </td>