联调

package-lock.json

@@ -1650,15 +1650,15 @@
       }
     },
     "@videojs/http-streaming": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-1.10.3.tgz",
-      "integrity": "sha512-fxXtwVrQBdhOFh6GymPAPCb4utCI01Zs5fdyZgtR6FSsaz/zGmnzfNS5GvNjBi/hZviMsbNPFaOTTFMMNLNA3A==",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-1.10.6.tgz",
+      "integrity": "sha512-uPBuunHnxWeFRYxRX0j6h1IIWv3+QKvSkZGmW9TvqxWBqeNGSrQymR6tm1nVjQ2HhMVxVphQTUhUTTPDVWqmQg==",
       "requires": {
         "aes-decrypter": "3.0.0",
         "global": "^4.3.0",
-        "m3u8-parser": "4.3.0",
+        "m3u8-parser": "4.4.0",
         "mpd-parser": "0.8.1",
-        "mux.js": "5.1.3",
+        "mux.js": "5.2.1",
         "url-toolkit": "^2.1.3",
         "video.js": "^6.8.0 || ^7.0.0"
       }
@@ -9333,9 +9333,9 @@
       }
     },
     "m3u8-parser": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.3.0.tgz",
-      "integrity": "sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.4.0.tgz",
+      "integrity": "sha512-iH2AygTFILtato+XAgnoPYzLHM4R3DjATj7Ozbk7EHdB2XoLF2oyOUguM7Kc4UVHbQHHL/QPaw98r7PbWzG0gg==",
       "requires": {
         "global": "^4.3.2"
       }
@@ -9845,9 +9845,9 @@
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
     "mux.js": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.1.3.tgz",
-      "integrity": "sha512-FhDcysLvAkO9H8ftBJ2sK1O4Rmz0AWnMS+2uqP7WjrnaAyE/ox11GEiZkRzrWIdp8at9R9qBHDqdURY3/h/xTg=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.2.1.tgz",
+      "integrity": "sha512-1t2payD3Y8izfZRq7tfUQlhL2fKzjeLr9v1/2qNCTkEQnd9Abtn1JgzsBgGZubEXh6lM5L8B0iLGoWQiukjtbQ=="
     },
     "nan": {
       "version": "2.13.2",
@@ -14570,11 +14570,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
-    "tsml": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tsml/-/tsml-1.0.1.tgz",
-      "integrity": "sha1-ifghi52eJX9H1/a1bQHFpNLGj8M="
-    },
     "tty-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -14965,25 +14960,24 @@
       }
     },
     "video.js": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.6.0.tgz",
-      "integrity": "sha512-A0HSKzAmcYkd1xyExqUlM6n8bkghcX54iCvW08bPvvl3UHt8d8zijuylfIWu8vo1Z8fYyk9HPOFs1i3Cldr/cw==",
+      "version": "7.6.5",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.6.5.tgz",
+      "integrity": "sha512-r0kC9SNJhXz9th/wwbRaLVOIZTvXkF+rhFq9/FWU+e+EJClwClRCgP8STGmfrPHDXrfWiJwH9YY21JZK61vGGQ==",
       "requires": {
         "@babel/runtime": "^7.4.5",
-        "@videojs/http-streaming": "1.10.3",
+        "@videojs/http-streaming": "1.10.6",
         "global": "4.3.2",
         "keycode": "^2.2.0",
         "safe-json-parse": "4.0.0",
-        "tsml": "1.0.1",
         "videojs-font": "3.2.0",
         "videojs-vtt.js": "^0.14.1",
         "xhr": "2.4.0"
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz",
-          "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==",
+          "version": "7.6.3",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
+          "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
           "requires": {
             "regenerator-runtime": "^0.13.2"
           }

package.json

@@ -80,7 +80,7 @@
     "swiper": "^4.5.0",
     "terser-webpack-plugin": "1.2.2",
     "url-loader": "1.1.2",
-    "video.js": "^7.6.0",
+    "video.js": "^7.6.5",
     "web-launch-app": "^2.1.9",
     "webpack": "4.28.3",
     "webpack-dev-server": "3.1.14",

src/components/blessingPreheat/courseList/index.js

@@ -222,6 +222,7 @@ class CourseList extends Component {
 
   toReceiveCoupon(id, key = '') {
     const {isLogin, toLogin} = this.props;
+    alert(isLogin)
     if(isLogin) {
       http.post(`${API.home}/sys/activity/coupon/receive`, {
         course_id: id

src/components/blessingPreheat/index.js

@@ -267,7 +267,7 @@ class BlessingPreheat extends Component {
         // 需要用户登录 并且用户未登录
         const isLoginnew = !this.props.user.hasError
 
-        if (isLogin && isLoginnew) {
+        if (isLogin && !isLoginnew) {
             this.toLogin()
         } else {
             let obj = {}

src/components/blessingPreheat/levelTest/index.js

@@ -52,7 +52,7 @@ class LevelTest extends Component {
   startTest = () => {
     const {history, isLogin, toLogin} = this.props;
     if(isLogin) {
-      history.push('/levelTest/testing');
+      history.push('/levelTest/test');
     }else{
       toLogin();
     }
@@ -100,7 +100,7 @@ class LevelTest extends Component {
               })
             }
           </div>
-          
+
           <div className="prize__title">— 活动规则 —</div>
           <div className="rules__text">
             <p>1. 11月5日至11月13日之间每人有一次测试机会，可通过“集福气”活动额外获得2次测试机会；</p>

src/components/video/CustomPlayButton/index.js

@@ -50,4 +50,4 @@ CustomPlayButtonCover.prototype.options_ = {
     ]
 }
 
-Component.registerComponent('CustomPlayButtonCover', CustomPlayButtonCover)
+Component.registerComponent('CustomPlayButtonCover', CustomPlayButtonCover)
\ No newline at end of file

src/components/video/index.js

@@ -18,6 +18,7 @@ import Single from "@/components/detail/single";
 import SingleSuccess from "../detail/single/singleSuccess";
 import './CustomPlayButton'
 
+
 let alert = Modal.alert
 
 function ProgressShareModal(props) {
@@ -606,6 +607,7 @@ class Video extends Component {
                 activeIndex: index
             },
             () => {
+
                 if (this.hasAuth(this.state.activeIndex)) {
                     this.setPlayerSrc(this.state.videoList[index]['play_url'])
                     this.sendLastRecord()
@@ -708,7 +710,10 @@ class Video extends Component {
     }
 
     playVideo = () => {
-        this.player.play()
+        this.player.ready(() => {
+            this.player.play()
+        })
+
     }
 
 
@@ -917,4 +922,4 @@ class Video extends Component {
 export default connect(
     state => ({user: state.user}),
     null
-)(Video);
+)(Video);
\ No newline at end of file