Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 297271f3 by 朱继来
Options

Merge branch 'zjl_new_client_20180701' into development

parents 7af7f8de 4936e25e
Inline Side-by-side
Showing with 80 additions and 45 deletions
app/Http/Controllers/OrderController.php
......@@ -891,6 +891,7 @@ Class OrderController extends Controller
"pay_time_limit" => $pay_time_limit,
"check_failed" => $request->input('check_failed', ''),
"check_failed_info" => $request->input('check_failed_info', ''),
"change_pay_type" => $request->input('change_pay_type', ''),
"order_id" => $order_id,
'operator_id' => $request->user->userId,
"pf" => 1,
......
public/js/order.js
......@@ -835,31 +835,41 @@
}
// 根据币种和订单金额判断付款类型
function checkPayType(orderAmount, orderPayType, min_price, max_price)
{
if (orderAmount < min_price) {
$('.order_all_pay').attr('checked', true);
$('.order_advance_pay').parent('label').hide();
} else if (orderAmount >= min_price && orderAmount < max_price) {
// 判断付款类型
if (orderPayType == 1) {
$('.order_all_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
} else if (orderPayType == 2) {
$('.order_advance_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
$('.show-advance-pay').show(); // 定金模块
}
} else {
$('.order_all_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
}
}
if (currency == 1) { // 人民币
checkPayType(order_amount, order_pay_type, 10000, 50000);
} else {
checkPayType(order_amount, order_pay_type, 1500, 7800);
// function checkPayType(orderAmount, orderPayType, min_price, max_price)
// {
// if (orderAmount < min_price) {
// $('.order_all_pay').attr('checked', true);
// $('.order_advance_pay').parent('label').hide();
// } else if (orderAmount >= min_price && orderAmount < max_price) {
// // 判断付款类型
// if (orderPayType == 1) {
// $('.order_all_pay').attr('checked', true);
// $('.order_advance_pay').parent('label').show();
// } else if (orderPayType == 2) {
// $('.order_advance_pay').attr('checked', true);
// $('.order_advance_pay').parent('label').show();
// $('.show-advance-pay').show(); // 定金模块
// }
// } else {
// $('.order_all_pay').attr('checked', true);
// $('.order_advance_pay').parent('label').show();
// }
// }
// if (currency == 1) { // 人民币
// checkPayType(order_amount, order_pay_type, 10000, 50000);
// } else {
// checkPayType(order_amount, order_pay_type, 1500, 7800);
// }
// 判断付款类型
if (order_pay_type == 1) {
$('.order_all_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
} else if (order_pay_type == 2) {
$('.order_advance_pay').attr('checked', true);
$('.order_advance_pay').parent('label').show();
$('.show-advance-pay').show(); // 定金模块
}
// 选择付款类型
......@@ -944,13 +954,13 @@
$('.advance').val((total*0.3).toFixed(2));
// 价格调整后，付款类型显示或隐藏
var orderPayType = $('input[name=order_pay_type]').val();
// var orderPayType = $('input[name=order_pay_type]').val();
if (currency == 1) { // 人民币
checkPayType(total, orderPayType, 10000, 49999);
} else {
checkPayType(total, orderPayType, 1500, 7800);
}
// if (currency == 1) { // 人民币
// checkPayType(total, orderPayType, 10000, 49999);
// } else {
// checkPayType(total, orderPayType, 1500, 7800);
// }
})
// 定金调整
......@@ -965,14 +975,14 @@
}
// 价格调整后，付款类型显示或隐藏
var orderPayType = $('input[name=order_pay_type]').val();
var total = $('input[name=order_amount]').val();
// var orderPayType = $('input[name=order_pay_type]').val();
// var total = $('input[name=order_amount]').val();
if (currency == 1) { // 人民币
checkPayType(total, orderPayType, 10000, 49999);
} else {
checkPayType(total, orderPayType, 1500, 7800);
}
// if (currency == 1) { // 人民币
// checkPayType(total, orderPayType, 10000, 49999);
// } else {
// checkPayType(total, orderPayType, 1500, 7800);
// }
})
// 订单审核---通过or不通过
......@@ -1013,13 +1023,13 @@
$('.advance').val((total*0.3).toFixed(2));
// 价格调整后，付款类型显示或隐藏
var orderPayType = $('input[name=order_pay_type]').val();
// var orderPayType = $('input[name=order_pay_type]').val();
if (currency == 1) { // 人民币
checkPayType(total, orderPayType, 10000, 49999);
} else {
checkPayType(total, orderPayType, 1500, 7800);
}
// if (currency == 1) { // 人民币
// checkPayType(total, orderPayType, 10000, 49999);
// } else {
// checkPayType(total, orderPayType, 1500, 7800);
// }
})
// 选择付款时间
......@@ -1036,6 +1046,7 @@
// 提交表单
$('.checkOrder').click(function(){
var order_status = $('input[name=order_status]:checked').val();
var pay_type = $('input[name=order_pay_type]:checked').val(); // 订单类型
var reason = $('input[name=reason]:checked').val();
var payTime = $('.payTime').val();
var payTimeOther = $('.payTimeOther').val();
......@@ -1125,6 +1136,7 @@
if (!is_manager) {
// 设置默认值false
$('input[name=check_failed]').val(0);
$('input[name=change_pay_type]').val(0);
var check_failed_info = '';
// 检查商品单价
......@@ -1142,6 +1154,11 @@
$('input[name=check_failed_info]').val(check_failed_info);
}
});
// 预付款时设置
if (pay_type == 2) {
$('input[name=change_pay_type]').val(1);
}
}
// 弹出提示
......@@ -1185,7 +1202,7 @@
var layer_btn;
if (is_manager) {
layer_btn = ['驳回', '确认调价'];
layer_btn = ['驳回', '通过'];
} else {
layer_btn = [];
}
......
resources/views/detail/changeOrder.blade.php
......@@ -12,6 +12,7 @@
<input type="hidden" name="user_mobile" value="{{$user_mobile}}">
<input type="hidden" name="check_failed" value="">
<input type="hidden" name="check_failed_info" value="">
<input type="hidden" name="change_pay_type" value="">
<!-- 审核 -->
<p>审核</p>
......@@ -259,6 +260,17 @@
<hr>
<table class="table table-bordered table-hover">
<tr>
<th>订单类型：</th>
<td>
@if ($order_temp_info['order_pay_type'] == 1)
全款
@else
预付款
@endif
</td>
</tr>
<tr>
<th>商品总额：</th>
<td>{{$order_temp_info['goods_amount']}}</td>
</tr>
......@@ -274,6 +286,11 @@
</tr>
<tr>
<th>定金：</th>
<td>{{$order_temp_info['deposit_amount']}}</td>
</tr>
<tr>
<th>订单总额：</th>
<td>{{$order_temp_info['goods_amount'] + $order_temp_info['extra_fee'] + $order_price_info['discount_amount']}}</td>
</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