diff --git a/README.md b/README.md index 2dac6b0..85b2f36 100644 --- a/README.md +++ b/README.md @@ -18,4 +18,9 @@ antd https://ant-design.antgroup.com/components/upload-cn#uploadfile ## 阿里云OSS Bucket 名称：global-highlights-hub Endpoint：oss-cn-hongkong.aliyuncs.com -global-highlights-hub.oss-cn-hongkong.aliyuncs.com \ No newline at end of file +global-highlights-hub.oss-cn-hongkong.aliyuncs.com + + + +反馈表测试链接 +http://202.103.68.111:5173/feedback/330948 \ No newline at end of file diff --git a/src/main.jsx b/src/main.jsx index ae01c95..daccdf7 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -19,6 +19,7 @@ import ReservationPrint from "@/views/reservation/Print"; import ReservationNameCard from "@/views/reservation/NameCard"; import FeedbackIndex from "@/views/feedback/Index"; import FeedbackDetail from "@/views/feedback/Detail"; +import NoticeIndex from "@/views/notice/Index"; configure({ @@ -43,6 +44,7 @@ const router = createBrowserRouter([ { path: "reservation/:reservationId/name-card", element: }, { path: "feedback", element: }, { path: "feedback/:GRI_SN", element: }, + { path: "notice", element: }, ] }, { diff --git a/src/stores/Auth.js b/src/stores/Auth.js index 2eb3051..b3e1e0a 100644 --- a/src/stores/Auth.js +++ b/src/stores/Auth.js @@ -10,7 +10,7 @@ class Auth { login = { userId: 1, username: 'Vu Xuan Giang(ANP)', - travelAgencyId: 32531 + travelAgencyId: 32531 //30008供应商id对应HT的VEI_SN } } diff --git a/src/views/App.jsx b/src/views/App.jsx index d0091ae..2236ced 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -77,6 +77,7 @@ function App() { { key: "/reservation/newest", label: Reservation }, { key: "/feedback", label: Feedback }, { key: "/invoice/list", label: Invoice }, + { key: "/notice", label: Notice }, ]} /> diff --git a/src/views/feedback/Detail.jsx b/src/views/feedback/Detail.jsx index b708683..250bbc6 100644 --- a/src/views/feedback/Detail.jsx +++ b/src/views/feedback/Detail.jsx @@ -12,14 +12,14 @@ import * as config from "@/config"; function Detail() { const navigate = useNavigate(); const { GRI_SN } = useParams(); - const { feedbackStore } = useStore(); + const { feedbackStore, authStore } = useStore(); const { feedbackRate, feedbackReview } = feedbackStore; const [value, setValue] = useState(3); const desc = ["none", "Unacceptable", "Poor", "Fair", "Very Good", "Excellent"]; useEffect(() => { console.info("Detail.useEffect: " + GRI_SN); - feedbackStore.getFeedbackDetail(30008, GRI_SN); + feedbackStore.getFeedbackDetail(authStore.login.travelAgencyId, GRI_SN); }, [GRI_SN]); const HWO_Guide = feedbackRate && feedbackRate.HWO_Guide ? feedbackRate.HWO_Guide : 0; @@ -29,6 +29,7 @@ function Detail() { const HWO_Activity = feedbackRate && feedbackRate.HWO_Activity ? feedbackRate.HWO_Activity : 0; const OtherThoughts = feedbackRate && feedbackRate.OtherThoughts ? feedbackRate.OtherThoughts : ""; const PhotoPermission = feedbackRate && feedbackRate.PhotoPermission && feedbackRate.PhotoPermission == "YES" ? true : false; + const ECI_Content = feedbackReview && feedbackReview.ECI_Content ? feedbackReview.ECI_Content : "None"; const [fileList, setFileList] = useState([ { @@ -58,22 +59,22 @@ function Detail() { ]); const handleChange = info => { - console.log(info); + console.log(info); // ({ fileList: newFileList }) => setFileList(newFileList) let newFileList = [...info.fileList]; newFileList = newFileList.map(file => { if (file.response) { - file.url = file.response.url; + file.url = file.response; } return file; }); setFileList(newFileList); }; - const handRemove=info=>{ - console.log(info); - return true - } + const handRemove = info => { + console.log(info); + return true; + }; return ( @@ -145,6 +146,21 @@ function Detail() { + + + + 站外好评 + + + + + + + {ECI_Content} + + + + 地接社的反馈 @@ -156,25 +172,33 @@ function Detail() {
- 地接社反馈 - - - - 上传照片 - - - - - - +
Click to Upload
 + + 地接社反馈信息 + + + + + +
diff --git a/src/views/feedback/Index.jsx b/src/views/feedback/Index.jsx index 29d4fee..030e4eb 100644 --- a/src/views/feedback/Index.jsx +++ b/src/views/feedback/Index.jsx @@ -37,7 +37,7 @@ const feedbackListColumns = [ ]; function Index() { - const { feedbackStore } = useStore(); + const { feedbackStore, authStore } = useStore(); const { feedbackList } = feedbackStore; const [selectedDateRange, onDateRangeChange] = useState([config.DATE_PRESETS[0].value]); const [referenceNo, onNumberChange] = useState(""); @@ -71,7 +71,7 @@ function Index() { /> - diff --git a/src/views/notice/Index.jsx b/src/views/notice/Index.jsx new file mode 100644 index 0000000..16876e4 --- /dev/null +++ b/src/views/notice/Index.jsx @@ -0,0 +1,59 @@ +import { NavLink } from "react-router-dom"; +import { useEffect, useState } from "react"; +import { observer } from "mobx-react"; +import { toJS } from "mobx"; +import { Row, Col, Space, Button, Table, Input, Typography, DatePicker, Radio } from "antd"; +import { useStore } from "@/stores/StoreContext.js"; +import * as config from "@/config"; +import * as comm from "@/utils/commons"; +import dayjs from "dayjs"; + +const { Title, Paragraph, Text } = Typography; + +function Index() { + const { feedbackStore } = useStore(); + + useEffect(() => { + console.info("feedback.useEffect"); + }, []); + + const [ellipsis, setEllipsis] = useState(true); + + return ( + + + + + Guidelines and Resources + + We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and + efficiently. efficiently. We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product + prototypes beautifully and We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product + prototypes beautifully and efficiently. efficiently. We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help + people create their product prototypes beautifully and We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help + people create their product prototypes beautifully and efficiently. efficiently. efficiently. efficiently. + + + 第二个公告 + + We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and We + supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and + efficiently. efficiently. We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product + prototypes beautifully and We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product + prototypes beautifully and efficiently. efficiently. We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help + people create their product prototypes beautifully and We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help + people create their product prototypes beautifully and efficiently. efficiently. efficiently. efficiently. + + + + + + ); +} + +export default observer(Index);