Merge remote-tracking branch 'origin/base-modify' into base-modify-hf

src/api/order/rentVehicle.js

@@ -116,3 +116,22 @@ export function downloadExcel(params) {
     responseType: 'blob'
   });
 }
+
+//会员订单管理列表
+export function pageList(params) {
+  return fetch({
+    url: '/api/order/orderMember/page',
+    method: 'post',
+    data: params
+  });
+}
+
+//会员订单管理导出
+export function orderMemberExcel(params) {
+  return fetch({
+    url: '/api/order/orderMember/page',
+    method: 'post',
+    data: params,
+    responseType: 'blob'
+  });
+}
\ No newline at end of file

src/views/vehicle/vehicleInfo/index.vue

@@ -416,8 +416,7 @@
 			</el-table-column>
 		</el-table>
 
-		<div v-show="!listLoading" class="pagination-container">
-			<el-pagination
+		<el-pagination
 				@size-change="handleSizeChange"
 				@current-change="handleCurrentChange"
 				:current-page.sync="listQuery.page"
@@ -426,7 +425,6 @@
 				layout="total, sizes, prev, pager, next, jumper"
 				:total="total"
 			></el-pagination>
-		</div>
 
 		<!-- 对话框相关html元素  -->
 		<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close="closePop">