Skip to content

朱继来 / 后台订单管理

Go to a project
Commit ff5ca46a by 朱继来
Options

fix conflict

parents 49ce2f07 6a6d2739
Inline Side-by-side
Showing with 4 additions and 5 deletions
resources/views/orderlist/content.blade.php
...@@ -272,6 +272,10 @@ ...@@ -272,6 +272,10 @@
<a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a> <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
@endif @endif
<!-- 管理员和经理显示 && sale_id为空 && 订单状态为待审核 -->
@if (in_array($role, [1, 2]) && $v['status'] == 1)
<a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a>
<?php <?php
$apiUrl = Config('website.api_domain'); $apiUrl = Config('website.api_domain');
$k1 = time(); $k1 = time();
...@@ -282,11 +286,6 @@ ...@@ -282,11 +286,6 @@
@if (in_array('download_contract', $userPerms)) @if (in_array('download_contract', $userPerms))
<a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a> <a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a>
@endif @endif
<!-- 管理员和经理显示 && sale_id为空 && 订单状态为待审核 -->
@if (in_array($role, [1, 2]) && $v['status'] == 1)
<a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a>
@endif
</div> </div>
</td> </td>
</tr> </tr>
......
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