Merge branch 'zjl_action_log_20180521' into development

app/Http/Controllers/OrderController.php

@@ -1666,8 +1666,10 @@ Class OrderController extends Controller
                             ->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]);
 
                     if ($update) {
+                        $log = array(); 
+                        
                         // 记录
-                        $log['order_id'] = $order_id;
+                        $log['order_id'] = $v->order_id;
                         $log['operator_id'] = 0;
                         $log['operator_type'] = 3;
                         $log['event'] = '取消订单，取消原因：超时未付款';

resources/views/detail/content.blade.php

@@ -524,8 +524,9 @@
                 @if (in_array($order_info['status'], array(4, 7, 8, 10)) && in_array('order_send', $userPerms)) 
                     <!-- <a href="{{URL('send', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">订单发货</a> -->
                 @endif
-     
-                @if ($order_info['status'] == 10)
+                
+                <!-- 已发货之后的状态 -->
+                @if ($order_info['status'] > 4)
                     <a href="{{URL('invShipping', ['order_id'=>$order_info['order_id']])}}" class="btn btn-default">寄送发票</a>
                 @endif
                

resources/views/orderlist/content.blade.php

@@ -259,7 +259,7 @@
                                     if (in_array($v['status'], [-1, 1, 2])) {
                                         echo '不需同步';
                                     } else {
-                                        echo $v['erp_order_id'] != '' || $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>';
+                                        echo $v['erp_order_id'] != '' && $v['erp_order_id'] != '-' ? '<span class="list-text-success"><b>已同步</b></span>' : '<span class="list-text-checking"><b>未同步</b></span>';
                                     }
                                 ?>
                             </td>