Merge branch 'zjl_order_20200923'

resources/views/orderlist/content.blade.php

@@ -278,8 +278,10 @@
                         <tr data-oid="{{ $v['order_id'] }}" data-type="1">
                             <td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td> 
                             <td class="show-list">
-                                @if ($v['order_type'] == 1)
-                                <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>
+                                @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)
+                                    <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>  
                             <td class="show-list">{{$v['order_sn']}}</td> 

resources/views/selfOrder/content.blade.php

@@ -298,8 +298,10 @@
                                 @endif   
                             </td>
                             <td class="show-list">
-                                @if ($v['order_type'] == 1)
-                                <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>
+                                @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)
+                                    <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> 
                             <td class="show-list">{{$v['order_sn']}}</td>