123

src/api/order/rentVehicle.js

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

src/views/order/tourOrderInfo/index.vue

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