Merge branch 'master-bg' into base-modify

src/api/order/rentVehicle.js

 import fetch from 'utils/fetch';
 
 export function page(query) {
-  return fetch({
-    url: '/api/order/baseOrder/getOrderList',
-    method: 'get',
-		params:query
-  });
+	return fetch({
+		url: '/api/order/baseOrder/getAll',
+		method: 'get',
+		params: query
+	});
 }
 
 /**
  * 获取所有分公司
  */
 export function getAllBranchCompany() {
-  return fetch({
-    url: '/vehicle/branchCompany',
-    method: 'get'
-  });
+	return fetch({
+		url: '/vehicle/branchCompany',
+		method: 'get'
+	});
 }
 //根据大区Id获取分公司列表
 export function getAllBranchCompanyByZoneId(query) {
-  return fetch({
-    url: '/vehicle/branchCompany/app/unauth/getByZone',
-    method: 'get',
-		params:query
-  });
+	return fetch({
+		url: '/vehicle/branchCompany/app/unauth/getByZone',
+		method: 'get',
+		params: query
+	});
 }
 
 export function getOrderVehicleCrosstown(query) {
-  return fetch({
-    url: '/api/order/orderVehicle/getByOrderId',
-    method: 'get',
-		params:query
-  });
+	return fetch({
+		url: '/api/order/orderVehicle/getByOrderId',
+		method: 'get',
+		params: query
+	});
 }
 
 /**
@@ -39,10 +39,10 @@ export function getOrderVehicleCrosstown(query) {
  * @param query
  */
 export function getOneIllegalRow(id) {
-  return fetch({
-    url: '/api/order/orderViolation/getOne/' + id,
-    method: 'get'
-  });
+	return fetch({
+		url: '/api/order/orderViolation/getOne/' + id,
+		method: 'get'
+	});
 }
 
 /**
@@ -54,11 +54,11 @@ detailId:租车订单id
 }
  */
 export function saveOrderViolation(params) {
-  return fetch({
-    url: '/api/order/orderViolation/saveOrderViolation',
-    method: 'post',
-    data: params
-  });
+	return fetch({
+		url: '/api/order/orderViolation/saveOrderViolation',
+		method: 'post',
+		data: params
+	});
 }
 
 /**
@@ -66,36 +66,36 @@ export function saveOrderViolation(params) {
  * @param query
  */
 export function getStep(orderNo) {
-  return fetch({
-    url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
-    method: 'get'
-  });
+	return fetch({
+		url: '/api/order/orderVehicle/getByOrderId?orderNo=' + orderNo,
+		method: 'get'
+	});
 }
 
 export function inquire(query) {
-  return fetch({
-    url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
-    method: 'get',
-    params:query
-  });
+	return fetch({
+		url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
+		method: 'get',
+		params: query
+	});
 }
 
 //创建订单
 export function addIndent(params) {
-  return fetch({
-    url: '/api/order/orderRentVehicle/back-stage/add',
-    method: 'post',
-    data:params
-  });
+	return fetch({
+		url: '/api/order/orderRentVehicle/back-stage/add',
+		method: 'post',
+		data: params
+	});
 }
 
 //删除订单
 export function calculate(no, params) {
-  return fetch({
-    url: '/api/order/baseOrder/back-stage/cancel/'+ no,
-    method: 'post',
-    data:params
-  });
+	return fetch({
+		url: '/api/order/baseOrder/back-stage/cancel/' + no,
+		method: 'post',
+		data: params
+	});
 }
 
 /**
@@ -103,54 +103,63 @@ export function calculate(no, params) {
  * @param {Object} params计算违约价格
  */
 export function getViolatePrice(no) {
-  return fetch({
-    url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
-    method: 'get',
-  });
+	return fetch({
+		url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
+		method: 'get',
+	});
 }
 
 //创建订单
 export function orderStatistics(params) {
-  return fetch({
-    url: 'api/order/orderStatistics/order',
-    method: 'post',
-    data:params
-  });
+	return fetch({
+		url: 'api/order/orderStatistics/order',
+		method: 'post',
+		data: params
+	});
 }
 
 //订单下载
 export function downloadExcel(params) {
-  return fetch({
-    url: '/api/order/orderStatistics/excel',
-    method: 'post',
-    data: params,
-    responseType: 'blob'
-  });
+	return fetch({
+		url: '/api/order/orderStatistics/excel',
+		method: 'post',
+		data: params,
+		responseType: 'blob'
+	});
 }
 
 //会员订单管理列表
 export function pageList(params) {
-  return fetch({
-    url: '/api/order/orderMember/page',
-    method: 'post',
-    data: params
-  });
+	return fetch({
+		url: '/api/order/orderMember/page',
+		method: 'post',
+		data: params
+	});
 }
 
 //会员订单管理导出
 export function orderMemberExcel(params) {
-  return fetch({
-    url: '/api/order/orderMember/export',
-    method: 'post',
-    data: params,
-    responseType: 'blob'
-  });
+	return fetch({
+		url: '/api/order/orderMember/export',
+		method: 'post',
+		data: params,
+		responseType: 'blob'
+	});
 }
 
 //用户信息
 export function user_info(id) {
-  return fetch({
-    url: '/api/admin/appUsersManage/user_info/' + id,
-    method: 'get'
-  });
-}
+	return fetch({
+		url: '/api/admin/appUsersManage/user_info/' + id,
+		method: 'get'
+	});
+}
\ No newline at end of file
+
+//获取订单详情
+export function orderDetail(query) {
+	return fetch({
+		url: '/api/order/baseOrder/orderDetail',
+		method: 'get',
+		params: query
+	});
+}