Merge branch 'zjl_action_log_20180521' into development

resources/views/detail/content.blade.php

@@ -572,7 +572,7 @@
                     <tbody>
                     <tbody>
                         @foreach ($order_shipping_inside as $v) 
                         @foreach ($order_shipping_inside as $v) 
                             <tr>
                             <tr>
-                                <td>{{date('Y-m-d H:i:s', $v['create_time'])}}</td>
+                                <td width="15%">{{date('Y-m-d H:i:s', $v['create_time'])}}</td>
                                 <td>{{$v['info']}}</td>
                                 <td>{{$v['info']}}</td>
                             </tr>
                             </tr>
                         @endforeach
                         @endforeach
@@ -595,8 +595,8 @@
                     <tbody>      
                     <tbody>      
                         @foreach ($actionLog as $v)
                         @foreach ($actionLog as $v)
                             <tr>
                             <tr>
-                                <td>{{date('Y-m-d H:i:s', $v->create_time)}}</td>
-                                <td>{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
+                                <td width="15%">{{date('Y-m-d H:i:s', $v->create_time)}}</td>
+                                <td width="8%">{{App\Http\Controllers\getOperatorName($v->operator_id, $v->operator_type)}}</td>
                                 <td>{{$v->event}}</td>
                                 <td>{{$v->event}}</td>
                             </tr>
                             </tr>
                         @endforeach                   
                         @endforeach