From 443b3dee09a88bf8f24cfdc0270295a9258906b7 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 11:54:05 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 25 +- src/assets/styles/portal.scss | 12 +- src/views/Index.vue | 3067 +++++++++++++++------------ src/views/portal/case/Detail.vue | 2 +- 4 files changed, 1674 insertions(+), 1432 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index c0091a57..c4bf180d 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -3,6 +3,7 @@ //首页版心内容区域 .xindex-content { font-family: 'Noto Sans SC'; + padding-top: 20px; margin: 26px auto; } .xindex-row{ @@ -461,7 +462,7 @@ } //课程卡片样式 .xindex-course{ - width: 240px; + width: 255px; padding: 20px; margin-right: 20px; margin-bottom: 20px; @@ -470,16 +471,14 @@ bottom: 16px; } .course-image-box{ - width: 200px; - height: 114px; + width: 220px; + height: 123px; ::v-deep .course-image{ height: 100% !important; } } } - .xindex-ranking{ - width: 300px; - } + .boe-index{ width: 235px; padding: 20px; @@ -678,7 +677,7 @@ width: 1366px; } .xindex-course{ - width: 330px; + width: 320px; padding: 25px; margin-right: 20px; margin-bottom: 20px; @@ -895,21 +894,21 @@ @media screen and (max-width: 1920px) and (min-width: 1681px){ .xindex-content{ - width: 1640px; + width: 1690px; } .xindex-course{ - width: 410px; + width: 400px; padding: 30px; - margin-right: 36px; - margin-bottom: 36px; + margin-right: 30px; + margin-bottom: 30px; border-radius: 8px; .cor-praises { right: 50px; bottom: 26px; } .course-image-box{ - width: 350px; - height: 196x; + width: 340px; + height: 191x; ::v-deep .course-image{ height: 100% !important; } diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index fa4cb486..651f27e8 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -252,10 +252,9 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1366px){ .xcontent2{ width: 1100px; - padding: 20px 5px; } .xcontent2-minor{ - width: 234px; + width: 260px; } .portal-ranking{ padding: 30px 15px; @@ -273,10 +272,9 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1680px) and (min-width:1367px){ .xcontent2{ width: 1366px; - padding: 30px 20px; } .xcontent2-minor{ - width: 300px; + width: 320px; } .portal-ranking{ padding: 30px 20px; @@ -293,8 +291,7 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1920px) and (min-width: 1681px){ .xcontent2{ - width: 1640px; - padding: 30px 26px; + width: 1690px; } .xcontent2-minor{ width: 400px; @@ -315,8 +312,7 @@ body {margin: 0px;padding: 0px;} @media screen and (min-width: 1921px){ .xcontent2{ - width: 1880px; - padding: 30px 26px; + width: 1900px; } .xcontent2-minor{ width: 400px; diff --git a/src/views/Index.vue b/src/views/Index.vue index b9264f8b..0341f730 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -1,11 +1,11 @@ diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 00a59878..d5324ff8 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -96,7 +96,7 @@ -
+
From 007de8591ae2914229497a353da4b74060817540 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 8 Oct 2022 13:59:59 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/article/Detail.vue | 2 +- src/views/portal/article/Index.vue | 2 +- src/views/portal/course/Index.vue | 2 +- src/views/portal/qa/Answer.vue | 2 +- src/views/portal/qa/Detail.vue | 2 +- src/views/portal/qa/Index.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 0eec6a81..170ef8d0 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -3,7 +3,7 @@
-
+
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue index c5f45dc4..b725e48e 100644 --- a/src/views/portal/article/Index.vue +++ b/src/views/portal/article/Index.vue @@ -4,7 +4,7 @@
-
+
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 4681bbf7..e5e8c7ad 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -3,7 +3,7 @@
-
+
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index 986a2ca4..1a3e26db 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -3,7 +3,7 @@
-
+
diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue index 154544f0..280e3384 100644 --- a/src/views/portal/qa/Detail.vue +++ b/src/views/portal/qa/Detail.vue @@ -3,7 +3,7 @@
-
+
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue index 7d845f30..0e9287be 100644 --- a/src/views/portal/qa/Index.vue +++ b/src/views/portal/qa/Index.vue @@ -4,7 +4,7 @@
-
+
From 168dd7fc22ed26f6de6519ac5b91e83e77bac5ef Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 8 Oct 2022 14:46:16 +0800 Subject: [PATCH 03/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal.scss | 38 +++++++++++++++++++++++++++---- src/views/portal/course/Index.vue | 6 ++--- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index c97eb218..163ff1ea 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -56,9 +56,33 @@ body {margin: 0px;padding: 0px;} .ranking-data{ min-height: 246px; margin: 0px; - // overflow-y: auto; + overflow-y: auto; } } + +.portal-ranking-list{ + border-radius: 8px; + padding: 30px; + // height: 544px; + // overflow-y: auto; + .ranking-title{ + font-size: 24px; + font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1; + font-weight: 600; + color: #000000; + line-height: 28px; + padding-bottom:12px + } + .ranking-data{ + min-height: 246px; + margin: 0px; + // overflow-y: auto; + } +} + + + + //排行块的背景 .ranking-bg{ background: url('/images/qa-box.png') no-repeat top left; @@ -252,9 +276,10 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1366px){ .xcontent2{ width: 1100px; + padding: 20px 5px; } .xcontent2-minor{ - width: 260px; + width: 234px; } .portal-ranking{ padding: 30px 15px; @@ -272,9 +297,10 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1680px) and (min-width:1367px){ .xcontent2{ width: 1366px; + padding: 30px 20px; } .xcontent2-minor{ - width: 320px; + width: 300px; } .portal-ranking{ padding: 30px 20px; @@ -291,7 +317,8 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1920px) and (min-width: 1681px){ .xcontent2{ - width: 1690px; + width: 1640px; + padding: 30px 26px; } .xcontent2-minor{ width: 400px; @@ -312,7 +339,8 @@ body {margin: 0px;padding: 0px;} @media screen and (min-width: 1921px){ .xcontent2{ - width: 1900px; + width: 1880px; + padding: 30px 26px; } .xcontent2-minor{ width: 400px; diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index e5e8c7ad..cbefcd5e 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -121,7 +121,7 @@ 上传课程
-
+
好评榜
  • @@ -166,7 +166,7 @@
-
+
人气榜
  • @@ -211,7 +211,7 @@
-
+
热度榜
  • From 37262ce0df4c4df2a0945a125ab1da804e0d1011 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:09:20 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 1065 +++++++++++++-------------- src/assets/styles/portal.scss | 7 +- src/views/Index.vue | 131 +--- 3 files changed, 542 insertions(+), 661 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index c4bf180d..84ce846d 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -6,9 +6,7 @@ padding-top: 20px; margin: 26px auto; } -.xindex-row{ - display: inline-block; -} + // 课程卡片 .xindex-course{ display: inline-block; @@ -21,7 +19,7 @@ box-sizing: border-box; position: relative; background-color: #ffffff; - + border-radius: 8px; .cor-praises { position: absolute; right: 50px; @@ -94,19 +92,6 @@ } } } - - // .cor-icon { - // position: absolute; - // left: 100px; - // top: 54px; - // border-radius: 50%; - // background: rgba(88, 138, 252, 0.37); - - // .el-icon-caret-right { - // font-size: 36px; - // color: #588afc; - // } - // } .course-title { margin: 16px 0 16px 0; height: 44px; @@ -156,92 +141,89 @@ } } } - .course-score-no { - text-align: right; - font-size: 14px; - color: #6B7C85; - line-height: 30px; - -moz-user-select: none; /*火狐*/ - -webkit-user-select: none; /*webkit浏览器*/ - -ms-user-select: none; /*IE10*/ - -khtml-user-select: none; /*早期浏览器*/ - user-select: none; - } - .course-score-value { - font-size: 14px; - // margin-top: 5px; - margin-left: 32px; - line-height: 30px; - color: #FA6400; - font-family: 'Arial'; - -moz-user-select: none; /*火狐*/ - -webkit-user-select: none; /*webkit浏览器*/ - -ms-user-select: none; /*IE10*/ - -khtml-user-select: none; /*早期浏览器*/ - user-select: none; - // font-size: 30px; - } - .cardmark { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: rgba(101, 101, 101, 0.8); - pointer-events: none; - border-radius: 5px; - padding: 10px; - opacity: 0; - -webkit-transition: all 1.5s; - -moz-transition: all 1.5s; - -ms-transition: all 1.5s; - -o-transition: all 1.5s; - transition: all 1.5s; - .cardmark-name { - font-size: 18px; - line-height: 30px; - font-weight: 600; - color: #fff; - } - .cardmark-info { - color: #fff; - font-size: 14px; - line-height: 20px; - } +.course-score-no { + text-align: right; + font-size: 14px; + color: #6B7C85; + line-height: 30px; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; +} +.course-score-value { + font-size: 14px; + // margin-top: 5px; + margin-left: 32px; + line-height: 30px; + color: #FA6400; + font-family: 'Arial'; + -moz-user-select: none; /*火狐*/ + -webkit-user-select: none; /*webkit浏览器*/ + -ms-user-select: none; /*IE10*/ + -khtml-user-select: none; /*早期浏览器*/ + user-select: none; + // font-size: 30px; +} +//以下是几种右边排行内容，因为高度需要变化不同，所以需要单独宝义 +.xindex-ranking-li{ + cursor: pointer; + line-height: 30px; + display: flex; + position: relative; + .span { + display: flex; } - -.xindex-course:hover .cardmark { - opacity: 1; +} +.xindex-ranking-li:hover .list-active { + // transition: all 0.5s; + display: block; +} + + + + +.xindex-ranking-course{ + margin: 0px; + padding: 0px; + overflow-y: auto; +} + +.xindex-ranking-case{ + //height: 114px; + margin: 0px; + padding: 0px; + overflow-y: auto; +} + +.xindex-ranking-article{ + margin: 0px; + padding: 0px; + overflow-y: auto; +} + +.xindex-ranking-qa{ + margin: 0px; + padding: 0px; + overflow-y: auto; +} + +//每块区域 +.xindex-case { + display: inline-block; + vertical-align: top; + width: 33.33%; + padding-right: 20px; +} + +.xindex-qa { + display: inline-block; + vertical-align: top; + width: 25%; + padding-right: 20px; } -.xindex-ranking{ - min-width: 300px; - border-radius: 8px; - padding: 30px; - .xindex-ranking-title{ - font-size: 24px; - font-family: FZLTCHJW--GB1-0, FZLTCHJW--GB1; - font-weight: 600; - color: #000000; - line-height: 28px; - } - .course-index-list{ - height: 410px; - overflow-y: auto; - } - .case-index-list{ - height: 114px; - overflow-y: auto; - } - .anking-index-list{ - height: 320px; - overflow-y: auto; - } - .qa-index-qa{ - height: 64px; - overflow-y: auto; - } - } .nav-bottbor{ width: 75%; height: 4px; @@ -250,17 +232,17 @@ position: absolute; top: 75%; left: 13%; - } - .current-nav { - color: #387DF7; - font-weight: 700; - >a{ - color:#387DF7; +} +.current-nav { + color: #387DF7; + font-weight: 700; + >a{ + color:#387DF7; - } - // background: #588afc; - // border-bottom: 4px solid; } + // background: #588afc; + // border-bottom: 4px solid; +} .portal-right-text{ font-size: 24px; font-family: JCHEadA; @@ -367,8 +349,8 @@ background: url('/images/list-pink.png') no-repeat 100% / 100%; } .art-bgimg{ - background: url('/images/contribute.png') no-repeat 100% / 100%; - background-position:top; + background: url('/images/contribute.png') no-repeat top left; + background-size: cover; } .portal-images-title{ display: inline-block; @@ -478,44 +460,57 @@ } } } + .xindex-ranking-li{ + margin-top:15px; + } + .xindex-ranking-course{ + height: 450px; + } - .boe-index{ - width: 235px; - padding: 20px; - margin-right: 20px; - margin-bottom: 20px; - .course-image-box{ - width: 200px; - height: 114px; - ::v-deep .course-image{ - height: 100% !important; - } + .xindex-ranking-case{ + height: 170px; + } + + .xindex-ranking-article{ + height: 375px; + } + + .xindex-ranking-qa{ + height:124px; + } + + .xindex-case { + padding-right: 20px; + } + // .boe-index{ + // width: 235px; + // padding: 20px; + // margin-right: 20px; + // margin-bottom: 20px; + // .course-image-box{ + // width: 200px; + // height: 114px; + // ::v-deep .course-image{ + // height: 100% !important; + // } + // } + + // } + .case-inter{ + left: 20px; + bottom:20px; + .interact-bar-index{ + display: none !important; } - // .course-image-box :hover .el-image{ - // z-index: 999; - // position: absolute; - // top: 0px; - // left: 0px; - // width: 195px !important; - // height: 92px !important; - // } + ::v-deep .el-avatar--small{ + width: 22px; + height: 22px; } - .case-inter{ - left: 20px; - bottom:20px; - .interact-bar-index{ - display: none !important; - } - ::v-deep .el-avatar--small{ - width: 22px; - height: 22px; - } - } - .modules-list{ - margin-right: 20px; - } + } + .modules-list{ + margin-right: 20px; + } .boe-case-index{ - width: 235px; height: 246px; margin-right: 20px; .case-top{ @@ -547,7 +542,6 @@ } } .boe-qa-index{ - width: 171px; height: 194px; margin-right: 20px; padding: 17px 12px 16px 12px; @@ -693,56 +687,43 @@ } } } - .portal-right-box{ - width: 344px; - .course-index-list{ - height: 548px; - overflow-y: auto; - } - .case-index-list{ - height: 230px; - overflow-y: auto; - } - .anking-index-list{ - height: 448px; - overflow-y: auto; - } - .qa-index-qa{ - height: 145px; - overflow-y: auto; - } + + .xindex-ranking-course{ + height: 535px; + } + + .xindex-ranking-case{ + height: 260px; + } + + .xindex-ranking-article{ + height: 445px; + } + + .xindex-ranking-qa{ + height:175px; + } + + .xindex-case { + padding-right: 20px; + } + + .case-inter{ + left: 20px; + bottom:20px; + // .interact-bar-index{ + // display: none !important; + // } + ::v-deep .el-avatar--small{ + width: 32px; + height: 32px; } - .boe-index{ - width: 350px; - padding: 25px; - margin-right: 20px; - margin-bottom: 20px; - .course-image-box{ - width: 300px; - height: 170px; - ::v-deep .course-image{ - height: 100% !important; - } - } - } - .case-inter{ - left: 20px; - bottom:20px; - // .interact-bar-index{ - // display: none !important; - // } - ::v-deep .el-avatar--small{ - width: 32px; - height: 32px; - } - } - .modules-list{ - margin-right: 30px; - } + } + .modules-list{ + margin-right: 10px; + } .boe-case-index{ - width: 350px; height: 361px; - margin-right: 36px; .case-top{ height: 69px; } @@ -774,7 +755,7 @@ } } .boe-qa-index{ - width: 254px; + height: 276px; margin-right: 36px; padding: 30px; @@ -894,60 +875,47 @@ @media screen and (max-width: 1920px) and (min-width: 1681px){ .xindex-content{ - width: 1690px; + width: 1690px; } .xindex-course{ - width: 400px; - padding: 30px; - margin-right: 30px; - margin-bottom: 30px; - border-radius: 8px; - .cor-praises { - right: 50px; - bottom: 26px; - } - .course-image-box{ - width: 340px; - height: 191x; - ::v-deep .course-image{ - height: 100% !important; - } - } + width: 400px; + padding: 30px; + margin-right: 30px; + margin-bottom: 30px; + border-radius: 8px; + .cor-praises { + right: 50px; + bottom: 26px; + } + .course-image-box{ + width: 340px; + height: 191x; + ::v-deep .course-image{ + height: 100% !important; + } + } } - .portal-right-box{ - width: 410px; - .course-index-list{ - height: 548px; - overflow-y: auto; - } - .case-index-list{ - height: 262px; - overflow-y: auto; - } - .anking-index-list{ - height: 425px; - overflow-y: auto; - } - .qa-index-qa{ - height: 188px; - overflow-y: auto; - } + .xindex-ranking-course{ + height: 646px; } - .boe-index{ - width: 410px; - padding: 30px; - margin-right: 36px; - margin-bottom: 36px; - border-radius: 8px; - .course-image-box{ - width: 350px; - height: 196x; - ::v-deep .course-image{ - height: 100% !important; - } - } + + .xindex-ranking-case{ + height: 300px; } + + .xindex-ranking-article{ + height: 455px; + } + + .xindex-ranking-qa{ + height:220px; + } + + .xindex-case { + padding-right: 30px; + } + .case-inter{ left: 20px; bottom:20px; @@ -958,166 +926,164 @@ width: 32px; height: 32px; } - } - .modules-list{ - margin-right: 36px; - } -.boe-case-index{ - width: 410px; - height: 396px; - margin-right: 36px; - .case-top{ - height: 120px; } - .case-conent{ - width: 350px; - height: 274px; - top:30px; - left:30px; - padding: 30px; - .time-one{ - padding:3px 10px; - } - .cast-time{ - margin-bottom: 14px; - } - .case-title{ - font-size: 16px; - height: 48px; - line-height: 24px; - margin-top: 20px; - } - .case-text{ - height: 60px; - font-size: 14px; - line-height: 20px; - margin-bottom: 30px; - } - + .modules-list{ + margin-right: 36px; } -} -.boe-qa-index{ - width: 298px; - height: 320px; - margin-right: 36px; - padding: 30px; - .qa-center{ - height: 152px; - margin-top: 10px; - padding: 20px; - .portal-index-title{ - font-weight: 600; - margin-bottom: 6px; - } - .boe-qa-sum{ - font-size: 14px; - line-height: 22px; - margin-top: 4px; - } - .qa-views{ - left: 20px; - bottom: 20px; - } - } - .qa-char{ - margin-top: 20px; - display: flex; - ::v-deep img{ - width: 34px; - height: 34px; - } - .info-name{ - font-size: 12px; - color: #6E7B84; - margin-left: 10px; - } + .boe-case-index{ + height: 396px; + .case-top{ + height: 120px; } - .qa-top{ - display: flex; - justify-content: space-between; - & span:first-child{ - background: rgba($color: #387DF7, $alpha: 0.05); - padding: 3px 10px; - border-radius: 4px; - font-size: 12px; - color: #387DF7; - } - span{ - font-size: 14px; - color: #6E7B84; - } - } -} -.boe-article-index{ - padding: 30px; - .article-card-left{ - width: 352px; - .article-info-index-summary{ - font-size: 14px; - font-weight: 400; - color: #6E7B84; - line-height: 20px; - } - .article-info-image-box{ - width: 352px; - height: 196px; - - } - .el-avatar{ - width: 32px !important; - height: 32px !important; + .case-conent{ + width: 350px; + height: 274px; + top:30px; + left:30px; + padding: 30px; + .time-one{ + padding:3px 10px; } - } - .article-card-right{ - .article-li{ - // height: 160px; - display: flex; - width: 100%; - .article-img{ - flex: 43%; - width: 252px; - height: 144px; - border-radius: 4px; - margin-right: 10px; - img{ - width: 252px; - height: 144px; - border-radius: 4px; - } - } - .article-right{ - flex: 100%; - .article-info-title{ - font-size: 16px; - font-weight: 600; - color: #00253E; - margin-bottom: 12px; - margin-top: 10px; - // width: 50%; - } - .article-info-summary{ + .cast-time{ + margin-bottom: 14px; + } + .case-title{ + font-size: 16px; + height: 48px; + line-height: 24px; + margin-top: 20px; + } + .case-text{ + height: 60px; + font-size: 14px; + line-height: 20px; + margin-bottom: 30px; + } + + } +} + .boe-qa-index{ + + height: 320px; + margin-right: 36px; + padding: 30px; + .qa-center{ + height: 152px; + margin-top: 10px; + padding: 20px; + .portal-index-title{ + font-weight: 600; + margin-bottom: 6px; + } + .boe-qa-sum{ + font-size: 14px; + line-height: 22px; + margin-top: 4px; + } + .qa-views{ + left: 20px; + bottom: 20px; + } + } + .qa-char{ + margin-top: 20px; + display: flex; + ::v-deep img{ + width: 34px; + height: 34px; + } + .info-name{ + font-size: 12px; + color: #6E7B84; + margin-left: 10px; + } + } + .qa-top{ + display: flex; + justify-content: space-between; + & span:first-child{ + background: rgba($color: #387DF7, $alpha: 0.05); + padding: 3px 10px; + border-radius: 4px; + font-size: 12px; + color: #387DF7; + } + span{ + font-size: 14px; + color: #6E7B84; + } + } + } + .boe-article-index{ + padding: 30px; + .article-card-left{ + width: 352px; + .article-info-index-summary{ font-size: 14px; font-weight: 400; color: #6E7B84; - // margin-bottom: 15px; - } - .article-bottom{ - display: flex; - justify-content: space-between; - ::v-deep .uavatar{ - width:34px; - height: 34px; - } - .el-avatar{ - width: 34px; - height: 34px; - } - } + line-height: 20px; } + .article-info-image-box{ + width: 352px; + height: 196px; - } - } -} + } + .el-avatar{ + width: 32px !important; + height: 32px !important; + } + } + .article-card-right{ + .article-li{ + // height: 160px; + display: flex; + width: 100%; + .article-img{ + flex: 43%; + width: 252px; + height: 144px; + border-radius: 4px; + margin-right: 10px; + img{ + width: 252px; + height: 144px; + border-radius: 4px; + } + } + .article-right{ + flex: 100%; + .article-info-title{ + font-size: 16px; + font-weight: 600; + color: #00253E; + margin-bottom: 12px; + margin-top: 10px; + // width: 50%; + } + .article-info-summary{ + font-size: 14px; + font-weight: 400; + color: #6E7B84; + // margin-bottom: 15px; + } + .article-bottom{ + display: flex; + justify-content: space-between; + ::v-deep .uavatar{ + width:34px; + height: 34px; + } + .el-avatar{ + width: 34px; + height: 34px; + } + } + } + + } + } + } } @media screen and (min-width: 1921px){ @@ -1142,40 +1108,25 @@ } } } + .xindex-ranking-course{ + height: 610px; + } - .portal-right-box{ - width: 410px; - .course-index-list{ - height: 548px; - overflow-y: auto; - } - .case-index-list{ - height: 262px; - overflow-y: auto; - } - .anking-index-list{ - height: 425px; - overflow-y: auto; - } - .qa-index-qa{ - height: 188px; - overflow-y: auto; - } + .xindex-ranking-case{ + height: 260px; } - .boe-index{ - width: 410px; - padding: 30px; - margin-right: 36px; - margin-bottom: 36px; - border-radius: 8px; - .course-image-box{ - width: 350px; - height: 196x; - ::v-deep .course-image{ - height: 100% !important; - } - } + + .xindex-ranking-article{ + height: 420px; } + + .xindex-ranking-qa{ + height:188px; + } + .xindex-case { + padding-right: 30px; + } + .case-inter{ left: 20px; bottom:20px; @@ -1186,18 +1137,16 @@ width: 32px; height: 32px; } - } - .modules-list{ - margin-right: 36px; - } -.boe-case-index{ - width: 410px; - height: 396px; - margin-right: 36px; - .case-top{ - height: 120px; } - .case-conent{ + .modules-list{ + margin-right: 36px; + } + .boe-case-index{ + height: 396px; + .case-top{ + height: 120px; + } + .case-conent{ width: 350px; height: 274px; top:30px; @@ -1209,141 +1158,141 @@ .cast-time{ margin-bottom: 14px; } - .case-title{ - font-size: 16px; - height: 48px; - line-height: 24px; - margin-top: 20px; - } - .case-text{ + .case-title{ + font-size: 16px; + height: 48px; + line-height: 24px; + margin-top: 20px; + } + .case-text{ height: 60px; font-size: 14px; line-height: 20px; margin-bottom: 30px; - } + } - } -} -.boe-qa-index{ - width: 298px; - height: 320px; - margin-right: 36px; - padding: 30px; - .qa-center{ - height: 152px; - margin-top: 10px; - padding: 20px; - .portal-index-title{ - font-weight: 600; - margin-bottom: 6px; - } - .boe-qa-sum{ - font-size: 14px; - line-height: 22px; - margin-top: 4px; - } - .qa-views{ - left: 20px; - bottom: 20px; - } - } - .qa-char{ - margin-top: 20px; - display: flex; - ::v-deep img{ - width: 34px; - height: 34px; - } - .info-name{ - font-size: 12px; - color: #6E7B84; - margin-left: 10px; - } } - .qa-top{ - display: flex; - justify-content: space-between; - & span:first-child{ - background: rgba($color: #387DF7, $alpha: 0.05); - padding: 3px 10px; - border-radius: 4px; - font-size: 12px; - color: #387DF7; - } - span{ - font-size: 14px; - color: #6E7B84; - } - } -} -.boe-article-index{ - padding: 30px; - .article-card-left{ - width: 352px; - .article-info-index-summary{ - font-size: 14px; - font-weight: 400; - color: #6E7B84; - line-height: 20px; - } - .article-info-image-box{ - width: 352px; - height: 196px; + } + .boe-qa-index{ - } - .el-avatar{ - width: 32px !important; - height: 32px !important; + height: 320px; + margin-right: 36px; + padding: 30px; + .qa-center{ + height: 152px; + margin-top: 10px; + padding: 20px; + .portal-index-title{ + font-weight: 600; + margin-bottom: 6px; } + .boe-qa-sum{ + font-size: 14px; + line-height: 22px; + margin-top: 4px; + } + .qa-views{ + left: 20px; + bottom: 20px; + } + } + .qa-char{ + margin-top: 20px; + display: flex; + ::v-deep img{ + width: 34px; + height: 34px; + } + .info-name{ + font-size: 12px; + color: #6E7B84; + margin-left: 10px; + } + } + .qa-top{ + display: flex; + justify-content: space-between; + & span:first-child{ + background: rgba($color: #387DF7, $alpha: 0.05); + padding: 3px 10px; + border-radius: 4px; + font-size: 12px; + color: #387DF7; + } + span{ + font-size: 14px; + color: #6E7B84; + } + } } - .article-card-right{ - .article-li{ - // height: 160px; - display: flex; - width: 100%; - .article-img{ - flex: 43%; - width: 252px; - height: 144px; - border-radius: 4px; - margin-right: 10px; - img{ - width: 252px; - height: 144px; - border-radius: 4px; - } - } - .article-right{ - flex: 100%; - .article-info-title{ - font-size: 16px; - font-weight: 600; - color: #00253E; - margin-bottom: 12px; - margin-top: 10px; - // width: 50%; - } - .article-info-summary{ + .boe-article-index{ + padding: 30px; + .article-card-left{ + width: 352px; + .article-info-index-summary{ font-size: 14px; font-weight: 400; color: #6E7B84; - // margin-bottom: 15px; - } - .article-bottom{ - display: flex; - justify-content: space-between; - ::v-deep .uavatar{ - width:34px; - height: 34px; - } - .el-avatar{ - width: 34px; - height: 34px; - } - } + line-height: 20px; } + .article-info-image-box{ + width: 352px; + height: 196px; - } - } -} + } + .el-avatar{ + width: 32px !important; + height: 32px !important; + } + } + .article-card-right{ + .article-li{ + // height: 160px; + display: flex; + width: 100%; + .article-img{ + flex: 43%; + width: 252px; + height: 144px; + border-radius: 4px; + margin-right: 10px; + img{ + width: 252px; + height: 144px; + border-radius: 4px; + } + } + .article-right{ + flex: 100%; + .article-info-title{ + font-size: 16px; + font-weight: 600; + color: #00253E; + margin-bottom: 12px; + margin-top: 10px; + // width: 50%; + } + .article-info-summary{ + font-size: 14px; + font-weight: 400; + color: #6E7B84; + // margin-bottom: 15px; + } + .article-bottom{ + display: flex; + justify-content: space-between; + ::v-deep .uavatar{ + width:34px; + height: 34px; + } + .el-avatar{ + width: 34px; + height: 34px; + } + } + } + + } + } + } } diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index c97eb218..dbe90c96 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -257,7 +257,12 @@ body {margin: 0px;padding: 0px;} width: 260px; } .portal-ranking{ - padding: 30px 15px; + padding: 20px 15px; + .ranking-title{ + font-size: 18px; + line-height: 25px; + padding-bottom:10px + } } .course-card { padding:20px; diff --git a/src/views/Index.vue b/src/views/Index.vue index 0341f730..4ce39275 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -56,9 +56,8 @@ 查看更多
-
- - +
+
@@ -112,18 +111,12 @@

课程排行榜

-
    -
  • +
      +
    • - {{ item.name }} - - - {{ item.name }} - + {{ item.name }}
      @@ -160,8 +153,8 @@
      -
        -
      • +
        +

        @@ -190,16 +183,15 @@

        -
        • -
      +
      +
-
+

案例排行榜

-
    -
  • +
      +
    • @@ -292,34 +284,6 @@
- - - - - - - - - - -
@@ -327,11 +291,11 @@
-
+

文章排行榜

-
    -
  • +
      +
    • @@ -357,8 +321,8 @@
-
    -
  • +
    +

    {{qa.views}}正在关注{{ qa.sysCreateTime.substring(0, 10) }}

    {{ qa.title }}

    @@ -376,17 +340,16 @@

    -
    • -
+
+
-
+
-
+

问答排行榜

-
    -
  • +
      +
    • @@ -1197,10 +1160,10 @@ -webkit-box-orient: vertical; } - .case-box { - display: flex; + // .case-box { + // display: flex; - .case-index { + .case-index { position: relative; // width: 408px; // height: 396px; @@ -1296,7 +1259,7 @@ } } } - } + //} .casetwo { border: 1px solid #F0F0F0; @@ -1591,41 +1554,6 @@ // font-size: 30px; } - .cardmark { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: rgba(101, 101, 101, 0.8); - pointer-events: none; - border-radius: 5px; - padding: 10px; - opacity: 0; - -webkit-transition: all 1.5s; - -moz-transition: all 1.5s; - -ms-transition: all 1.5s; - -o-transition: all 1.5s; - transition: all 1.5s; - - .cardmark-name { - font-size: 18px; - line-height: 30px; - font-weight: 600; - color: #fff; - } - - .cardmark-info { - color: #fff; - font-size: 14px; - line-height: 20px; - } - } - - .course-card:hover .cardmark { - opacity: 1; - } - .modules { margin-top: 20px; // width: 100%; @@ -1878,8 +1806,7 @@ } } - .qa-box { - display: flex; + .qa-card { // width: 298px; @@ -1935,7 +1862,7 @@ display: flex; } } - } + } } From 70d3de93a0925dfe257fb4d14a0681a689950f60 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 8 Oct 2022 15:13:52 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 9dcc50a7..ecbcfb73 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -3,7 +3,7 @@
      我的U币:{{uinfo.uCurrency}}
      U币规则 - 导出记录 + 导出记录
      From 2905eb5676870a8bbf3019b269948867d146efc7 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:16:05 +0800 Subject: [PATCH 06/35] =?UTF-8?q?=E5=8E=BB=E6=8E=89xcontent2=E7=9A=84?= =?UTF-8?q?=E5=86=85=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 28 ++++++++++++++-------------- src/assets/styles/portal.scss | 4 ---- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 84ce846d..8b33e696 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -338,20 +338,20 @@ .pink-three{ color: #EE4685; } -.list-bg{ - background: url('/images/qa-box.png') no-repeat 100% / 100%; - // background: linear-gradient(180deg, #C3DEF8 0%, #FFFFFF 37%); -} -.list-bg1{ - background: url('/images/list-or.png') no-repeat 100% / 100%; -} -.list-bg2{ - background: url('/images/list-pink.png') no-repeat 100% / 100%; -} -.art-bgimg{ - background: url('/images/contribute.png') no-repeat top left; - background-size: cover; - } +// .list-bg{ +// background: url('/images/qa-box.png') no-repeat 100% / 100%; +// // background: linear-gradient(180deg, #C3DEF8 0%, #FFFFFF 37%); +// } +// .list-bg1{ +// background: url('/images/list-or.png') no-repeat 100% / 100%; +// } +// .list-bg2{ +// background: url('/images/list-pink.png') no-repeat 100% / 100%; +// } +// .art-bgimg{ +// background: url('/images/contribute.png') no-repeat top left; +// background-size: cover; +// } .portal-images-title{ display: inline-block; vertical-align: top; diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index 3f8bfae1..e56b6d42 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -276,7 +276,6 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1366px){ .xcontent2{ width: 1100px; - padding: 20px 5px; } .xcontent2-minor{ width: 234px; @@ -302,7 +301,6 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1680px) and (min-width:1367px){ .xcontent2{ width: 1366px; - padding: 30px 20px; } .xcontent2-minor{ width: 300px; @@ -323,7 +321,6 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1920px) and (min-width: 1681px){ .xcontent2{ width: 1640px; - padding: 30px 26px; } .xcontent2-minor{ width: 400px; @@ -345,7 +342,6 @@ body {margin: 0px;padding: 0px;} @media screen and (min-width: 1921px){ .xcontent2{ width: 1880px; - padding: 30px 26px; } .xcontent2-minor{ width: 400px; From e64b06b30daab7a68c44eb0fa60f2893737cc1d2 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:19:46 +0800 Subject: [PATCH 07/35] =?UTF-8?q?=E6=9C=80=E5=A4=A7=E6=AC=BE=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index e56b6d42..903d428f 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -320,7 +320,7 @@ body {margin: 0px;padding: 0px;} @media screen and (max-width: 1920px) and (min-width: 1681px){ .xcontent2{ - width: 1640px; + width: 1690px; } .xcontent2-minor{ width: 400px; From e1a665730eb1172ac52cb534dac0a70c7325f049 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:31:06 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/guideBox.vue | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index fab31d75..c620b844 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -2,7 +2,7 @@
      @@ -20,8 +20,8 @@
      - -
      + +

      {{description}}

      进入首页
      @@ -65,22 +65,25 @@ navigation: { nextEl: '.swiper-button-next', prevEl: '.swiper-button-prev', - }, + }, }, } }, created() { + //这里必须放在当前的Session存储中，不能每次都调用 apiGuide.hasUser().then(res=>{ if(res.result) { - this.guideCollection = true; - } else { this.guideCollection = false; + } else { + this.guideCollection = true; + //只是在显示时才调用 + this.getlist(); } - }) - this.getlist(); + }); + }, mounted() { - + }, methods:{ goHome() { @@ -94,14 +97,14 @@ } }) }, - + showImg(item) { this.resonimg = []; if(item){ this.description = item.description; this.resonimg = item.images; } - + // this.swiper.update(); }, notYet() { @@ -110,7 +113,7 @@ }, }, watch:{ - + }, computed:{ swiper() { @@ -135,7 +138,7 @@ right:-136px; top:45px; } - + ::v-deep .swiper-wrapper{ padding-bottom: 60px; } @@ -213,7 +216,7 @@ } } ::v-deep .el-dialog{ - // background: #fff url('/images/homeWu/interest.png') no-repeat; + // background: #fff url('/images/homeWu/interest.png') no-repeat; border-radius: 10px; .el-dialog__header{ display: none; From 64017b542e06467f416dbac102c79c71c3ba1b08 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 8 Oct 2022 15:33:13 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index cbefcd5e..1ddfdf28 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -142,7 +142,7 @@ {{ item.name }} - + {{ item.name }} @@ -187,7 +187,7 @@ {{ item.name }} - + {{ item.name }} @@ -232,7 +232,7 @@ {{ item.courseName }} - + {{ item.courseName }}
      From b4baa1a2953c81adfa1ab2e5a7078a2cf420c5bf Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:35:48 +0800 Subject: [PATCH 10/35] =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 11 ++++++++++- src/assets/styles/portal.scss | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 8b33e696..757860db 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -688,6 +688,9 @@ } } + .xindex-ranking-li{ + margin-top:20px; + } .xindex-ranking-course{ height: 535px; } @@ -895,7 +898,9 @@ } } } - + .xindex-ranking-li{ + margin-top:30px; + } .xindex-ranking-course{ height: 646px; } @@ -1108,6 +1113,10 @@ } } } + + .xindex-ranking-li{ + margin-top:30px; + } .xindex-ranking-course{ height: 610px; } diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index 903d428f..59e632e0 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -325,7 +325,6 @@ body {margin: 0px;padding: 0px;} .xcontent2-minor{ width: 400px; } - .portal-ranking{ padding: 30px 30px; } From 34aea2cd7cbdb3a311ba7e3e57f474242ba61170 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:48:08 +0800 Subject: [PATCH 11/35] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal-index.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 757860db..f51ddf7d 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -187,7 +187,7 @@ .xindex-ranking-course{ margin: 0px; padding: 0px; - overflow-y: auto; + //overflow-y: auto; } .xindex-ranking-case{ @@ -1113,7 +1113,7 @@ } } } - + .xindex-ranking-li{ margin-top:30px; } From 402734e40dda76a0826dacd3f8138dc01fb2f4e5 Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 15:58:41 +0800 Subject: [PATCH 12/35] =?UTF-8?q?=E5=B7=A6=E8=BE=B9=E6=9C=80=E5=B0=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA260px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/portal.scss | 2 +- src/views/portal/course/Index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index 59e632e0..f0d29bcb 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -278,7 +278,7 @@ body {margin: 0px;padding: 0px;} width: 1100px; } .xcontent2-minor{ - width: 234px; + width: 260px; } .portal-ranking{ padding: 20px 15px; diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 1ddfdf28..a6830b0c 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -452,6 +452,7 @@ export default { .clientHeight; let outerHeight = document.documentElement.clientHeight; let scrollTop = document.documentElement.scrollTop; + let outerWidth = document.querySelector(".xcontent2-minor").clientWidth; if (outerHeight + scrollTop + 350 >= innerHeight) { if (this.moreState == 1 && this.course.pageIndex < 4) { this.loadMore(); @@ -459,7 +460,7 @@ export default { } if (scrollTop > 830) { document.querySelector("#fixd-box").style.cssText = - "position: fixed;top: -914px;"; + "position: fixed;top: -914px;width:"+outerWidth+"px"; } else { document.querySelector("#fixd-box").style.cssText = "position: static"; } From 61f6496d0484e679ed6e8b6315f8567f101851ed Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Sat, 8 Oct 2022 17:04:55 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/ellipsis.scss | 2 +- src/assets/styles/portal-index.scss | 1 - src/assets/styles/portal.scss | 20 ++++++++++++++++++++ src/views/portal/course/Index.vue | 17 ++++++++++------- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/assets/styles/ellipsis.scss b/src/assets/styles/ellipsis.scss index d27f1fb8..e5f1dd3d 100644 --- a/src/assets/styles/ellipsis.scss +++ b/src/assets/styles/ellipsis.scss @@ -18,7 +18,7 @@ overflow: hidden; text-overflow:ellipsis; -webkit-box-orient: vertical; - -webkit-line-clamp: 2; + -webkit-line-clamp:2; } .index-one-line-ellipsis{ display: -webkit-box; diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index f51ddf7d..9857fe1d 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -353,7 +353,6 @@ // background-size: cover; // } .portal-images-title{ - display: inline-block; vertical-align: top; padding: 2px 12px; line-height: 24px; diff --git a/src/assets/styles/portal.scss b/src/assets/styles/portal.scss index f0d29bcb..b51d50a5 100644 --- a/src/assets/styles/portal.scss +++ b/src/assets/styles/portal.scss @@ -277,6 +277,11 @@ body {margin: 0px;padding: 0px;} .xcontent2{ width: 1100px; } + .rankimg{ + width:66px; + height:38px; + float: left; + } .xcontent2-minor{ width: 260px; } @@ -302,6 +307,11 @@ body {margin: 0px;padding: 0px;} .xcontent2{ width: 1366px; } + .rankimg{ + width:76px; + height:42px; + float: left; + } .xcontent2-minor{ width: 300px; } @@ -322,6 +332,11 @@ body {margin: 0px;padding: 0px;} .xcontent2{ width: 1690px; } + .rankimg{ + width:86px; + height:42px; + float: left; + } .xcontent2-minor{ width: 400px; } @@ -342,6 +357,11 @@ body {margin: 0px;padding: 0px;} .xcontent2{ width: 1880px; } + .rankimg{ + width:96px; + height:52px; + float: left; + } .xcontent2-minor{ width: 400px; } diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index a6830b0c..4a0a0834 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -142,14 +142,15 @@ {{ item.name }} - + {{ item.name }}
      - + + 录播 线下课 学习项目 @@ -187,14 +188,15 @@ {{ item.name }} - + {{ item.name }}
      - + + 录播 线下课 学习项目 @@ -231,14 +233,15 @@ {{ item.courseName }} - - + + {{ item.courseName }}
      - + + 录播 线下课 学习项目 From 5cb503c9e75627a30c9d7c6c86356392235d989d Mon Sep 17 00:00:00 2001 From: daihh Date: Sat, 8 Oct 2022 17:16:02 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/uc.scss | 1 + src/components/PortalHeader.vue | 32 +++++++-------- src/components/UcHeader/Index.vue | 60 +++-------------------------- src/layout/components/AppMain.vue | 32 +++++++++++++-- src/views/portal/article/Detail.vue | 2 +- src/views/portal/article/Index.vue | 2 +- src/views/portal/qa/Answer.vue | 2 +- src/views/portal/qa/Index.vue | 2 +- 8 files changed, 55 insertions(+), 78 deletions(-) diff --git a/src/assets/styles/uc.scss b/src/assets/styles/uc.scss index f1db6c34..bf1479bf 100644 --- a/src/assets/styles/uc.scss +++ b/src/assets/styles/uc.scss @@ -1,6 +1,7 @@ /** * 用户中心的一些通用样式，定义在这里面 */ + .uc-center-page{ font-size: 18px; font-weight: 600; diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index c135396c..83e9d3c0 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -1,6 +1,6 @@ @@ -184,7 +134,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; this.uinfo.uCurrency = item.total; } }); - } + } }) }, setCurIdentity(iden){ @@ -254,7 +204,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; vertical-align: top; } } - + .medalbutt{ color: #333333; font-size: 14px; @@ -262,10 +212,10 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; // float: left; margin-top: 6px; } - + } .personalData{ - + flex: 1; padding-top: 40px; padding-left: 115px; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 5ffa877b..8729b3bc 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,12 +1,12 @@