bugfix

components/popup/camera.vue

@@ -6,72 +6,67 @@
       border-radius="40"
       :mask-close-able="false"
     >
-      <!-- 播放前拍照start -->
-      <!-- :mask-close-able="false" -->
-      <!-- style="bottom: 0; position: fixed; width: 100%; z-index: 999" -->
-      <view v-if="isShow">
-        <view class="photoBox">
-          <view class="photoTop">
-            <view class="centersq">请正视手机屏幕</view>
-          </view>
-          <view class="photoCenter">
-            <view class="center_camera" v-if="isTaking">
-              <!-- #ifdef MP-WEIXIN -->
-              <camera
-                device-position="front"
-                flash="off"
-                @error="error"
-                style="width: 100%; height: 100%"
-              >
-                <!-- 加人脸框 -->
-                <cover-view class="head_take">
-                  <cover-view class="headTake_up color"></cover-view>
-                  <cover-view class="headTake_minddle">
-                    <cover-view class="min_left color"></cover-view>
-                    <cover-view class="min_img"></cover-view>
-                    <cover-view class="min_right color"></cover-view>
-                  </cover-view>
-                  <cover-view class="headTake_down color"></cover-view>
+      <view class="photoBox" v-if="isShow">
+        <view class="photoTop">
+          <view class="centersq">请正视手机屏幕</view>
+        </view>
+        <view class="photoCenter">
+          <view class="center_camera" v-if="isTaking">
+            <!-- #ifdef MP-WEIXIN -->
+            <camera
+              device-position="front"
+              flash="off"
+              @error="error"
+              style="width: 100%; height: 100%"
+            >
+              <!-- 加人脸框 -->
+              <cover-view class="head_take">
+                <cover-view class="headTake_up color"></cover-view>
+                <cover-view class="headTake_minddle">
+                  <cover-view class="min_left color"></cover-view>
+                  <cover-view class="min_img"></cover-view>
+                  <cover-view class="min_right color"></cover-view>
                 </cover-view>
-              </camera>
-              <!-- #endif -->
-              <!-- #ifdef H5 -->
-              <video
-                :controls="false"
-                id="video"
-                width="400"
-                height="300"
-                class="photo_v"
-              ></video>
-              <view class="mask"></view>
-              <!-- #endif -->
-            </view>
-            <view class="custom" v-if="!isTaking">
-              <!-- #ifdef MP-WEIXIN -->
-              <image :src="avatarUrl" mode=""></image>
-              <!-- #endif -->
-              <!-- #ifdef H5 -->
-              <image :src="faceUrl" mode=""></image>
-              <!-- #endif -->
-            </view>
+                <cover-view class="headTake_down color"></cover-view>
+              </cover-view>
+            </camera>
+            <!-- #endif -->
+            <!-- #ifdef H5 -->
+            <video
+              :controls="false"
+              id="video"
+              width="400"
+              height="300"
+              class="photo_v"
+            ></video>
+            <view class="mask"></view>
+            <!-- #endif -->
           </view>
-          <view class="btns">
-            <!-- <view class="btnResult" v-if="isTaking" @click="takePhoto"
+          <view class="custom" v-if="!isTaking">
+            <!-- #ifdef MP-WEIXIN -->
+            <image :src="avatarUrl" mode=""></image>
+            <!-- #endif -->
+            <!-- #ifdef H5 -->
+            <image :src="faceUrl" mode=""></image>
+            <!-- #endif -->
+          </view>
+        </view>
+        <view class="btns">
+          <!-- <view class="btnResult" v-if="isTaking" @click="takePhoto"
               >拍照</view
             > -->
-            <view v-if="isTaking" class="takePhoto_btn">
-              <view style="width: 100rpx; height: 2rpx"></view>
-              <view class="middle_btn" @click="takePhoto">
-                <view class="square"></view>
-              </view>
-              <view class="rights" @click="takePhTips()">
-                <text>拍照提示</text>
-                <u-icon name="arrow-right" color="#FFFFFF" size="30"></u-icon>
-              </view>
+          <view v-if="isTaking" class="takePhoto_btn">
+            <view style="width: 100rpx; height: 2rpx"></view>
+            <view class="middle_btn" @click="takePhoto">
+              <view class="square"></view>
+            </view>
+            <view class="rights" @click="takePhTips()">
+              <text>拍照提示</text>
+              <u-icon name="arrow-right" color="#FFFFFF" size="30"></u-icon>
             </view>
-            <view class="btnResult" v-if="!isTaking" @click="reTake">重拍</view>
-            <view class="btnResult" v-if="!isTaking" @click="submit">确认</view>
           </view>
+          <view class="btnResult" v-if="!isTaking" @click="reTake">重拍</view>
+          <view class="btnResult" v-if="!isTaking" @click="submit">确认</view>
         </view>
       </view>
     </u-popup>
@@ -187,6 +182,7 @@ export default {
     },
 
     openCamera() {
+      console.log("openCamera");
       this.uploadLock = false;
       this.popupPhotoShow = false;
       // 同一个商品只谈一次提示
@@ -454,8 +450,6 @@ export default {
 }
 .photoBox {
   width: 100%;
-  // background-color: #ffffff;
-  // border-radius: 24px 24px 0px 0px;
   .photoTop {
     width: 100%;
     height: 74rpx;

pages3/polyv/detail.vue

@@ -701,7 +701,7 @@ export default {
         this.pauseTime = Date.now();
         this.pauseTimer = setInterval(() => {
           console.log("暂停时间", Date.now() - this.pauseTime, this.pauseTime);
-          if (Date.now() - this.pauseTime > 20 * 1000) {
+          if (Date.now() - this.pauseTime > 40 * 1000) {
             // 5 * 60 * 1000
             this.refPlv.exitFullScreen();
             this.text = "暂停";
@@ -716,13 +716,11 @@ export default {
               cancelText: "取消",
               confirmText: "确定",
               success: (res) => {
-                if (res.confirm) {
-                  this.text = "";
-                  reload(this.option);
-                  // #ifdef MP-WEIXIN
-                  this.sectionItem = {};
-                  // #endif
-                }
+                this.text = "";
+                reload(this.option);
+                // #ifdef MP-WEIXIN
+                this.sectionItem = {};
+                // #endif
               },
             });
             this.clearPauseTimer();
@@ -1286,7 +1284,7 @@ export default {
     //正常播放视频
     async playVideo(item) {
       this.sectionItem = item;
-      let { learning, videoCurrentTime, sectionId, recordingUrl } = item;
+      let { learning, videoCurrentTime, recordingUrl } = item;
       this.videoCurrentTime =
         videoCurrentTime || (await this.getRecordLast(item));
       // 往前播3秒