diff --git a/src/pages.json b/src/pages.json index 438dbe6..6647230 100644 --- a/src/pages.json +++ b/src/pages.json @@ -38,6 +38,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path": "pages/ChatMain/NoticeMessage/detail", + "style": { + "navigationStyle": "custom" + } } ], "subPackages": [ diff --git a/src/pages/ChatMain/ChatMainList/index.vue b/src/pages/ChatMain/ChatMainList/index.vue index 69ad7e4..330ebdd 100644 --- a/src/pages/ChatMain/ChatMainList/index.vue +++ b/src/pages/ChatMain/ChatMainList/index.vue @@ -9,7 +9,7 @@ - @@ -204,8 +204,6 @@ import HomeWelcome from "../HomeWelcome/index.vue"; import AiTabSwitch from "@/components/AiTabSwitch/index.vue"; import Discovery from "../../Discovery/index.vue"; -import ChatTopWelcome from "../ChatTopWelcome/index.vue"; -import NoticeMessage from "../NoticeMessage/index.vue"; import ChatTopNavBar from "../ChatTopNavBar/index.vue"; import ChatCardAI from "../ChatCardAi/index.vue"; import ChatCardMine from "../ChatCardMine/index.vue"; diff --git a/src/pages/ChatMain/HomeWelcome/index.vue b/src/pages/ChatMain/HomeWelcome/index.vue index 900bfe3..42c9d88 100644 --- a/src/pages/ChatMain/HomeWelcome/index.vue +++ b/src/pages/ChatMain/HomeWelcome/index.vue @@ -7,58 +7,21 @@ {{ mainPageDataModel.welcomeContent }} - 26°C ☀️ + {{ weatherText }} - - - - - {{ item.title }} - - - - 发布时间:{{ item.time }} - - - 详情 - - - - - - - + - + diff --git a/src/pages/ChatMain/NoticeMessage/detail.vue b/src/pages/ChatMain/NoticeMessage/detail.vue new file mode 100644 index 0000000..2d75cf8 --- /dev/null +++ b/src/pages/ChatMain/NoticeMessage/detail.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/pages/ChatMain/NoticeMessage/index.vue b/src/pages/ChatMain/NoticeMessage/index.vue index 73e6b30..31cce08 100644 --- a/src/pages/ChatMain/NoticeMessage/index.vue +++ b/src/pages/ChatMain/NoticeMessage/index.vue @@ -1,40 +1,100 @@ \ No newline at end of file diff --git a/src/pages/ChatMain/NoticeMessage/notice_bg_img.png b/src/pages/ChatMain/NoticeMessage/notice_bg_img.png deleted file mode 100644 index f630bd8..0000000 Binary files a/src/pages/ChatMain/NoticeMessage/notice_bg_img.png and /dev/null differ diff --git a/src/request/api/MainPageDataApi.js b/src/request/api/MainPageDataApi.js index 5434fae..f4b9375 100644 --- a/src/request/api/MainPageDataApi.js +++ b/src/request/api/MainPageDataApi.js @@ -10,6 +10,16 @@ function homeTabContentData(args) { return request.post("/hotelBiz/mainScene/queryContentListWithCache", args); } +/// 获取本地天气 +function getLocalWeather(args) { + return request.get("/hotelBiz/mainScene/getLocalWeather", args); +} + +/// 获取时间公告列表 +function getTimeNoticeList(args) { + return request.get("/hotelBiz/mainScene/eventList", args); +} + /// 快速问题列表 function homeQuickQuestionData(args) { return request.post("/hotelBiz/mainScene/queryQuickQuestionListWithCache", args); @@ -34,6 +44,8 @@ function discoveryCradComponent() { export { homeTabsData, homeTabContentData, + getLocalWeather, + getTimeNoticeList, homeQuickQuestionData, mainPageData, quickBookingComponent, diff --git a/src/static/scss/height.scss b/src/static/scss/height.scss index 3e75fe3..c4b2cc2 100644 --- a/src/static/scss/height.scss +++ b/src/static/scss/height.scss @@ -6,6 +6,10 @@ height: 100%; } +.h-1 { + height: 1px; +} + .h-8 { height: 8px; }