联营取消订单添加待发货

app/Http/Controllers/OrderController.php

@@ -1240,7 +1240,8 @@ Class OrderController extends Controller
 
 
             $data['k1']  = time();
             $data['k1']  = time();
             $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
             $data['k2']  = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
-
+echo '<pre>';
+print_r(curlApi($url, $data, "POST"));die;
             $temp = json_decode(curlApi($url, $data, "POST"), true);
             $temp = json_decode(curlApi($url, $data, "POST"), true);
 
 
             return array('errcode'=>$temp['err_code'], 'errmsg'=>$temp['err_msg']);
             return array('errcode'=>$temp['err_code'], 'errmsg'=>$temp['err_msg']);

resources/views/detail/content.blade.php

@@ -631,7 +631,7 @@
         @if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales')
         @if (!isset($_REQUEST['tags']) && $action_name != 'changeOrder' && $action_name != 'sendSales')
             <p style="padding-left: 5px;">操作</p>
             <p style="padding-left: 5px;">操作</p>
             <div class="tabs-box">
             <div class="tabs-box">
-                @if (in_array($order_info['status'], [1, 2]) && in_array('cancel_order', $userPerms))
+                @if (in_array($order_info['status'], [1, 2, 4]) && in_array('cancel_order', $userPerms))
                     <!-- <a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-danger">取消订单</a> -->
                     <!-- <a href="{{URL('cancelPay', ['order_id'=>$order_info['order_id']])}}" class="btn btn-danger">取消订单</a> -->
                     <a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$order_info['order_id']}}" data-type="2">取消订单</a> 
                     <a class="btn btn-danger input-cancel-reason" href="javascript:;" data-oid="{{$order_info['order_id']}}" data-type="2">取消订单</a> 
                 @endif
                 @endif