diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js
index d6a69de..6270a9b 100644
--- a/src/stores/Reservation.js
+++ b/src/stores/Reservation.js
@@ -12,12 +12,14 @@ class Reservation {
fetchReservationList(current, referenceNo, fromDate, thruDate) {
this.reservationPage.current = current;
+ // 设置为 0,后端会重新计算总数,当跳转第 X 页时可用原来的总数。
+ const totalNum = current == 1 ? 0 : this.reservationPage.total;
const fetchUrl = prepareUrl(HT_HOST + '/service-cusservice/GetPlanSearchList')
.append('VEI_SN', this.root.authStore.login.travelAgencyId)
.append('GroupNo', referenceNo)
.append('DateStart', fromDate)
.append('DateEnd', thruDate)
- .append('TotalNum', 0)
+ .append('TotalNum', totalNum)
.append('PageSize', this.reservationPage.size)
.append('PageIndex', this.reservationPage.current)
.build();
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index c827ea5..f8d6950 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -2,7 +2,7 @@ import { NavLink } from "react-router-dom";
import { useState } from 'react';
import { observer } from "mobx-react";
import { toJS } from "mobx";
-import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App } from 'antd';
+import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio, Modal, App, Select } from 'antd';
import { useStore } from '@/stores/StoreContext.js';
const { Title } = Typography;
@@ -13,7 +13,7 @@ function Newest() {
title: 'Reference number',
dataIndex: 'referenceNumber',
key: 'Reference number',
- render: (text, record) => {text},
+ render: (text, record) => {text},
},
{
title: 'Arrival date',
@@ -59,6 +59,42 @@ function Newest() {
);
}
}
+
+ function cityGuideRender(text, city) {
+ return (
+