Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c719153a by 朱继来
Options

Merge branch 'zjl_discount_20190322' into development

parents 6cedab08 3fea8ef7
Inline Side-by-side
Showing with 79 additions and 79 deletions
app/Http/Controllers/OrderController.php
...@@ -484,22 +484,22 @@ Class OrderController extends Controller ...@@ -484,22 +484,22 @@ Class OrderController extends Controller
} }
// 订单其他信息 // 订单其他信息
// public function orderOtherInfoLoading(Request $request) public function orderOtherInfoLoading(Request $request)
// { {
// // 判断页面 // 判断页面
// $tid = $request->input('pid', 1); $tid = $request->input('pid', 1);
// $info = $this->_search($request, $tid); $info = $this->_search($request, $tid);
// $url = Config('website.api_domain').'order/getOrderOtherInfo'; $url = Config('website.api_domain').'order/getOrderOtherInfo';
// $data['k1'] = time(); $data['k1'] = time();
// $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
// $data['map'] = $info['map']; $data['map'] = $info['map'];
// $response = json_decode(curlApi($url, $data), true); $response = json_decode(curlApi($url, $data), true);
// return $response; return $response;
// } }
// erp订单 // erp订单
public function erpOrder(Request $request) public function erpOrder(Request $request)
......
public/js/order.js
...@@ -329,77 +329,77 @@ ...@@ -329,77 +329,77 @@
location.href = listUrl; location.href = listUrl;
}) })
// 非尽调账号时加载信息 // 指定账号加载信息
// if (username != 'vpadmin@ichunt.com') { if (username == 'admin@ichunt.com') {
// // 订单其他信息 // 订单其他信息
// var page_type = $('#page_type').val(); var page_type = $('#page_type').val();
// orderOtherInfo(page_type); orderOtherInfo(page_type);
// // 订单其他信息：已付款， 下单用户数， 付款用户数， 金额 // 订单其他信息：已付款， 下单用户数， 付款用户数， 金额
// function orderOtherInfo(pid) { function orderOtherInfo(pid) {
// var order_contain = $('input[name=order_contain]').val(), var order_contain = $('input[name=order_contain]').val(),
// time_start = $('input[name="time_start"]').val(), time_start = $('input[name="time_start"]').val(),
// time_end = $('input[name="time_end"]').val(); time_end = $('input[name="time_end"]').val();
// if(time_start){
// time_start = Date.parse(time_start) / 1000;
// }
// if(time_end){ if(time_start){
// time_end = Date.parse(time_end) / 1000 + (24*60*60-1); time_start = Date.parse(time_start) / 1000;
// } }
// var datax = { if(time_end){
// order_type : $('#order_type').data('default'), time_end = Date.parse(time_end) / 1000 + (24*60*60-1);
// order_contain : specialStr(order_contain), }
// time_start : time_start,
// time_end : time_end,
// order_pay_type : $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
// order_status : $('#order_status').val() ? $('#order_status').val() : '',
// sale_type : $('#sale_type').val() ? $('#sale_type').val() : '',
// shipping_name : $('#shipping_name').val() ? $('#shipping_name').val() : '',
// order_send : $('#order_send').val(),
// order_source_pf : $('#order_source_pf').val() ? $('#order_source_pf').val() : '',
// order_invoice_status : $('#order_invoice_status').val() ? $('#order_invoice_status').val() : '',
// order_source_adtag : $('input[name="order_source_adtag"]').val(),
// order_source_ptag : $('input[name="order_source_ptag"]').val(),
// erp_order_id : $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
// test_order : $('input[name=test_order]').is(':checked') ? 1 : 0,
// is_new : $('#is_new').val() ? $('#is_new').val() : '',
// order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
// is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '',
// business_type : $('#business_type').val() ? $('#business_type').val() : '',
// pid : pid,
// };
// $.ajax({ var datax = {
// type: "POST", order_type : $('#order_type').data('default'),
// url: '/ajax/orderOtherInfoLoading', order_contain : specialStr(order_contain),
// data: datax, time_start : time_start,
// dataType: "json", time_end : time_end,
// success: function(resp){ order_pay_type : $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
// if (resp.err_code != 0) { order_status : $('#order_status').val() ? $('#order_status').val() : '',
// layer.msg(resp.err_msg); sale_type : $('#sale_type').val() ? $('#sale_type').val() : '',
// return false; shipping_name : $('#shipping_name').val() ? $('#shipping_name').val() : '',
// } order_send : $('#order_send').val(),
// var data = resp.data; order_source_pf : $('#order_source_pf').val() ? $('#order_source_pf').val() : '',
// var html = ''; order_invoice_status : $('#order_invoice_status').val() ? $('#order_invoice_status').val() : '',
order_source_adtag : $('input[name="order_source_adtag"]').val(),
order_source_ptag : $('input[name="order_source_ptag"]').val(),
erp_order_id : $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
test_order : $('input[name=test_order]').is(':checked') ? 1 : 0,
is_new : $('#is_new').val() ? $('#is_new').val() : '',
order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '',
business_type : $('#business_type').val() ? $('#business_type').val() : '',
pid : pid,
};
// if (pid != 3) { $.ajax({
// html += '，<span class="paid_order_count">'+data.paid_order_count+'单已付款（包含预付款），</span><span class="user_count">下单用户数为'+data.user_count+'人，</span><span class="paid_user_count">付款用户数为'+data.paid_user_count+'人，</span>'; type: "POST",
// } url: '/ajax/orderOtherInfoLoading',
data: datax,
dataType: "json",
success: function(resp){
if (resp.err_code != 0) {
layer.msg(resp.err_msg);
return false;
}
var data = resp.data;
var html = '';
// html += '<span class="rmb_count">应付金额 ￥'+data.pay_count.rmb_count+'，</span><span class="usd_count">$'+data.pay_count.usd_count+'，</span><span class="rmb_pay">实收金额 ￥'+data.pay_count.rmb_pay+'，</span><span class="usd_pay">$'+data.pay_count.usd_pay+'，</span>'; if (pid != 3) {
html += '，<span class="paid_order_count">'+data.paid_order_count+'单已付款（包含预付款），</span><span class="user_count">下单用户数为'+data.user_count+'人，</span><span class="paid_user_count">付款用户数为'+data.paid_user_count+'人，</span>';
}
// if (pid != 3 && data.noreason_count) { html += '<span class="rmb_count">应付金额 ￥'+data.pay_count.rmb_count+'，</span><span class="usd_count">$'+data.pay_count.usd_count+'，</span><span class="rmb_pay">实收金额 ￥'+data.pay_count.rmb_pay+'，</span><span class="usd_pay">$'+data.pay_count.usd_pay+'，</span>';
// html += '<span class="error">共有'+data.noreason_count+'单已取消订单未填写取消原因</span>';
// }
// $('.show-other-info').append(html); if (pid != 3 && data.noreason_count) {
// }, html += '<span class="error">共有'+data.noreason_count+'单已取消订单未填写取消原因</span>';
// }) }
// }
// } $('.show-other-info').append(html);
},
})
}
}
// 填写取消原因 // 填写取消原因
this.cancelorder(); this.cancelorder();
......
resources/views/erpOrder/content.blade.php
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
</table> </table>
</div> </div>
<div class="row-fluid pagination"> <div class="row-fluid pagination">
@if ($username != 'vpadmin@ichunt.com') @if ($username == 'admin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单 共{{$count ? $count : 0}}单
......
resources/views/orderlist/content.blade.php
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
</div> </div>
<div class="row-fluid pagination"> <div class="row-fluid pagination">
@if ($username != 'vpadmin@ichunt.com') @if ($username == 'admin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单 共{{$count ? $count : 0}}单
......
resources/views/selfOrder/content.blade.php
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
</table> </table>
</div> </div>
<div class="row-fluid pagination"> <div class="row-fluid pagination">
@if ($username != 'vpadmin@ichunt.com') @if ($username == 'admin@ichunt.com')
<span class="show-list-info"> <span class="show-list-info">
共{{$count ? $count : 0}}单 共{{$count ? $count : 0}}单
......
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