Merge branch 'master' into dev

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "Applet",
-    "appid" : "__UNI__E090811",
+    "appid" : "__UNI__1EEAEF2",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
@@ -73,7 +73,7 @@
     },
     /* 快应用特有相关 */
     "quickapp" : {},
-    /* 小程序特有相关 */
+    /* 小程序特有相关 中正学堂：wx5872ef563d13dabf */
     "mp-weixin" : {
         "appid" : "wxd3c8ae80cf43a305", // 祥粤云学堂：wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4 , 中正学堂-wx5872ef563d13dabf，勘设云学堂-wx29d0ad81e625ad81
         "setting" : {

pages3/polyv/detail.vue

@@ -2549,13 +2549,13 @@ export default {
       if (this.timer) {
         clearInterval(this.timer);
       }
+      this.vid = item.recordingUrl;
+      // #ifdef MP-WEIXIN
       if (this.vid) {
-        //切换视频
-        // var polyvPlayerContext = this.selectComponent("#playerVideo");
-        polyvPlayerContext.changeVid(item.recordingUrl);
-      } else {
-        this.vid = item.recordingUrl;
+        polyvPlayerContext.changeVid(this.vid);
       }
+      // #endif
+
       this.recordObj = { videoCurrentTime: item.noteSecond };
       if (this.recordObj.videoCurrentTime) {
         this.needSeek = true; //需要跳转到播放记录
@@ -2572,12 +2572,13 @@ export default {
       // #ifdef H5
       // await this.clears();
       // #endif
+      this.vid = item.recordingUrl;
+      // #ifdef MP-WEIXIN
       if (this.vid) {
-        //切换视频
-        polyvPlayerContext && polyvPlayerContext.changeVid(item.recordingUrl);
-      } else {
-        this.vid = item.recordingUrl;
+        polyvPlayerContext && polyvPlayerContext.changeVid(this.vid);
       }
+      // #endif
+
       this.recordObj = null;
       this.recordObj = await this.getRecordLast();
       this.needSeek = true; //跳转到播放记录