Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a3c6eed7 by 朱继来
Options

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

parents 728ffa8c b445a60a
Inline Side-by-side
Showing with 5 additions and 5 deletions
resources/views/detail/content.blade.php
...@@ -759,7 +759,7 @@ ...@@ -759,7 +759,7 @@
<!-- 回传合同 --> <!-- 回传合同 -->
@if ($order_info['status'] == 2) @if ($order_info['status'] == 2)
<a class="btn btn-warning" id="upload-contract" data-id="{{$order_info['order_id']}}">回传合同</a> <!-- <a class="btn btn-warning" id="upload-contract" data-id="{{$order_info['order_id']}}">回传合同</a> -->
@endif @endif
@if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms)) @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms))
......
resources/views/orderlist/content.blade.php
...@@ -315,11 +315,11 @@ ...@@ -315,11 +315,11 @@
@endif @endif
<?php <?php
$extend = App\Http\Controllers\getOrderExtend($v['order_id'], 'upload_contract_url'); // $extend = App\Http\Controllers\getOrderExtend($v['order_id'], 'upload_contract_url');
if (!empty($extend->upload_contract_url)) { // if (!empty($extend->upload_contract_url)) {
echo '<a class="btn btn-warning" href="'.$extend->upload_contract_url.'" target="_blank">客户合同下载</a>'; // echo '<a class="btn btn-warning" href="'.$extend->upload_contract_url.'" target="_blank">客户合同下载</a>';
} // }
?> ?>
@if ($v['status'] == -1 && !$v['cancel_reason']) @if ($v['status'] == -1 && !$v['cancel_reason'])
......
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