diff --git a/src/layouts/Basic.vue b/src/layouts/Basic.vue index 1ef395e..e08ae80 100644 --- a/src/layouts/Basic.vue +++ b/src/layouts/Basic.vue @@ -40,7 +40,6 @@ const layoutPageClass = computed(() => { return result; }); - onMounted(() => { checkHasInviteCode(); }); @@ -60,18 +59,22 @@ const checkHasInviteCode = () => { - - - - - - - + +
+
+ + + + + + +
+
@@ -87,27 +90,39 @@ const checkHasInviteCode = () => { line-height: $navbar-height; padding-inline: inherit; color: inherit; - position: fixed; - top: 0; - left: 0; - z-index: 1000; + // position: fixed; + // top: 0; + // left: 0; + // z-index: 1000; width: 100%; min-width: $layout-min-width; } - .layout-content-wrap { + .app-content-layout { width: 100%; height: 100%; background: transparent; min-height: calc(100vh - $navbar-height); + .app-content-scroll { + min-height: calc(100vh - $navbar-height); + height: calc(100vh - $navbar-height); + overflow-y: auto; + overflow-x: auto; + .app-content-inner { + width: 100%; + height: calc(100vh - $navbar-height); + overflow: hidden; + display: flex; + } + } :deep(.ant-layout-sider) { background: none; box-shadow: none; - padding-top: $navbar-height; + // padding-top: $navbar-height; padding-bottom: 0; - position: fixed; - top: 0; - left: 0; - z-index: 999; + // position: fixed; + // top: 0; + // left: 0; + // z-index: 999; height: 100%; transition: all 0.2s cubic-bezier(0.34, 0.69, 0.1, 1); .ant-layout-sider-trigger { @@ -118,9 +133,12 @@ const checkHasInviteCode = () => { } } .layout-content { - padding-top: $navbar-height; background: transparent; transition: padding 0.2s cubic-bezier(0.34, 0.69, 0.1, 1); + flex: 1; + height: 100%; + overflow-y: auto; + overflow-x: hidden; } } } diff --git a/src/layouts/components/navbar/index.vue b/src/layouts/components/navbar/index.vue index 15bab0f..ddc2144 100644 --- a/src/layouts/components/navbar/index.vue +++ b/src/layouts/components/navbar/index.vue @@ -37,20 +37,20 @@ const isHomeRoute = computed(() => { .navbar-wrap { position: relative; height: 100%; - &::before { - width: 100%; - height: 100%; - background: url('@/assets/img/icon-app-header-bg.png') center top no-repeat !important; - background-size: cover !important; - bottom: 0; - content: ''; - display: block; - left: 0; - position: absolute; - right: 0; - top: 0; - z-index: -998; - } + // &::before { + // width: 100%; + // height: 100%; + // background: url('@/assets/img/icon-app-header-bg.png') center top no-repeat !important; + // background-size: cover !important; + // bottom: 0; + // content: ''; + // display: block; + // left: 0; + // position: absolute; + // right: 0; + // top: 0; + // z-index: -998; + // } // background-color: var(--color-bg-2); // border-bottom: 1px solid var(--color-border); diff --git a/src/views/material-center/components/finished-products/manuscript/check/components/content-card/index.vue b/src/views/material-center/components/finished-products/manuscript/check/components/content-card/index.vue index ec0998d..863e004 100644 --- a/src/views/material-center/components/finished-products/manuscript/check/components/content-card/index.vue +++ b/src/views/material-center/components/finished-products/manuscript/check/components/content-card/index.vue @@ -412,7 +412,7 @@ export default { loading={true} tip={`${isTextTab.value ? '文本' : '图片'}检测中`} size={72} - class="h-298px !flex flex-col justify-center items-center color-#6d4cfe" + class="h-298px !flex flex-col justify-center items-center" /> ); diff --git a/src/views/material-center/components/finished-products/manuscript/check/components/content-card/style.scss b/src/views/material-center/components/finished-products/manuscript/check/components/content-card/style.scss index 3ee72d6..39160fe 100644 --- a/src/views/material-center/components/finished-products/manuscript/check/components/content-card/style.scss +++ b/src/views/material-center/components/finished-products/manuscript/check/components/content-card/style.scss @@ -180,6 +180,12 @@ line-height: 24px; } } + :deep(.arco-spin) { + .arco-spin-icon, + .arco-spin-tip { + color: #6d4cfe; + } + } :deep(.overflow-text) { color: #211f24; font-family: $font-family-regular; diff --git a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue index 8e1ce39..3a969b3 100644 --- a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue +++ b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue @@ -4,61 +4,66 @@ * @Date: 2025-06-25 14:02:40 --> diff --git a/src/views/property-marketing/media-account/account-dashboard/index.vue b/src/views/property-marketing/media-account/account-dashboard/index.vue index 010fd28..374dd47 100644 --- a/src/views/property-marketing/media-account/account-dashboard/index.vue +++ b/src/views/property-marketing/media-account/account-dashboard/index.vue @@ -27,7 +27,7 @@ -
+
diff --git a/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue b/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue index 479e9e5..ab6fb12 100644 --- a/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue +++ b/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue @@ -4,9 +4,9 @@ * @Date: 2025-06-25 14:02:40 --> diff --git a/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss b/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss index 48e2115..dd08cb3 100644 --- a/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss +++ b/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss @@ -1,4 +1,4 @@ -.container { +.filter-wrap { .filter-row { .filter-row-item { &:not(:last-child) { diff --git a/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue b/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue index a052d91..c99249d 100644 --- a/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue +++ b/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue @@ -4,67 +4,72 @@ * @Date: 2025-06-25 14:02:40 --> diff --git a/src/views/writer-material-center/components/finished-products/manuscript/check/components/content-card/style.scss b/src/views/writer-material-center/components/finished-products/manuscript/check/components/content-card/style.scss index 1cbfb8b..ab5f489 100644 --- a/src/views/writer-material-center/components/finished-products/manuscript/check/components/content-card/style.scss +++ b/src/views/writer-material-center/components/finished-products/manuscript/check/components/content-card/style.scss @@ -135,9 +135,11 @@ } } .right-box { - border: 1px solid #E6E6E8; + border: 1px solid #e6e6e8; flex: 1; - border-radius: 8px; padding: 16px; display: flex; + border-radius: 8px; + padding: 16px; + display: flex; flex-direction: column; overflow-y: auto; height: fit-content; @@ -185,6 +187,12 @@ font-weight: 400; line-height: 22px; } + :deep(.arco-spin) { + .arco-spin-icon, + .arco-spin-tip { + color: #6d4cfe; + } + } .forbid-word-box { :deep(.overflow-text) { &.level0 {