lsc 2 years ago
parent
commit
5e1fc3ad0c

File diff suppressed because it is too large
+ 0 - 0
dist/954c8d4390e1a7dd782f.worker.js


+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.a98cc014f75f152506e16ecea891d498.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e6a57480c9ee39e1cbe8.js></script><script type=text/javascript src=./static/js/app.fcccba8586516c2edbd3.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.efabe635a2fcb2686d9e72055526efea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b8bed9edc7f1d53713b3.js></script><script type=text/javascript src=./static/js/app.8043e6c9497d26e8da43.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.efabe635a2fcb2686d9e72055526efea.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.efabe635a2fcb2686d9e72055526efea.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.8043e6c9497d26e8da43.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.fcccba8586516c2edbd3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.b8bed9edc7f1d53713b3.js


File diff suppressed because it is too large
+ 15704 - 1
package-lock.json


+ 2 - 1
package.json

@@ -22,10 +22,11 @@
     "js-audio-recorder": "^1.0.7",
     "jsmind": "^0.4.8",
     "lamejs": "^1.2.1",
+    "pdfjs-dist": "^2.5.207",
     "vue": "^2.5.2",
     "vue-cookies": "^1.7.4",
     "vue-jsmind": "^1.5.0",
-    "vue-pdf": "^4.3.0",
+    "vue-pdf": "^4.2.0",
     "vue-router": "^3.0.1",
     "vue-video-player": "^5.0.2",
     "vuex": "^3.6.2",

+ 2 - 2
src/components/components/pdf.vue

@@ -158,14 +158,14 @@ export default {
       var p = this.pageNum;
       p = p > 1 ? p - 1 : this.pageTotalNum;
       this.pageNum = p;
-      this.getPage(p);
+      // this.getPage(p);
     },
     // 切换下一页
     nextPage() {
       var p = this.pageNum;
       p = p < this.pageTotalNum ? p + 1 : 1;
       this.pageNum = p;
-      this.getPage(p);
+      // this.getPage(p);
     },
     // 顺时针选中角度
     clock() {

+ 15 - 6
src/components/liveProjectDetail.vue

@@ -851,7 +851,7 @@ export default {
       pdfUrl:
         "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/%E4%B8%8A%E8%AF%BE%E8%AF%BE%E4%BB%B6---%E4%BA%94%E4%B8%8Bintroduce%20a%20festival%20%28Final%20%29%281%291661829428281.pdf",
       pptImgUrl: "",
-      ppage: 2,
+      ppage: 0,
       full: false,
       pageTotal: 0,
       howTools: 0,
@@ -1627,6 +1627,12 @@ export default {
       this.isBlock = 7;
     },
     playVideo() {
+      if (
+        this.playerO[0] &&
+        this.videoList[0].src == this.playerO[0].sources[0].src
+      ) {
+        return;
+      }
       var d = JSON.parse(JSON.stringify(this.playerOptions));
       // for (var i = 0; i < this.videoList.length; i++) {
       d.sources[0].src = this.videoList[0].src;
@@ -1742,6 +1748,7 @@ export default {
           this.tools[this.ppage - 1].file.length
         ) {
         } else {
+          this.playerO = {}
           this.videoBlock = 0;
         }
       }
@@ -1931,7 +1938,7 @@ export default {
             } catch (error) {
               _res = res.data[0][0].page;
             }
-            this.setPptData(_res)
+            this.setPptData(_res);
           }
           console.log(res);
         })
@@ -1940,7 +1947,7 @@ export default {
         });
     },
     setPptData(res) {
-      let _res = res
+      let _res = res;
       this.handle = _res;
       if (
         _res.type == 2 &&
@@ -1955,9 +1962,9 @@ export default {
         let a = this.$refs.zVideo;
 
         if (handle.isPlay == 1) {
-          a.player.play();
+          this.$refs.zVideo.player.play();
         } else if (handle.isPlay == 2) {
-          a.player.pause();
+          this.$refs.zVideo.player.pause();
         }
       } else if (this.$refs.zVideo) {
         this.$refs.zVideo.player.pause();
@@ -2031,7 +2038,9 @@ export default {
         e.data.info.docId == _this.cid
       ) {
         // _this.data[e.data.info.id] = e.data.info.content;
-        this.setPptData(e.data.info.content)
+        setTimeout(() => {
+          _this.setPptData(e.data.info.content);
+        }, 50);
       }
       _this.$forceUpdate();
     });

Some files were not shown because too many files changed in this diff