Merge branch 'dev'

pages3/polyv/detail.vue

@@ -2737,6 +2737,9 @@ export default {
         PlayDuration = polyvPlayerContext.j2s_realPlayVideoTime(); //本次看的时长
         // #endif
       }
+      if (currentTime < 15) {
+        return;
+      }
       if (this.playChannelId > 0) {
         currentTime = 2; //直播无法获取，无论开始结束都传2秒
       }

project.config.json

@@ -41,7 +41,8 @@
       "outputPath": ""
     },
     "disableUseStrict": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.17.0",
@@ -51,5 +52,7 @@
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2
-  }
+  },
+  "miniprogramRoot": "unpackage/dist/dev/mp-weixin/",
+  "srcMiniprogramRoot": "unpackage/dist/dev/mp-weixin/"
 }