diff --git a/src/assets/svg/svg-pushpin.svg b/src/assets/svg/svg-pushpin.svg new file mode 100644 index 0000000..fa3ea76 --- /dev/null +++ b/src/assets/svg/svg-pushpin.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/components/text-over-tips/index.vue b/src/components/text-over-tips/index.vue index 57c8d43..54ee35e 100644 --- a/src/components/text-over-tips/index.vue +++ b/src/components/text-over-tips/index.vue @@ -1,6 +1,11 @@ - - + + {{ props.context }} @@ -18,11 +23,23 @@ {{ isShow ? '收起' : '展开' }} - + + + + diff --git a/src/components/xt-chat/conversations/style.scss b/src/components/xt-chat/conversations/style.scss new file mode 100644 index 0000000..59c9b5e --- /dev/null +++ b/src/components/xt-chat/conversations/style.scss @@ -0,0 +1,13 @@ +.xt-conversations-container { + width: 100%; + height: 100%; + overflow-y: auto; + :deep(.overflow-text) { + color: var(--Text-1, #211f24); + font-family: $font-family-regular; + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } +} diff --git a/src/layouts/Basic.vue b/src/layouts/Basic.vue index 26c7f2f..35b7d42 100644 --- a/src/layouts/Basic.vue +++ b/src/layouts/Basic.vue @@ -27,13 +27,16 @@ const showSider = computed(() => { return !route.meta?.hideSidebar; }); -const isHomeRoute = computed(() => { - return route.name === 'Home'; +const layoutPageClass = computed(() => { + if (!showSider.value) { + return 'pb-8px pr-8px'; + } + return 'pb-24px pr-24px'; }); -const layoutPageClass = computed(() => { - return isHomeRoute.value ? 'pb-8px pr-8px' : 'pb-24px pr-24px' -}) +const siderWidth = computed(() => { + return showSider.value ? sidebarStore.sidebarWidth : 0; +}); const collapsed = computed(() => { return sidebarStore.menuCollapse; @@ -53,7 +56,6 @@ const checkHasInviteCode = () => { joinModalRef.value?.getEnterprise?.(); } }; - @@ -66,7 +68,7 @@ const checkHasInviteCode = () => { { > - - + - - + + @@ -102,7 +104,7 @@ const checkHasInviteCode = () => { position: fixed; top: 0; left: 0; - z-index: 9999; + z-index: 999; width: 100%; } .layout-content-wrap { @@ -118,7 +120,7 @@ const checkHasInviteCode = () => { position: fixed; top: 0; left: 0; - z-index: 9999; + z-index: 999; height: 100%; transition: all 0.2s cubic-bezier(0.34, 0.69, 0.1, 1); .ant-layout-sider-trigger { diff --git a/src/layouts/components/navbar/components/middle-side/index.vue b/src/layouts/components/navbar/components/middle-side/index.vue index f6db701..0db1fe1 100644 --- a/src/layouts/components/navbar/components/middle-side/index.vue +++ b/src/layouts/components/navbar/components/middle-side/index.vue @@ -1,12 +1,14 @@ diff --git a/src/views/home/components/history-conversation-drawer/style.scss b/src/views/home/components/history-conversation-drawer/style.scss new file mode 100644 index 0000000..324f492 --- /dev/null +++ b/src/views/home/components/history-conversation-drawer/style.scss @@ -0,0 +1,37 @@ +.ct-history-conversation-drawer { + border-radius: 8px; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.1); + .ant-drawer-content { + .ant-drawer-header { + display: none; + } + .ant-drawer-body { + padding: 0; + display: flex; + flex-direction: column; + .header { + position: relative; + &::after { + content: ''; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + height: 1px; + margin: 0 16px; + background: #f2f3f5; + } + } + .content { + .ant-conversations { + gap: 0; + padding: 0; + .ant-conversations-item { + gap: 0; + padding: 8px; + } + } + } + } + } +} diff --git a/src/views/home/index.vue b/src/views/home/index.vue index c553ea4..2b04cc1 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -1,7 +1,75 @@ diff --git a/src/views/home/style.scss b/src/views/home/style.scss index e69de29..b3dc1db 100644 --- a/src/views/home/style.scss +++ b/src/views/home/style.scss @@ -0,0 +1,54 @@ +.home-wrap { + border: 1px solid rgba(255, 255, 255, 0.1); + backdrop-filter: blur(20px); + background: rgba(255, 255, 255, 0.9); + .cts { + color: var(--Text-1, #737478); + font-size: 14px; + font-style: normal; + font-weight: 400; + line-height: 22px; + } + .main-chat-wrap { + .title { + color: var(--Text-1, #211f24); + text-align: center; + font-family: $font-family-medium; + font-size: 32px; + font-style: normal; + font-weight: 700; + line-height: 48px; + .s1 { + background: linear-gradient(90deg, #6d4cfe 38.12%, #b93bf0 100%); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + :deep(.ant-sender) { + .submit-btn { + background: linear-gradient(125deg, #6d4cfe 32.25%, #3ba1f0 72.31%), + linear-gradient(113deg, #6d4cfe 0%, #b93bf0 100%); + } + } + } + .history-conversation-btn { + border-radius: 8px 0 0 8px; + border-top: 1px solid #eabaff; + border-bottom: 1px solid #eabaff; + border-left: 1px solid #eabaff; + position: absolute; + top: 50%; + right: 0; + transform: translateY(-50%); + .s1 { + color: var(--Text-1, #211f24); + + font-family: $font-family-regular; + font-size: 10px; + font-style: normal; + font-weight: 400; + line-height: 18px; /* 180% */ + } + } +}