Merge branch 'master' into stage-5

# Conflicts:
#	pages3/course/detail.vue

pages3/course/detail.vue

@@ -45,7 +45,7 @@
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
 			</view>
 		</view>
-		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;d" v-show="current==1">
+		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;" v-show="current==1">
 			<view >
 				<view v-for="(item,index) in courseList" :key="index" >
 					<view class="courseItemBox" >