From d3924e9d70b1743c14fc5de12bc98b6db2553030 Mon Sep 17 00:00:00 2001 From: fuxiaochun Date: Tue, 22 Aug 2023 13:22:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ArticleDetail/index.vue | 11 +++++++++-- src/layouts/Footer.vue | 1 + src/views/business/components/CategoryCardList.vue | 11 +++++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/components/ArticleDetail/index.vue b/src/components/ArticleDetail/index.vue index 58ec3d9..305ba05 100644 --- a/src/components/ArticleDetail/index.vue +++ b/src/components/ArticleDetail/index.vue @@ -230,7 +230,7 @@ const goDetail = (id) => { li{ width: 100%; - height: 408px; + height: 428px; background: #D6D6DD; border-radius: 3px; border: 5px solid #D6D6DD; @@ -278,10 +278,17 @@ const goDetail = (id) => { } } .desc{ - padding: 10px; + margin: 10px; font-size: 22px; font-weight: bold; line-height: 30px; + height: 60px; + box-sizing: content-box; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } } } diff --git a/src/layouts/Footer.vue b/src/layouts/Footer.vue index f1e1a93..fd5c28f 100644 --- a/src/layouts/Footer.vue +++ b/src/layouts/Footer.vue @@ -11,6 +11,7 @@

联系电话：{{ website.info.contact_phone }}

邮箱：{{ website.info.contact_email }}

联系地址：{{ website.info.contact_address }}

+

copyright © 2023; 海国图智信息科技 (广州)有限公司

diff --git a/src/views/business/components/CategoryCardList.vue b/src/views/business/components/CategoryCardList.vue index 9aaf0b0..baf7c8e 100644 --- a/src/views/business/components/CategoryCardList.vue +++ b/src/views/business/components/CategoryCardList.vue @@ -120,7 +120,7 @@ const goDetail = (id) => { } li{ width: 100%; - height: 408px; + height: 428px; background: #D6D6DD; border-radius: 3px; border: 5px solid #D6D6DD; @@ -167,10 +167,17 @@ const goDetail = (id) => { } } .desc{ - padding: 10px; + margin: 0 10px; font-size: 22px; font-weight: bold; line-height: 30px; + height: 60px; + box-sizing: content-box; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } } .pageBox{ From 9beb5386417359ed8a66aa75c19ac2fbac89145a Mon Sep 17 00:00:00 2001 From: fuxiaochun Date: Tue, 22 Aug 2023 13:34:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9D=83?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/Footer.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/Footer.vue b/src/layouts/Footer.vue index fd5c28f..23d1ba6 100644 --- a/src/layouts/Footer.vue +++ b/src/layouts/Footer.vue @@ -11,15 +11,17 @@

联系电话：{{ website.info.contact_phone }}

邮箱：{{ website.info.contact_email }}

联系地址：{{ website.info.contact_address }}

-

copyright © 2023; 海国图智信息科技 (广州)有限公司

+

Copyright © {{ curYear }} {{ website.info.copyright }}

\ No newline at end of file diff --git a/src/views/business/components/CategoryCardList.vue b/src/views/business/components/CategoryCardList.vue index baf7c8e..db77bbb 100644 --- a/src/views/business/components/CategoryCardList.vue +++ b/src/views/business/components/CategoryCardList.vue @@ -8,8 +8,7 @@
-

{{ item.title }}

- {{ DateFormat(new Date(item.published_at * 1000), 'yyyy.MM.dd') }} +

[{{ DateFormat(new Date(item.published_at * 1000), 'yyyy.MM.dd') }}] {{ item.title }}

{{ item.description }}
@@ -120,7 +119,7 @@ const goDetail = (id) => { } li{ width: 100%; - height: 428px; + min-height: 428px; background: #D6D6DD; border-radius: 3px; border: 5px solid #D6D6DD; @@ -142,29 +141,30 @@ const goDetail = (id) => { } } .title{ - height: 80px; + // height: 80px; width: 100%; padding: 20px 10px; display: flex; justify-content: space-between; align-items: center; h2{ - height: 40px; + // height: 40px; font-weight: bold; font-size: 28px; line-height: 40px; - margin-right: 10px; + // margin-right: 10px; flex: 1; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - span{ - height: 40px; - line-height: 40px; - display: inline-block; - font-size: 22px; + span{ + font-weight: normal; + padding-right: 5px; + } } + // span{ + // height: 40px; + // line-height: 40px; + // display: inline-block; + // font-size: 22px; + // } } .desc{ margin: 0 10px; From c1e5c396da81822cd2a35abc3debe257640d37d5 Mon Sep 17 00:00:00 2001 From: fuxiaochun Date: Tue, 22 Aug 2023 14:55:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8card?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ArticleDetail/index.vue | 8 ++++---- src/views/business/components/CategoryCardList.vue | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/ArticleDetail/index.vue b/src/components/ArticleDetail/index.vue index 0826fbb..eaad862 100644 --- a/src/components/ArticleDetail/index.vue +++ b/src/components/ArticleDetail/index.vue @@ -27,7 +27,7 @@
-

[{{ DateFormat(new Date(item.published_at * 1000), 'yyyy.MM.dd') }}]{{ item.title }}

+

[{{ DateFormat(new Date(item.published_at * 1000), 'yyyy.MM.dd') }}] {{ item.title }}

{{ item.description }}
@@ -253,9 +253,9 @@ const goDetail = (id) => { .rTitle{ width: 100%; padding: 20px 10px; - display: flex; - justify-content: space-between; - align-items: center; + // display: flex; + // justify-content: space-between; + // align-items: center; h2{ font-weight: bold; font-size: 28px; diff --git a/src/views/business/components/CategoryCardList.vue b/src/views/business/components/CategoryCardList.vue index db77bbb..317307e 100644 --- a/src/views/business/components/CategoryCardList.vue +++ b/src/views/business/components/CategoryCardList.vue @@ -144,9 +144,9 @@ const goDetail = (id) => { // height: 80px; width: 100%; padding: 20px 10px; - display: flex; - justify-content: space-between; - align-items: center; + // display: flex; + // justify-content: space-between; + // align-items: center; h2{ // height: 40px; font-weight: bold;