Merge branch 'zcwy0428-zsx' into dev0731

# Conflicts:
#	unpackage/dist/build/h5/index.html

pages/lecturer/certification/info.vue

@@ -1,10 +1,10 @@
 <template>
   <view class="main">
     <u-toast ref="uToast"></u-toast>
-	<view class="back-icon"  @click="back()">
+	<!--<view class="back-icon"  @click="back()">
 		<u-icon style="position: absolute;" name="arrow-left"></u-icon>
 		<text class="back-icon-title">讲师信息</text>
-	</view>
+	 </view> -->
     <u-modal :show="showFlag" :closeOnClickOverlay="true" :showCancelButton="true" @cancel="hideDialog" @confirm="submit" :content="scoreNum>=80?'您给讲师打的分数是'+scoreNum+'分， 是否确认提交?':'您给讲师打的分数是'+scoreNum+'分， 低于认证通过的标准80分， 是否确认提交？'"></u-modal>
  <div class="info">
    <div class="info_top">

pages/lecturer/certification/list.vue

@@ -1,10 +1,10 @@
 <template>
        <view class="ranking-list-info">
 			<u-toast ref="uToast"></u-toast>
-			<view class="back-icon">
-				   <!-- <u-icon style="position: absolute;" name="arrow-left"></u-icon> -->
+			<!-- view class="back-icon">
+				   <u-icon style="position: absolute;" name="arrow-left"></u-icon>
 				   <text class="back-icon-title">讲师信息</text>
-			</view>
+			</view> -->
 			<view class="ranking-list-box">
 				   <view class="main">
 						   <view class="tip" v-if="lecturersList.length">请选择您要评分的讲师（共{{lecturersList.length}}位）</view>

pages/study/courseStudy.vue

@@ -19,6 +19,7 @@
 							@ended="onPlayerEnded"
 							@timeupdate="onPlayerPlaying"
 							@fullscreenchange="onFullScreen"
+              :drag="curriculumData.isDrag"
 							style="width: 100%; object-fit: fill">
 						></video-player>
 						<view class="player-box" v-if="playerBoxShow">