bayi 2 years ago
parent
commit
535784bb25

+ 0 - 3
components/videoPreview/index.less

@@ -100,7 +100,6 @@
       position: relative;
       position: relative;
       width: 100%;
       width: 100%;
       height: 422rpx;
       height: 422rpx;
-      pointer-events: auto;
 
 
       .maskBg {
       .maskBg {
         position: absolute;
         position: absolute;
@@ -145,8 +144,6 @@
       left: 0px;
       left: 0px;
       top: 0px;
       top: 0px;
       z-index: 2;
       z-index: 2;
-      pointer-events: none;
-
     }
     }
 
 
     .video {
     .video {

+ 4 - 2
components/videoPreview/index.wxml

@@ -40,6 +40,7 @@
   </view>
   </view>
   <!-- 视频 -->
   <!-- 视频 -->
   <view class="workContent" wx:if="{{!videoInfoCopy.userReadExtend||videoInfoCopy.userReadExtend.resourcesType==0}}">
   <view class="workContent" wx:if="{{!videoInfoCopy.userReadExtend||videoInfoCopy.userReadExtend.resourcesType==0}}">
+
     <!-- 审核中遮罩 -->
     <!-- 审核中遮罩 -->
     <view class="videoBox" wx:if="{{videoInfoCopy.userRead.status=='CHECK'&&videoInfoCopy.userRead.id!=currentId}}">
     <view class="videoBox" wx:if="{{videoInfoCopy.userRead.status=='CHECK'&&videoInfoCopy.userRead.id!=currentId}}">
       <view class="maskBg"></view>
       <view class="maskBg"></view>
@@ -53,8 +54,9 @@
       <image class="cover" src="{{videoInfoCopy.userRead.coverImg}}" />
       <image class="cover" src="{{videoInfoCopy.userRead.coverImg}}" />
     </view>
     </view>
     <!-- 视频水印 -->
     <!-- 视频水印 -->
-    <image src="{{videoInfoCopy.readMaskTemplate.imgPath}}" class="watermark"
-      wx:if="{{videoInfoCopy.userRead.status!='CHECK'}}" bindtap="playVideo" />
+    <!--   <image src="{{videoInfoCopy.readMaskTemplate.imgPath}}" class="watermark"
+      style="pointer-events:{{videoInfoCopy.userRead.status!='CHECK'&&videoInfoCopy.userRead.id!=currentId?'auto':'none'}}"
+      bindtap="playVideo" wx:if="{{videoInfoCopy.userRead.status!='CHECK'}}" /> -->
     <!-- 播放时渲染的video -->
     <!-- 播放时渲染的video -->
     <video class="video" id="myVideo" wx:if="{{videoInfoCopy.userRead.id==currentId}}"
     <video class="video" id="myVideo" wx:if="{{videoInfoCopy.userRead.id==currentId}}"
       src="{{videoInfoCopy.userRead.videoPath}}" autoplay="true" object-fit="contain">
       src="{{videoInfoCopy.userRead.videoPath}}" autoplay="true" object-fit="contain">

+ 0 - 2
components/videoPreview/index.wxss

@@ -86,7 +86,6 @@
   position: relative;
   position: relative;
   width: 100%;
   width: 100%;
   height: 422rpx;
   height: 422rpx;
-  pointer-events: auto;
 }
 }
 .work .workContent .videoBox .maskBg {
 .work .workContent .videoBox .maskBg {
   position: absolute;
   position: absolute;
@@ -126,7 +125,6 @@
   left: 0px;
   left: 0px;
   top: 0px;
   top: 0px;
   z-index: 2;
   z-index: 2;
-  pointer-events: none;
 }
 }
 .work .workContent .video {
 .work .workContent .video {
   width: 100%;
   width: 100%;

+ 13 - 0
pages/reading/index.less

@@ -13,11 +13,24 @@
     width: 100%;
     width: 100%;
     height: 422rpx;
     height: 422rpx;
     z-index: 10;
     z-index: 10;
+    pointer-events: auto;
+  }
+
+  .watermark {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 422rpx;
+    z-index: 10;
+    pointer-events: none;
   }
   }
 
 
   #myVideo {
   #myVideo {
     width: 100%;
     width: 100%;
     height: 422rpx;
     height: 422rpx;
+    pointer-events: auto;
+
   }
   }
 
 
   .audio {
   .audio {

+ 2 - 0
pages/reading/index.wxml

@@ -1,6 +1,8 @@
 <view class="readingBox">
 <view class="readingBox">
   <block wx:if="{{!videoInfo.userReadExtend||videoInfo.userReadExtend.resourcesType==0}}">
   <block wx:if="{{!videoInfo.userReadExtend||videoInfo.userReadExtend.resourcesType==0}}">
     <image src="{{videoInfo.userRead.coverImg}}" class='poster' wx:if="{{!state&&!exampleState}}" bindtap="videoPlay" />
     <image src="{{videoInfo.userRead.coverImg}}" class='poster' wx:if="{{!state&&!exampleState}}" bindtap="videoPlay" />
+    <!-- 水印 -->
+    <image src="{{videoInfo.readMaskTemplate.imgPath}}" class="watermark" />
     <video id="myVideo" src="{{state?videoInfo.userRead.originVideo:videoInfo.userRead.videoPath}}" bindended='videoEnd'
     <video id="myVideo" src="{{state?videoInfo.userRead.originVideo:videoInfo.userRead.videoPath}}" bindended='videoEnd'
       show-center-play-btn="{{readingReset}}" controls="{{!state&&!readingReset}}" muted="{{muted}}"></video>
       show-center-play-btn="{{readingReset}}" controls="{{!state&&!readingReset}}" muted="{{muted}}"></video>
     <!-- 这个用于预加载资源 -->
     <!-- 这个用于预加载资源 -->

+ 11 - 0
pages/reading/index.wxss

@@ -13,10 +13,21 @@
   width: 100%;
   width: 100%;
   height: 422rpx;
   height: 422rpx;
   z-index: 10;
   z-index: 10;
+  pointer-events: auto;
+}
+.readingBox .watermark {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+  width: 100%;
+  height: 422rpx;
+  z-index: 10;
+  pointer-events: none;
 }
 }
 .readingBox #myVideo {
 .readingBox #myVideo {
   width: 100%;
   width: 100%;
   height: 422rpx;
   height: 422rpx;
+  pointer-events: auto;
 }
 }
 .readingBox .audio {
 .readingBox .audio {
   position: relative;
   position: relative;