diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue index f4c9c37c..96b9d553 100644 --- a/src/components/HomePage/courseList.vue +++ b/src/components/HomePage/courseList.vue @@ -15,7 +15,12 @@
-
{{item.info.courseName || item.contentInfo}} {{toScore(item.info.lastScore)}}分
+
{{item.info.courseName || item.contentInfo}} + {{sysTypeName(item.info.sysType1)}} + {{sysTypeName(item.info.sysType2)}} + {{sysTypeName(item.info.sysType3)}} + {{toScore(item.info.lastScore)}}分 +

{{item.info.summary}}

当前进度:

最新一次学习时间:{{item.eventTime}}

@@ -55,7 +60,7 @@ } }, computed:{ - ...mapGetters(['curIdentity','identity','userInfo']), + ...mapGetters(['curIdentity','identity','userInfo','sysTypeMap']), }, components: { courseImage, @@ -82,6 +87,10 @@ this.pageId = this.$xpage.getHomeId(this.$route); }, methods:{ + sysTypeName(code){ + if(code==''){return '';} + return this.sysTypeMap.get(code); + }, emitHide(id) { this.$emit('hideIndex',id) }, @@ -111,6 +120,18 @@ margin: 0; font-size: 18px !important; line-height: 25px; + .sysType-name{ + display: inline-block; + padding:0px 8px; + // margin-top: 5px; + line-height: 24px; + font-size: 12px; + border-radius:2px; + margin-right: 8px; + color: #2C68FF; + height: 24px; + background: rgba(44,104,255,0.06); + } } .title-info{ font-size: 14px; diff --git a/src/components/Portal/guideBox.vue b/src/components/Portal/guideBox.vue index b0113d75..9514bbb6 100644 --- a/src/components/Portal/guideBox.vue +++ b/src/components/Portal/guideBox.vue @@ -17,13 +17,13 @@
- +
-
+
@@ -71,8 +71,8 @@ delay: 2000, }, speed: 2000, //切换速度,即slider自动滑动开始到结束的时间(单位ms) - loop:true, //循环切换 - observe:true, + initialSlide:1, + loop:false, //循环切换 peed: 300,//循环速度 scrollbar: '.swiper-scrollbar', pagination: { @@ -90,7 +90,6 @@ created() { //这里的以后要去掉的,不应该是这样计算的 let width = document.body.clientWidth; - console.log(width,'width'); if(width > 1921) { this.dlgWidth = '1088px'; this.leftWidth='220px'; @@ -121,6 +120,7 @@ }, mounted() { this.getlist(); + // this.swiper.slideTo(3,2000,false); }, methods:{ show(){ @@ -152,7 +152,6 @@ } else { this.resonimgTow = item.images; } - } }, notYet() {