Commit 84b5420f by 朱继来

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

parent c9ee2511
...@@ -863,8 +863,9 @@ Class OrderController extends Controller ...@@ -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')
......
...@@ -1288,6 +1288,7 @@ ...@@ -1288,6 +1288,7 @@
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();
if (!is_manager) {
// 设置默认值false // 设置默认值false
$('input[name=check_failed]').val(0); $('input[name=check_failed]').val(0);
...@@ -1303,6 +1304,7 @@ ...@@ -1303,6 +1304,7 @@
$('input[name=check_failed]').val(1); $('input[name=check_failed]').val(1);
} }
}); });
}
// 弹出提示 // 弹出提示
layer.open({ layer.open({
......
...@@ -266,8 +266,13 @@ ...@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment