diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss index 27b3a2e9..688e8336 100644 --- a/src/assets/styles/portal-index.scss +++ b/src/assets/styles/portal-index.scss @@ -7,6 +7,10 @@ margin: 26px auto; } +.xindex-main{ + padding-right: 20px; +} + // 课程卡片 .xindex-course{ display: inline-block; @@ -20,16 +24,7 @@ position: relative; background-color: #ffffff; border-radius: 8px; - .cor-praises { - position: absolute; - right: 50px; - bottom: 20px; - .interact-bar-btn{ - .interact-bar-value{ - display: none; - } - } - } + .xindex-course-image{ position: relative; @@ -143,9 +138,10 @@ } .course-score-no { text-align: right; + padding-left: 10px; font-size: 14px; color: #6B7C85; - line-height: 30px; + //line-height: 30px; -moz-user-select: none; /*火狐*/ -webkit-user-select: none; /*webkit浏览器*/ -ms-user-select: none; /*IE10*/ @@ -156,7 +152,7 @@ font-size: 14px; // margin-top: 5px; margin-left: 32px; - line-height: 30px; + //line-height: 30px; color: #FA6400; font-family: 'Arial'; -moz-user-select: none; /*火狐*/ @@ -213,9 +209,9 @@ .xindex-case { display: inline-block; vertical-align: top; - width: 30.33%; - margin-right: 20px; - // padding-right: 20px; + width: 33.33%; + //margin-right: 20px; + padding-right: 20px; } .xindex-qa { @@ -442,6 +438,9 @@ .xindex-content{ width: 1100px; } + .xindex-main{ + padding-right: 20px; + } .personal-panel{ width: 300px; height: 320px; @@ -450,19 +449,17 @@ margin-left: 0px; margin-top: 0px; margin-bottom: 0px; + } + } - - } + //课程卡片样式 .xindex-course{ width: 255px; padding: 20px; margin-right: 20px; margin-bottom: 20px; - .cor-praises { - right: 40px; - bottom: 16px; - } + .course-image-box{ width: 220px; height: 123px; @@ -475,7 +472,7 @@ margin-top:15px; } .xindex-ranking-course{ - height: 450px; + height: 460px; } .xindex-ranking-case{ @@ -493,20 +490,9 @@ .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; - // } - // } + .xindex-qa { + } - // } .case-inter{ left: 20px; bottom:20px; @@ -518,9 +504,7 @@ height: 22px; } } - .modules-list{ - margin-right: 20px; - } + .boe-case-index{ height: 246px; margin-right: 20px; @@ -608,6 +592,7 @@ } .boe-article-index{ padding: 17px; + margin-right: 20px; .article-card-left{ width: 200px; .article-info-index-summary{ @@ -686,9 +671,12 @@ @media screen and (max-width: 1680px) and (min-width:1367px){ .xindex-content{ width: 1366px; + } + .xindex-main{ + padding-right: 0px; } .personal-panel{ - width: 356px; + width: 356px; height: 370px; padding: 30px 45px; .personal-box{ @@ -698,14 +686,10 @@ } } .xindex-course{ - width: 320px; + width: 332px; padding: 25px; margin-right: 20px; margin-bottom: 20px; - .cor-praises { - right: 50px; - bottom: 20px; - } .course-image-box{ width: 280px; height: 100px; @@ -719,7 +703,7 @@ margin-top:20px; } .xindex-ranking-course{ - height: 535px; + height: 532px; } .xindex-ranking-case{ @@ -737,7 +721,8 @@ .xindex-case { // padding-right: 20px; } - + .xindex-qa { + } .case-inter{ left: 20px; bottom:20px; @@ -761,7 +746,7 @@ width: 290px; height: 250px; top:30px; - left:15px; + left:20px; padding: 20px; .time-one{ padding:3px 10px; @@ -834,6 +819,7 @@ } .boe-article-index{ padding: 30px; + margin-right: 20px; .article-card-left{ width: 250px; .article-info-index-summary{ @@ -910,8 +896,11 @@ .xindex-content{ width: 1690px; } + .xindex-main{ + padding-right: 0px; + } .personal-panel{ - width: 356px; + width: 356px; height: 370px; padding: 30px 45px; .personal-box{ @@ -925,10 +914,7 @@ margin-right: 30px; margin-bottom: 30px; border-radius: 8px; - .cor-praises { - right: 50px; - bottom: 26px; - } + .course-image-box{ width: 340px; height: 191x; @@ -957,9 +943,11 @@ } .xindex-case { - // padding-right: 30px; + padding-right: 30px; + } + .xindex-qa { + padding-right: 30px; } - .case-inter{ left: 20px; bottom:20px; @@ -972,7 +960,7 @@ } } .modules-list{ - margin-right: 36px; + margin-right: 0px; } .boe-case-index{ height: 396px; @@ -983,7 +971,7 @@ width: 350px; height: 274px; top:30px; - left:15px; + left:24px; padding: 30px; .time-one{ padding:3px 10px; @@ -1060,6 +1048,7 @@ } .boe-article-index{ padding: 30px; + margin-right: 30px; .article-card-left{ width: 352px; .article-info-index-summary{ @@ -1137,16 +1126,15 @@ .xindex-content{ width: 1880px; } + .xindex-main{ + padding-right: 36px; + } .xindex-course{ width: 410px; padding: 30px; margin-right: 36px; margin-bottom: 36px; border-radius: 8px; - .cor-praises { - right: 50px; - bottom: 26px; - } .course-image-box{ width: 350px; height: 196x; @@ -1278,6 +1266,7 @@ } .boe-article-index{ padding: 30px; + margin-right: 36px; .article-card-left{ width: 352px; .article-info-index-summary{ diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 0b04846e..d55997c1 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -71,11 +71,10 @@ 个人中心 -->
- + - - + @@ -105,8 +104,7 @@
-
{{userInfo.name}}
-
{{userInfo.name}}
+
{{userInfo.name}}
个人中心 @@ -115,11 +113,9 @@
-
- 登出 -
-
- 登出 + +
+ 登出
@@ -151,7 +147,7 @@ export default { default: 0, } }, - + // components:{InterestCollection,GuideBox}, // 注释兴趣爱好弹窗显示 computed: { ...mapGetters(['userInfo', 'userMsg','identity']), @@ -383,19 +379,19 @@ export default { .person-action-index{ //margin-left: 40px; - font-size: 14px; - font-weight: 600; + font-size: 16px; + font-weight: 400; } - ::v-deep .message-count{ - //margin-right: 20px; - i{ - font-size: 26px; - color:#409EFF; - } - // ::v-deep .el-badge__content.is-fixed { - // right: 48px; + // ::v-deep .message-count{ + // //margin-right: 20px; + // i{ + // font-size: 26px; + // color:#409EFF; // } - } + // // ::v-deep .el-badge__content.is-fixed { + // // right: 48px; + // // } + // } ::v-deep.el-avatar{ margin-right: 8px; img{ diff --git a/src/icons/svg/messfff.svg b/src/icons/svg/messfff.svg index 5f58fda6..c4b2e0fa 100644 --- a/src/icons/svg/messfff.svg +++ b/src/icons/svg/messfff.svg @@ -1,23 +1 @@ - - - 消息 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/icons/svg/white-out.svg b/src/icons/svg/white-out.svg index 46628dc4..8e1db067 100644 --- a/src/icons/svg/white-out.svg +++ b/src/icons/svg/white-out.svg @@ -1,12 +1 @@ - - - 退出 - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/Index.vue b/src/views/Index.vue index fe90eedc..8675708a 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -18,18 +18,21 @@

{{userInfo.name}} {{userInfo.userNo}} - LV.1 + {{userData.level}}

{{userInfo.departName}}

- -
代办3个待处理
- + +
+ 代办 + {{studyTaskCount? studyTaskCount:0 }} 个待处理 + +
+ @@ -47,7 +50,7 @@
-
+
推荐课程 最热 @@ -62,7 +65,7 @@ 查看更多
-
+
@@ -78,7 +81,7 @@
- 5.0 + 5.0分
@@ -100,18 +103,19 @@ {{course.studiesFormat}}人学习 {{course.studiesFormat}}+人学习
-
+
+
+ + +
- {{ toScore(course.score) }} + {{ toScore(course.score) }}分
未评分
 -
- - -
+
@@ -152,7 +156,7 @@
-
+
推荐案例 最热 @@ -216,7 +220,7 @@
-
+
推荐文章 @@ -304,7 +308,7 @@
-
+

文章排行榜

    @@ -322,7 +326,7 @@
-
+
推荐问答 @@ -361,7 +365,7 @@
-
+

问答排行榜

  • @@ -434,12 +438,15 @@ InterestCollection, GuideBox }, - computed: { - ...mapGetters(['userInfo']) + created() { + this.$store.dispatch('refrashStudyTaskCount'); }, data() { return { - userData: {}, + userData: { + uvalue:0, + totalStudyHour:0 + }, userInfo: {}, ankingList: [], answersList: [], @@ -512,17 +519,10 @@ this.getQaAnswers(); }, computed: { - + ...mapGetters(['userInfo','studyTaskCount']), swiper() { return this.$refs.mySwiper.swiper } - - }, - created() { - // undefined - // this.$nextTick(() => { - // console.log(this.$refs.bannimg) //获取到正确元素 - // }) }, methods: { jumstudy(){ @@ -538,6 +538,7 @@ apiStart.getUserStatTotalInfo(this.userInfo.aid).then(res => { if (res.status == 200) { this.userData = res.result; + //console.log(this.userData,'this.userData') } }); }, @@ -1402,33 +1403,6 @@ position: relative; background-color: #ffffff; - // ::v-deep .cor-praises { - // position: absolute; - // right: 52px; - // bottom: 24px; - // // -moz-user-select: none; /*火狐*/ - // // -webkit-user-select: none; /*webkit浏览器*/ - // // -ms-user-select: none; /*IE10*/ - // // -khtml-user-select: none; /*早期浏览器*/ - // // user-select: none; - // .interact-bar-btn{ - // .interact-bar-value{ - // display: none; - // } - // } - // } - // .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-image-box { position: relative; @@ -1568,41 +1542,6 @@ } } - .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; - } - .modules { margin-top: 20px; // width: 100%; @@ -1657,7 +1596,7 @@ .more { float: right; margin-top: 7px; - margin-right: 40px; + margin-right: 30px; color: #333333; font-size: 14px; } @@ -1741,7 +1680,7 @@ } .article-card { - width: 100%; + //width: 100%; background: #fff; // padding: 30px; border-radius: 8px;