diff --git a/src/App.jsx b/src/App.jsx
index 1039556..5ccfc8f 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -55,6 +55,8 @@ import CooperationIcon from './components/icons/CooperationIcon';
import OPDashboard from './views/OPDashboard';
import OPProcess from './views/OPProcess';
import OPRisk from './views/OPRisk';
+import Cruise from './views/Cruise';
+import Hotel from './views/Hotel';
const App = () => {
const { Content, Footer, Sider, } = Layout;
@@ -158,6 +160,8 @@ const App = () => {
key: 62,
label: 目的地接团,
},
+ { key: 'cruise', label: 三峡游船 },
+ { key: 'hotel', label: 酒店 },
],
},
{
@@ -259,7 +263,9 @@ const App = () => {
} />
} />
} />
-
+ } />
+ } />
+
}>
} />
} />
diff --git a/src/components/search/HotelStarSelect.jsx b/src/components/search/HotelStarSelect.jsx
new file mode 100644
index 0000000..8796dd0
--- /dev/null
+++ b/src/components/search/HotelStarSelect.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { Select } from 'antd';
+import { observer } from 'mobx-react';
+import { HotelStars as options } from '../../libs/ht';
+
+const HotelStars = (props) => {
+ const { mode, value, onChange, show_all, ...extProps } = props;
+ const _show_all = ['tags', 'multiple'].includes(mode) ? false : show_all;
+ return (
+
+
+
+ );
+};
+/**
+ * 酒店星级
+ */
+export default observer(HotelStars);
diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index f2be2fe..1954ca1 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -3,7 +3,7 @@ import { toJS } from 'mobx';
import { observer } from 'mobx-react';
import { DATE_FORMAT, SMALL_DATETIME_FORMAT, stores_Context } from './../../config';
import { SearchOutlined } from '@ant-design/icons';
-import { Form, Row, Col, Select, Button, Space, DatePicker } from 'antd';
+import { Form, Row, Col, Select, Button, Space, DatePicker, Input, InputNumber } from 'antd';
import moment from 'moment';
// import locale from 'antd/es/date-picker/locale/zh_CN';
import BusinessSelect from './BusinessSelect';
@@ -18,6 +18,7 @@ import { objectMapper, at, empty, isEmpty } from './../../utils/commons';
import { departureDateTypes } from './../../libs/ht';
import './search.css';
+import HotelStarSelect from './HotelStarSelect';
const EditableContext = createContext();
const Option = Select.Option;
@@ -180,6 +181,26 @@ export default observer((props) => {
transform: (value) => value?.value || value?.key || '',
default: '',
},
+ 'cruiseDirection': {
+ key: 'cruiseDirection',
+ transform: (value) => value?.key || '',
+ default: '',
+ },
+ 'hotelBookType': {
+ key: 'hotelBookType',
+ transform: (value) => value?.key || '',
+ default: '',
+ },
+ 'hotelRecommandRate': {
+ key: 'hotelRecommandRate',
+ transform: (value) => value?.key || '',
+ default: '',
+ },
+ 'hotelStar': {
+ key: 'hotelStar',
+ transform: (value) => value?.key || '',
+ default: '',
+ },
};
let dest = {};
const { departureDateType, applyDate, applyDate2, year, yearDiff, dates, months, date, ...omittedValue } = values;
@@ -274,6 +295,14 @@ function getFields(props) {
};
let baseChildren = [];
baseChildren = [
+ item(
+ 'keyword', // 关键词搜索 {...fieldComProps.keyword}
+ 99,
+
+
+ ,
+ fieldProps?.keyword?.col || 6
+ ),
item(
'agency',
99,
@@ -348,11 +377,11 @@ function getFields(props) {
item(
'countryArea',
99,
-
-