Merge branch 'master-bg' into base-modify

src/api/order/rentVehicle.js

@@ -2,9 +2,9 @@ import fetch from 'utils/fetch';
 
 export function page(query) {
 	return fetch({
-    url: '/api/order/baseOrder/getOrderList',
+		url: '/api/order/baseOrder/getAll',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -22,7 +22,7 @@ export function getAllBranchCompanyByZoneId(query) {
 	return fetch({
 		url: '/vehicle/branchCompany/app/unauth/getByZone',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -30,7 +30,7 @@ export function getOrderVehicleCrosstown(query) {
 	return fetch({
 		url: '/api/order/orderVehicle/getByOrderId',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -76,7 +76,7 @@ export function inquire(query) {
 	return fetch({
 		url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
 		method: 'get',
-    params:query
+		params: query
 	});
 }
 
@@ -85,16 +85,16 @@ export function addIndent(params) {
 	return fetch({
 		url: '/api/order/orderRentVehicle/back-stage/add',
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
 //删除订单
 export function calculate(no, params) {
 	return fetch({
-    url: '/api/order/baseOrder/back-stage/cancel/'+ no,
+		url: '/api/order/baseOrder/back-stage/cancel/' + no,
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
@@ -104,7 +104,7 @@ export function calculate(no, params) {
  */
 export function getViolatePrice(no) {
 	return fetch({
-    url: '/api/order/orderRefund/bg-stage/getViolatePrice/'+ no,
+		url: '/api/order/orderRefund/bg-stage/getViolatePrice/' + no,
 		method: 'get',
 	});
 }
@@ -114,7 +114,7 @@ export function orderStatistics(params) {
 	return fetch({
 		url: 'api/order/orderStatistics/order',
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
@@ -154,3 +154,12 @@ export function user_info(id) {
 		method: 'get'
 	});
 }
+
+//获取订单详情
+export function orderDetail(query) {
+	return fetch({
+		url: '/api/order/baseOrder/orderDetail',
+		method: 'get',
+		params: query
+	});
+}