Merge branch 'dev' of http://git.dayaedu.com/huangqiyong/classroom

src/views/coursewarePlay/coursewarePlay.vue

@@ -5,7 +5,7 @@
 -->
 <template>
    <div class="coursewarePlay" :class="{ hideController: !isShowController }">
-      <div class="coursewarePlayCon" @mousemove="handleMousemove" @click="handleClick">
+      <div class="coursewarePlayCon" @mousemove="handleMousemove" @click="handleClick" @touchstart="handleClick">
          <videoPlay
             v-show="fileType === 'VIDEO'"
             ref="videoPlayDom"
@@ -300,6 +300,7 @@ function handleMousemove() {
    showController()
 }
 function handleClick() {
+   console.log(2333)
    fileType.value === "VIDEO" && isShowController.value && handleVideoPlay()
    showController()
 }

src/views/coursewarePlay/videoPlay/videoPlay.vue

@@ -13,7 +13,7 @@
       tabindex="-1"
    >
       <video class="videoPlayBox" :id="videoId" preload="auto" playsinline webkit-playsinline></video>
-      <div class="videoController" @click.stop>
+      <div class="videoController" @click.stop @touchstart.stop>
          <div class="timeController">{{ `${formatTime(timeController.currentTime)} / ${formatTime(timeController.duration)}` }}</div>
          <n-slider
             class="sliderController"