填写订单取消原因

app/Http/Controllers/OrderController.php

@@ -1087,7 +1087,7 @@ Class OrderController extends Controller
             $log['order_id'] = $order_id;
             $log['operator_id'] = $request->user->userId;
             $log['operator_type'] = 2;
-            $log['event'] = '再次调价';
+            $log['event'] = '填写订单取消原因：'.$cancel_reason;
             $log['ip'] = get_client_ip();
             $log['create_time'] = time();
             DB::connection('order')->table('lie_order_action_log')->insert($log);

resources/views/detail/changeOrder.blade.php

@@ -318,11 +318,13 @@
                     <th>优惠金额：</th>
                     <td>{{$order_price_info['discount_amount']}}</td>
                 </tr>
-
+                
+                @if ($order_temp_info['order_pay_type'] == 2)
                 <tr>
                     <th>定金：</th>
                     <td>{{$order_temp_info['deposit_amount']}}</td>
                 </tr>
+                @endif
 
                 <tr>
                     <th>订单总额：</th>

resources/views/detail/content.blade.php

@@ -482,7 +482,7 @@
                     @if (!empty($order_temp_info) && $order_temp_info['status'] == 2)
                     <tr>
                         <td width="10%">是否为新用户：</td>
-                        <td>{{ $order_temp_info['is_newclient'] == 1 ? '是' : '否' }}</td>
+                        <td width="40%">{{ $order_temp_info['is_newclient'] == 1 ? '是' : '否' }}</td>
                         @if ($order_temp_info['is_newclient'] == 1)
                         <td width="10%">用户来源：</td>
                         <td>{{ $order_temp_info['client_source'] }}</td>
@@ -493,7 +493,7 @@
                     @if ($order_info['status'] == -1)
                     <tr>
                         <td width="10%">订单取消原因：</td>
-                        <td>{{ $order_info['cancel_reason'] }}</td>
+                        <td colspan="3">{{ $order_info['cancel_reason'] }}</td>
                     </tr>
                     @endif
                 </table>