调整再次调价，添加优惠金额展示，优化审核

app/Http/Controllers/OrderController.php

@@ -863,8 +863,9 @@ Class OrderController extends Controller
         }
         }
 
 
         $data['confirm_time'] = 0;
         $data['confirm_time'] = 0;
+        $data['pay_time'] = 0;
         $data['status'] = 1;
         $data['status'] = 1;
-        $data['sale_id'] = 0; // 再次调价调整sale_id
+        // $data['sale_id'] = 0; // 再次调价调整sale_id
 
 
         $update = DB::connection('order')
         $update = DB::connection('order')
                 ->table('lie_order')
                 ->table('lie_order')

public/js/order.js

@@ -1288,21 +1288,23 @@
                     var order_amount = currencySign+$('input[name=order_amount]').val();
                     var order_amount = currencySign+$('input[name=order_amount]').val();
                     var extra_fee    = $('input[name=extra_fee]').val() == '' ? '' : currencySign+$('input[name=extra_fee]').val();
                     var extra_fee    = $('input[name=extra_fee]').val() == '' ? '' : currencySign+$('input[name=extra_fee]').val();
 
 
-                    // 设置默认值false
-                    $('input[name=check_failed]').val(0);
-
-                    // 检查商品单价
-                    $('.order-change-table').find('tbody tr').each(function(){
-                        var origin_price = parseFloat($(this).find('.price').data('origin'));
-                        var price = parseFloat($(this).find('.price').val()) || 0;
-                        
-                        origin_price = (origin_price * 0.8).toFixed(4);
-
-                        // 若商品单价降价幅度小于或等于20%则赋值
-                        if (price <= origin_price) {
-                            $('input[name=check_failed]').val(1);
-                        }
-                    });
+                    if (!is_manager) {
+                        // 设置默认值false
+                        $('input[name=check_failed]').val(0);
+
+                        // 检查商品单价
+                        $('.order-change-table').find('tbody tr').each(function(){
+                            var origin_price = parseFloat($(this).find('.price').data('origin'));
+                            var price = parseFloat($(this).find('.price').val()) || 0;
+                            
+                            origin_price = (origin_price * 0.8).toFixed(4);
+
+                            // 若商品单价降价幅度小于或等于20%则赋值
+                            if (price <= origin_price) {
+                                $('input[name=check_failed]').val(1);
+                            }
+                        });
+                    }
 
 
                     // 弹出提示
                     // 弹出提示
                     layer.open({
                     layer.open({

resources/views/detail/changeOrder.blade.php

@@ -266,8 +266,13 @@
                 </tr>
                 </tr>
 
 
                 <tr>
                 <tr>
+                    <th>优惠金额：</th>
+                    <td>{{$order_price_info['discount_amount']}}</td>
+                </tr>
+
+                <tr>
                     <th>订单总额：</th>
                     <th>订单总额：</th>
-                    <td>{{$order_info['order_temp_info']['goods_amount'] + $order_info['order_temp_info']['extra_fee']}}</td>
+                    <td>{{$order_info['order_temp_info']['goods_amount'] + $order_info['order_temp_info']['extra_fee'] + $order_price_info['discount_amount']}}</td>
                 </tr>
                 </tr>
 
 
                 <tr>
                 <tr>