diff --git a/components/CreateServiceOrder/styles/index.scss b/components/CreateServiceOrder/styles/index.scss
index cf797e7..125baf5 100644
--- a/components/CreateServiceOrder/styles/index.scss
+++ b/components/CreateServiceOrder/styles/index.scss
@@ -1,15 +1,15 @@
.create-service-order {
- margin-left: 12px;
- margin-right: 12px;
+ // margin-left: 12px;
+ // margin-right: 12px;
}
.create-service-wrapper {
- box-sizing: border-box;
- padding: 12px 12px 16px;
- background-color: #eff6fa;
- box-shadow: 2px 2px 10px 0px rgba(0, 0, 0, 0.1);
- border-radius: 4px 20px 20px 20px;
- border: 1px solid #fff;
+ // box-sizing: border-box;
+ padding: 12px 0 16px;
+ // background-color: #eff6fa;
+ // box-shadow: 2px 2px 10px 0px rgba(0, 0, 0, 0.1);
+ // border-radius: 4px 20px 20px 20px;
+ // border: 1px solid #fff;
}
.order-header {
diff --git a/model/ChatModel.js b/model/ChatModel.js
index 5e82a5d..5c9725d 100644
--- a/model/ChatModel.js
+++ b/model/ChatModel.js
@@ -12,5 +12,7 @@ export const MessageType = {
export const CompName = {
- quickBookingCard: 'quickBookingCard'
+ quickBookingCard: 'quickBookingCard',
+ createWorkOrderCard: 'createWorkOrderCard',
+ discoveryCard: 'discoveryCard',
}
\ No newline at end of file
diff --git a/pages/booking/QuickBookingComponent.vue b/pages/booking/QuickBookingComponent.vue
index 6448775..c4da3e6 100644
--- a/pages/booking/QuickBookingComponent.vue
+++ b/pages/booking/QuickBookingComponent.vue
@@ -14,7 +14,7 @@
import QuickBookingContentList from './QuickBookingContentList.vue'
import { ref, nextTick } from 'vue'
import { onMounted } from 'vue'
- import { quickBookingComponent } from '../../request/api/QuickBookingComponent'
+ import { quickBookingComponent } from '../../request/api/MainPageDataApi'
import { SCROLL_TO_BOTTOM } from '../../constant/constant'
const commodityGroupDTOList = ref([])
diff --git a/pages/chat/ChatCardAI.vue b/pages/chat/ChatCardAI.vue
index 0424ad0..81cd12e 100644
--- a/pages/chat/ChatCardAI.vue
+++ b/pages/chat/ChatCardAI.vue
@@ -1,7 +1,10 @@
-
-
-
+
+
+
+
+
+
@@ -15,34 +18,26 @@
default: ''
}
})
+
\ No newline at end of file
diff --git a/pages/chat/ChatMainList.vue b/pages/chat/ChatMainList.vue
index 37a6e74..6224f5f 100644
--- a/pages/chat/ChatMainList.vue
+++ b/pages/chat/ChatMainList.vue
@@ -27,8 +27,13 @@
-
+
+
+
+
+
+ 这个是底部
@@ -37,6 +42,7 @@
+
@@ -73,6 +79,9 @@
import { ref } from 'vue'
import { defineEmits } from 'vue'
import { onLoad } from '@dcloudio/uni-app';
+ import { SCROLL_TO_BOTTOM } from '../../constant/constant'
+ import { MessageRole, MessageType, CompName } from '../../model/ChatModel';
+
import ChatTopWelcome from './ChatTopWelcome.vue';
import ChatTopBgImg from './ChatTopBgImg.vue';
import ChatTopNavBar from './ChatTopNavBar.vue';
@@ -84,16 +93,19 @@
import ChatInputArea from './ChatInputArea.vue'
import CommandWrapper from '@/components/CommandWrapper/index.vue'
import QuickBookingComponent from '../booking/QuickBookingComponent.vue'
+ import DiscoveryCardComponent from '../discovery/DiscoveryCardComponent.vue';
+ import CreateServiceOrder from '@/components/CreateServiceOrder/index.vue'
- import { MessageRole, MessageType, CompName } from '../../model/ChatModel';
+
import OneFeelMK001 from '../module/OneFeelMK001.vue';
import OneFeelMK002 from '../module/OneFeelMK002.vue';
+
import { agentChatStream } from '../../request/api/AgentChatStream';
- import { mainPageData } from '../../request/api/MainPageData';
- import { conversationMsgList } from '../../request/api/ConversationMsgList';
- import { recentConversation } from '../../request/api/RecentConversation';
- import { SCROLL_TO_BOTTOM } from '../../constant/constant'
+ import { mainPageData } from '../../request/api/MainPageDataApi';
+ import { conversationMsgList, recentConversation } from '../../request/api/ConversationApi';
+
+
/// 导航栏相关
const statusBarHeight = ref(20);
diff --git a/pages/discovery/DiscoveryCardComponent.vue b/pages/discovery/DiscoveryCardComponent.vue
new file mode 100644
index 0000000..17ccbb3
--- /dev/null
+++ b/pages/discovery/DiscoveryCardComponent.vue
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/discovery/DiscoveryCradContentList.vue b/pages/discovery/DiscoveryCradContentList.vue
new file mode 100644
index 0000000..c152166
--- /dev/null
+++ b/pages/discovery/DiscoveryCradContentList.vue
@@ -0,0 +1,85 @@
+
+
+
+ {{ recommendTheme.themeName }}
+
+
+
+
+
+ {{ item.topic }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/request/api/ConversationApi.js b/request/api/ConversationApi.js
new file mode 100644
index 0000000..64dcc9f
--- /dev/null
+++ b/request/api/ConversationApi.js
@@ -0,0 +1,16 @@
+import request from "../base/request";
+
+/// 最近会话
+function recentConversation() {
+ return request.get('/hotelBiz/chat/recentConversation');
+}
+
+/// 会话消息列表
+function conversationMsgList(args) {
+ return request.post('/hotelBiz/chat/conversationMessageList', args);
+}
+
+export {
+ recentConversation,
+ conversationMsgList
+};
\ No newline at end of file
diff --git a/request/api/ConversationMsgList.js b/request/api/ConversationMsgList.js
deleted file mode 100644
index 8748ef4..0000000
--- a/request/api/ConversationMsgList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import request from "../base/request";
-
-function conversationMsgList(args) {
- return request.post('/hotelBiz/chat/conversationMessageList', args);
-}
-
-export { conversationMsgList }
diff --git a/request/api/MainPageData.js b/request/api/MainPageData.js
deleted file mode 100644
index 1e81b69..0000000
--- a/request/api/MainPageData.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import request from "../base/request";
-
-function mainPageData(sceneId) {
- const args = { sceneId : sceneId}
- return request.post('/hotelBiz/mainScene/mainPageData', args);
-}
-
-export { mainPageData }
\ No newline at end of file
diff --git a/request/api/MainPageDataApi.js b/request/api/MainPageDataApi.js
new file mode 100644
index 0000000..958438b
--- /dev/null
+++ b/request/api/MainPageDataApi.js
@@ -0,0 +1,26 @@
+import request from "../base/request";
+
+/// 主页数据
+function mainPageData(sceneId) {
+ const args = { sceneId : sceneId}
+ return request.post('/hotelBiz/mainScene/mainPageData', args);
+}
+
+
+/// 快速预订组件
+function quickBookingComponent(selectedData) {
+ const args = { selectedData: selectedData }
+ return request.post('/hotelBiz/mainScene/quickBookingComponent', args);
+}
+
+/// 探索发现卡片组件
+function discoveryCradComponent() {
+ return request.get('/hotelBiz/mainScene//discoveryComponent', {});
+}
+
+
+export {
+ mainPageData,
+ quickBookingComponent,
+ discoveryCradComponent
+ }
\ No newline at end of file
diff --git a/request/api/QuickBookingComponent.js b/request/api/QuickBookingComponent.js
deleted file mode 100644
index 84e245b..0000000
--- a/request/api/QuickBookingComponent.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import request from "../base/request";
-
-function quickBookingComponent(selectedData) {
- const args = { selectedData: selectedData }
- return request.post('/hotelBiz/mainScene/quickBookingComponent', args);
-}
-
-export { quickBookingComponent }
diff --git a/request/api/RecentConversation.js b/request/api/RecentConversation.js
deleted file mode 100644
index bc45937..0000000
--- a/request/api/RecentConversation.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import request from "../base/request";
-
-function recentConversation() {
- return request.get('/hotelBiz/chat/recentConversation');
-}
-
-export{ recentConversation }
\ No newline at end of file