Merge branch 'master-bg'

src/api/order/rentVehicle.js

 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
 	});
 }
 
+//获取旅游订单
+export function getOrderList(query) {
+	return fetch({
+		url: '/api/order/baseOrder/getOrderList',
+		method: 'get',
+		params: query
+	});
+}
 /**
  * 获取所有分公司
  */
@@ -22,7 +30,7 @@ export function getAllBranchCompanyByZoneId(query) {
 	return fetch({
 		url: '/vehicle/branchCompany/app/unauth/getByZone',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -30,7 +38,7 @@ export function getOrderVehicleCrosstown(query) {
 	return fetch({
 		url: '/api/order/orderVehicle/getByOrderId',
 		method: 'get',
-		params:query
+		params: query
 	});
 }
 
@@ -76,7 +84,7 @@ export function inquire(query) {
 	return fetch({
 		url: '/vehicle/vehicleInfo/rent/back-stage/usable-vehicle',
 		method: 'get',
-    params:query
+		params: query
 	});
 }
 
@@ -85,16 +93,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 +112,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 +122,7 @@ export function orderStatistics(params) {
 	return fetch({
 		url: 'api/order/orderStatistics/order',
 		method: 'post',
-    data:params
+		data: params
 	});
 }
 
@@ -154,3 +162,12 @@ export function user_info(id) {
 		method: 'get'
 	});
 }
+
+//获取订单详情
+export function orderDetail(query) {
+	return fetch({
+		url: '/api/order/baseOrder/orderDetail',
+		method: 'get',
+		params: query
+	});
+}

src/views/order/tourOrderInfo/index.vue

@@ -156,6 +156,7 @@
   import tourOrderDetailModal from "../modal/tourOrderDetailModal";//租车订单详情
   import {
     page,
+		getOrderList,
     getAllBranchCompany,
     getAllBranchCompanyByZoneId,
 		calculate,
@@ -614,7 +615,7 @@ import {getAllCompany } from 'api/base_info/branch_company'
         if(this.listQuery){
           localStorage.setItem("tourOrderInfo", JSON.stringify(this.listQuery));
         }
-        page(this.listQuery)
+        getOrderList(this.listQuery)
           .then(response => {
             this.list = response.data.data;
             this.total = response.data.totalCount;