diff --git a/src/libs/resize/index.js b/src/libs/resize/index.js index 3c98c24..7ff0319 100644 --- a/src/libs/resize/index.js +++ b/src/libs/resize/index.js @@ -12,8 +12,8 @@ function setRem() { } // 初始化 -setRem(); +// setRem(); // 改变窗口大小时重新设置 rem -window.onresize = function() { - setRem(); -}; \ No newline at end of file +// window.onresize = function() { +// setRem(); +// }; \ No newline at end of file diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue index b1eefbc..7c79d00 100644 --- a/src/pages/article/activity.vue +++ b/src/pages/article/activity.vue @@ -175,6 +175,7 @@ export default { /deep/.des { a { color: rgb(0, 0, 238); + word-wrap: break-word; } img { max-width: 100%; @@ -211,4 +212,42 @@ export default { font-size: 18px; } } + +@media (max-width: 1420px) { + .content { + width: 98%; + } +} +@media (max-width: 1200px) { + .article { + /deep/.des { + img { + max-width: 100%; + height: 15rem; + } + } + } + .banner { + font-size: 1.5rem; + } + .article { + flex-direction: column; + .left { + width: 100%; + h2 { + font-size: 1.5rem; + } + } + } + .article { + .des { + img { + height: 15rem !important; + } + } + } + .right { + width: 100%; + } +} \ No newline at end of file diff --git a/src/pages/article/editor.css b/src/pages/article/editor.css index 652987d..7228ffc 100644 --- a/src/pages/article/editor.css +++ b/src/pages/article/editor.css @@ -116,3 +116,11 @@ background: #1583ff; border-radius: 4px; } +@media (max-width: 640px) { + .tiny-wrap .people { + flex-direction: column; + } + .tiny-wrap .people .texts { + margin-left: 0; + } +} diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index 8d4b2bb..dac8305 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -230,8 +230,11 @@ export default { border-bottom: 1px solid #d8d8d8; } /deep/.des { + width: 100%; + overflow: auto; a { color: rgb(0, 0, 238); + word-wrap: break-word; } img { max-width: 100%; diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index cb17dcd..6f6357d 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -673,6 +673,7 @@ export default { }, // 左边栏目 getLeftColumn () { + this.getAllId = [] this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}&isSort=1&siteId=${this.site}`) .then(({ data }) => { const fromColumn = this.$route.query.column; // 有column标识的,说明是通过点击左侧导航跳转过来的,这种情况只查询该栏目下的文章 @@ -750,7 +751,7 @@ export default { }, // 点击栏目回调 columnClick (to, left) { - console.log("🚀 ~ file: index.vue:749 ~ columnClick ~ to, left:", to, left) + this.page = 1 const { typeId } = to; // 如果是左边的栏目,并且是第一级,并且长页/链接,则不作反应 if (left && to.level === 1 && (typeId === 2 || typeId === 3)) return false; @@ -869,7 +870,7 @@ export default { if (this.isFilter) { this.getIds(this.columns, id); } else if (this.columns.length) { - id = [this.$refs.leftColumn.getCurrentKey()]; + id = this.getAllId.length ? this.getAllId : [this.$refs.leftColumn.getCurrentKey()]; } this.getArticle(id); }, @@ -1186,10 +1187,10 @@ export default { margin-left: 10px; li { flex-direction: column; - width: calc(25% - 30px); + width: calc(33% - 30px); margin-right: 30px; background-color: transparent; - &:nth-child(4n) { + &:nth-child(3n) { margin-right: 0; } } @@ -1364,6 +1365,7 @@ export default { /deep/.des { a { color: rgb(0, 0, 238); + word-wrap: break-word; } img { max-width: 100%; diff --git a/src/pages/column/result.vue b/src/pages/column/result.vue index 6ed9b4d..e23a23f 100644 --- a/src/pages/column/result.vue +++ b/src/pages/column/result.vue @@ -177,4 +177,21 @@ export default { color: #333; } } +@media (max-width: 640px) { + .articles { + width: 90%; + } + .top { + flex-direction: column; + padding: 0 10px; + } + .search { + width: 100%; + margin-right: 0; + margin-bottom: 20px; + input { + width: 100%; + } + } +} \ No newline at end of file diff --git a/src/pages/estate/orgSetup/index.vue b/src/pages/estate/orgSetup/index.vue index f6a4afa..2097f7c 100644 --- a/src/pages/estate/orgSetup/index.vue +++ b/src/pages/estate/orgSetup/index.vue @@ -94,7 +94,7 @@ export default { } } .lg-bg { - max-width: 85%; + width: 1200px; margin: 0 auto; text-align: center; img { @@ -116,5 +116,8 @@ export default { } } } + .lg-bg { + width: 90%; + } } \ No newline at end of file diff --git a/src/pages/industrial/index.vue b/src/pages/industrial/index.vue index db79cfd..685ff66 100644 --- a/src/pages/industrial/index.vue +++ b/src/pages/industrial/index.vue @@ -222,7 +222,7 @@ export default { width: 560px; height: 500px; margin: -122px -83px 0 0; - object-fit: cover; + // object-fit: cover; } } .land { diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index 2d09702..234d122 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -195,28 +195,28 @@ - {{ item.keynoteSpeaker }} + {{ item.keynoteSpeaker }}
- Time: {{ item.activityStartTime + ' ~ ' + item.activityEndTime }} + Time: {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
- Onlone: {{ item.onlineLocation }} + Onlone: {{ item.onlineLocation }}
- Address: {{ item.offlineLocation }} + Address: {{ item.offlineLocation }}
@@ -438,9 +438,6 @@ export default { } } } -.lg { - width: 85.714rem; -} /deep/.articles { width: 50%; .el-carousel__indicators--horizontal { @@ -450,7 +447,7 @@ export default { } .lg { .intro { - margin-bottom: 4.57rem; + margin-bottom: 4rem; } } .news-banner { @@ -656,14 +653,14 @@ export default { } } .pic { - width: 8.25rem; + width: 8rem; height: auto; - margin-right: 1.75rem; + margin-right: 1.5rem; object-fit: cover; } .texts { - width: 24.5rem; - margin-right: 3.75rem; + width: 24rem; + margin-right: 3.5rem; } h6 { margin-bottom: 10px; @@ -678,12 +675,12 @@ export default { .des { font-size: 0.7rem; color: #666; - line-height: 1.3714rem; + line-height: 1.4rem; text-shadow: 0px 0px 30px rgba(48, 48, 48, 0.08); -webkit-line-clamp: 2; } .arrow { - width: 2.25rem; + width: 2rem; } } } @@ -747,8 +744,8 @@ export default { width: 50%; li { display: flex; - padding: 0.8571rem; - margin-bottom: 0.7428rem; + padding: 0.8rem; + margin-bottom: 0.7rem; background-color: #fff; cursor: pointer; align-items: center; @@ -762,20 +759,19 @@ export default { } } .pic { - width: 10.7428rem; + width: 10rem; height: auto; - margin-right: 1.6rem; + margin-right: 1.5rem; object-fit: cover; } + .texts { + width: calc(100% - 11.5rem); + } h6 { - margin-bottom: 0.2714rem; - font-size: 1.1428rem; + margin-bottom: 5px; + font-size: 1rem; color: #333; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - text-overflow: ellipsis; - overflow: hidden; + @include ellipsis(); } .text { display: flex; @@ -783,6 +779,9 @@ export default { &:last-child { margin-bottom: 0; } + span { + @include ellipsis(); + } } .icon { margin-right: 5px; @@ -795,6 +794,25 @@ export default { overflow-x: scroll; display: -webkit-box; } + .shop-shows { + .left { + width: 50%; + } + .right { + width: 48%; + } + .card-list { + .pic { + margin-right: 1rem; + } + .texts { + width: calc(100% - 11rem); + margin-right: 1rem; + } + } + } +} +@media (max-width: 640px) { .block { padding: 50px 0; .inner { @@ -830,952 +848,47 @@ export default { font-size: 15px; margin-bottom: 50px; } - .shop-shows { - flex-direction: column; - .left { - width: 95%; - margin: 0 auto; - } - .right { - width: 93%; - margin: 20px auto; - .show-card { - flex-direction: column; - li { - width: 100%; - .pic { - width: 100%; - } - } - } - .card-list { - li { - .texts { - margin-right: 30px; - } - } - } - } - } - } - } -} - -@media (min-width: 280px) and (max-width: 1200px) { - .wrap { - /deep/ .el-carousel { - height: 15rem; - .el-carousel__container { - height: 15rem; - } - img { - height: 15rem; - } } } - .banner-item .banner-name { - font-size: 1.5rem; - } - .newsTab { - li { - padding: 15px 10px; - font-size: 15px; - margin: 0; + .shop-shows { + flex-direction: column; + .left { + width: 100%; } - } - .block { - padding: 20px 0; - .inner { - width: 90%; - .news-banner { - img { - height: 20rem; - } - } - .b-title { - margin-bottom: 20px; - } - .intro { - margin-bottom: 20px; - } - .shop-shows { - .left { - img { - height: 20rem; - } - } - } + .right { + width: 100%; + margin: 20px auto; .show-card { - .text { - font-size: 13px; - line-height: 20px; - white-space: inherit; - } - } - .card-list { - padding: 20px 10px; - li { - width: 100%; - img { - margin-right: 10px; - } - .texts { - margin-right: 10px; - h6 { - font-size: 15px; - font-weight: bold; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 3; - text-overflow: ellipsis; - overflow: hidden; - margin-bottom: 5px; - } - } - .des { - line-height: 15px; - } - .arrow { - margin-right: 0; - } - } - } - .shows { flex-direction: column; - .left { - width: 100%; - .pic { - height: 20rem; - } - } - .card-list { - width: 100%; - padding: 20px 0; - li { - .pic { - width: 100px; - height: 7.5rem; - } - .texts { - h6 { - font-size: 15px; - font-weight: bold; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - text-overflow: ellipsis; - overflow: hidden; - } - .text { - margin: 2px 0; - font-size: 12px; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; - text-overflow: ellipsis; - overflow: hidden; - } - } - } - } - } - } - } -} -@media (max-width: 320px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - img { - height: auto; - } - .right { - padding: 1.25rem 1.25rem 5rem; - } - } - .card { li { + width: 100%; .pic { - height: auto; - } - } - } - .shop-shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - .show-card { - li { - margin-top: 1.25rem; - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - } - } - .card-list { - li { - .pic { - width: 6rem; - } - } - } - } - } - .shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - } - } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - height: auto !important; - } - } - } - } - } - } -} -@media (min-width: 320px) and (max-width: 375px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - img { - height: auto; - } - .right { - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - li { - .pic { - height: auto; - } - } - } - .shop-shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - .show-card { - li { - margin-top: 1.25rem; - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - } - } - .card-list { - li { - .pic { - width: 6rem; - } - } - } - } - } - .shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - } - } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - height: auto !important; - } - } - } - } - } - } -} -@media (min-width: 375px) and (max-width: 480px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - img { - height: auto; - } - .right { - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - li { - .pic { - height: auto; - } - } - } - .shop-shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - .show-card { - li { - margin-top: 1.25rem; - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - } - } - .card-list { - li { - .pic { - width: 30%; - } - } - } - } - } - .shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - } - } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - width: 35%; - height: auto !important; - } - } - } - } - } - } -} -@media (min-width: 480px) and (max-width: 640px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - img { - height: auto; - } - .right { - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - li { - .pic { - height: auto; - } - } - } - .shop-shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - .show-card { - li { - margin-top: 1.25rem; - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - } - } - .card-list { - li { - .pic { - width: 30%; - } - } - } - } - } - .shows { - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - } - } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - width: 35%; - height: auto !important; - } - } - } - } - } - } -} -@media (min-width: 640px) and (max-width: 768px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - flex-direction: row; - img { - width: 50%; - height: auto; - } - .right { - margin-top: 0; - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - flex-direction: row; - li { - width: 30% !important; - margin-right: 0.5rem; - margin: 0 0.5rem 0 0 !important; - .pic { - height: auto; - } - &:last-child() { - margin-right: 0 !important; - } - } - } - .shop-shows { - flex-direction: row; - .left { - margin-right: 0.5rem; - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - margin-top: 0; - .show-card { - li { - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - &:nth-child(2) { - margin-top: 0.5rem; - } - } - } - .card-list { - li { - .pic { - width: 30%; - } - } - } - } - } - .shows { - flex-direction: row; - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .card-list { - padding: 0; - } - } - } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - width: 35%; - height: auto !important; - } + width: 100%; } } } - } - } -} -@media (min-width: 768px) and (max-width: 980px) { - .wrap { - /deep/ .el-carousel { - height: 12rem; - } - /deep/ .el-carousel__container { - height: 12rem; - } - /deep/ .el-carousel__item { - height: 12rem; - } - } - .banner-item { - img { - height: 12rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - flex-direction: row; - img { - width: 50%; - height: auto; - } - .right { - margin-top: 0; - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - flex-direction: row; + .card-list { li { - width: 30% !important; - margin-right: 0.5rem; - margin: 0 0.5rem 0 0 !important; - .pic { - height: auto; - } - &:last-child() { - margin-right: 0 !important; - } - } - } - .shop-shows { - flex-direction: row; - .left { - margin-right: 0.5rem; - .pic { - height: auto; - } .texts { - padding: 1.25rem; - } - } - .right { - margin-top: 0; - .show-card { - li { - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - &:nth-child(2) { - margin-top: 0.5rem; - } - } - } - .card-list { - li { - .pic { - width: 30%; - } - } + margin-right: 30px; } } } - .shows { - flex-direction: row; - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .card-list { - padding: 0; - } - } } } .conference { - .inner { - .shows { - .card-list { - li { - .pic { - width: 35%; - height: auto !important; - } - } - } - } + .shows { + flex-direction: column; } - } -} -@media (min-width: 980px) and (max-width: 1200px) { - .wrap { - /deep/ .el-carousel { - height: 21.6rem; - } - /deep/ .el-carousel__container { - height: 21.6rem; - } - /deep/ .el-carousel__item { - height: 21.6rem; - } - } - .banner-item { - img { - height: 21.6rem !important; - } - .banner-name { - font-size: 1.5rem; - line-height: 1rem; - left: 2rem; - bottom: 2rem; - } - } - .newsTab { - .scollBox { - width: auto; - li { - padding: 1rem; - white-space: nowrap; - } - } - } - .block { - .inner { - .news-banner { - flex-direction: row; - img { - width: 50%; - height: auto; - } - .right { - margin-top: 0; - padding: 1.25rem 1.25rem 5rem; - } - } - .card { - flex-direction: row; - li { - width: 30% !important; - margin-right: 0.5rem; - margin: 0 0.5rem 0 0 !important; - .pic { - height: auto; - } - &:last-child() { - margin-right: 0 !important; - } - } - } - .shop-shows { - flex-direction: row; - .left { - margin-right: 0.5rem; - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .right { - margin-top: 0; - .show-card { - flex-direction: row; - li { - .pic { - height: auto; - } - .text { - font-size: 1rem; - } - &:nth-child(2) { - margin-top: 0; - } - } - } - .card-list { - li { - .pic { - width: 30%; - } - } - } - } - } - .shows { - flex-direction: row; - .left { - .pic { - height: auto; - } - .texts { - padding: 1.25rem; - } - } - .card-list { - padding: 0; - } - } + .left { + width: 100%; + margin-right: 0; } - } - .conference { - .inner { - .shows { - .card-list { - li { - .pic { - width: 35%; - height: auto !important; - } - } - } + .card-list { + width: 100%; + margin-top: 20px; + .text { + margin-bottom: 4px; } } } diff --git a/src/pages/overview/index.vue b/src/pages/overview/index.vue index 6947b94..9786a57 100644 --- a/src/pages/overview/index.vue +++ b/src/pages/overview/index.vue @@ -115,7 +115,7 @@{{ modules[8].form.des }}
@@ -454,6 +454,12 @@ export default { } } @media (max-width: 750px) { + .hide-bd:after { + display: none; + } + .block { + padding: 50px 0; + } .core { .texts { position: static; @@ -464,5 +470,12 @@ export default { background: #333; } } + .fac { + .event { + .pic { + display: none; + } + } + } } diff --git a/src/pages/overviewLocation/index.vue b/src/pages/overviewLocation/index.vue index 6cffa3a..4d609bd 100644 --- a/src/pages/overviewLocation/index.vue +++ b/src/pages/overviewLocation/index.vue @@ -65,6 +65,7 @@ export default { } /deep/ img { width: 100% !important; + object-fit: cover; } } .video {