Merge branch 'master' into stage-4

pages3/course/detail.vue

@@ -28,7 +28,7 @@
 					</view>
 					<view style="display: flex;justify-content: space-between;margin-top: 13rpx;">
 						<view class="noteTag"><image src="/static/icon/wk_icon1.png" class="wk_icon"></image>
-						共 <text class="blackFont">{{detail.subjectNum}} 科 {{detail.classHours}}</text> 学时</view>
+						共 <text class="blackFont">{{courseList.length}} 课程 {{detail.classHours}}</text> 学时</view>
 						
 					</view>
 				</view>