Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c1317f7b by 朱继来
Options

Merge branch 'zjl_order_20200923'

parents 27b41e50 8600c65d
Inline Side-by-side
Showing with 6 additions and 2 deletions
resources/views/orderlist/content.blade.php
......@@ -278,7 +278,9 @@
<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)
@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>
......
resources/views/selfOrder/content.blade.php
......@@ -298,7 +298,9 @@
@endif
</td>
<td class="show-list">
@if ($v['order_type'] == 1)
@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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment