Merge branch 'zjl_cancel_order_20190213' into development

app/Http/Controllers/RefundController.php

@@ -172,7 +172,7 @@ class RefundController extends Controller
         if (!$refund) echo '未获取到退款单';
         if (!$refund) echo '未获取到退款单';
 
 
         $data['order_id'] = $refund->order_id;
         $data['order_id'] = $refund->order_id;
-        $data['refund_amount'] = number_format($refund->pay_amount - $refund->price_fall, 2);
+        $data['refund_amount'] = number_format($refund->pay_amount - $refund->price_fall, 2, '.', '');
         $data['pay_code'] = 'unionpay';
         $data['pay_code'] = 'unionpay';
 
 
         $url = Config('website.api_domain').'refund/recharge';
         $url = Config('website.api_domain').'refund/recharge';

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