Merge branch 'xqy_double' into dev

components/course/courseModule.vue

@@ -12,7 +12,7 @@
 		</view>
 		<view v-show="!down">
 			<view v-for="(itemM,indexM) in list" :key="indexM">
-				<courseChapter :orderGoodsId="orderGoodsId"
+				<courseChapter v-if='itemM.type != 2' :orderGoodsId="orderGoodsId"
 						:isLive="isLive" :preItem="list[indexM - 1] || preItem" :sectionMaxNum="sectionMaxNum" :needOpen="needOpen" @playEnd="playEnd($event)" @toDo="toDo($event)" :courseId="courseId" :learningOrder="learningOrder" :goodsId="goodsId" :isBuy="isBuy" :gradeId="gradeId" :isRebuild="isRebuild"  :menuItem="itemM" :levelId="levelId+'-'+itemM.chapterId"></courseChapter>
 				<u-line v-if="indexM<list.length-1"></u-line>
 			</view>

pages3/course/detail.vue

@@ -916,16 +916,18 @@ export default {
 	// 老师名字样式
 .teacher_names {
 	display: flex;
-	margin-bottom: 10rpx;
+	padding-bottom: 15rpx;
+    border-bottom: 2rpx solid #F0F0F0;
 	.names {
-		padding: 12rpx 16rpx;
-		font-size: 24rpx;
-		color: #666666;
-		background: #FFFFFF;
+		padding: 6rpx 12rpx;
+		font-size: 26rpx;
+		color: #969696;
+		background: #F8F8F8;
 		border-radius: 8rpx;
 		margin-right: 10rpx;
 		&.nactive {
 			color: #3F8DFD;
+			background: #F2F7FF;
 		}
 	}
 }

pages3/polyv/css/detail.scss

@@ -170,14 +170,15 @@
   display: flex;
   margin-bottom: 10rpx;
   .names {
-    padding: 12rpx 16rpx;
-    font-size: 24rpx;
-    color: #666666;
-    background: #FFFFFF;
-    border-radius: 8rpx;
-    margin-right: 10rpx;
-    &.nactive {
-      color: #3F8DFD;
-    }
+    padding: 6rpx 12rpx;
+		font-size: 26rpx;
+		color: #969696;
+		background: #F8F8F8;
+		border-radius: 8rpx;
+		margin-right: 10rpx;
+		&.nactive {
+			color: #3F8DFD;
+			background: #F2F7FF;
+		}
   }
 }

pages3/polyv/detail.vue

@@ -857,6 +857,7 @@ export default {
             //获取商品双师资模板
             this.getCourseTeacher(this.courseList)
           } else {
+            this.getCourseTeacher(this.courseList)
             this.toggleCourseShow = true
           }
           
@@ -1128,6 +1129,7 @@ export default {
       await this.originUnload()
 
       if (type) {
+        this.teacherIndex = this.teaIndex
         this.goodsTeacher.forEach((citem) => {
             if(citem.courseList.some(x => x.courseId == item.courseId)){
               this.teacherList = citem.teaList
@@ -1138,7 +1140,7 @@ export default {
       this.courseId = item.courseId
       this.gradeId = item.gradeId
       this.toggleCourseShow = false
-      this.teacherIndex = type ? this.teaIndex : 0
+      
       
       if (index == 0) {
         if (item.rebuild === 0) {