En route 1 年之前
父節點
當前提交
78de080d5d
共有 5 個文件被更改,包括 22 次插入22 次删除
  1. 0 3
      src/axios.js
  2. 19 11
      src/components/videoCy/index.vue
  3. 0 2
      src/pages/course-exam/index.vue
  4. 3 4
      src/pages/person-center/my-course/index.vue
  5. 0 2
      src/store/index.js

+ 0 - 3
src/axios.js

@@ -77,7 +77,6 @@ request.interceptors.response.use(async (response) => {
         // });
 
         // setTimeout(() => {
-        console.log('1231231')
         store.commit('setCurrentRouter', router.currentRoute)
         localStorage.removeItem('user_account')
         localStorage.removeItem('token')
@@ -114,7 +113,6 @@ request.interceptors.response.use(async (response) => {
       }
       // localStorage.removeItem('user_account')
       // localStorage.removeItem('token')
-      // console.log('222222')
       // router.push({
       //   path: '/login'
       // })
@@ -163,7 +161,6 @@ async function refreshToken(response) {
 
     localStorage.removeItem('user_account')
     localStorage.removeItem('token')
-    console.log('33333')
     store.commit('setCurrentRouter', router.currentRoute)
     router.push({
       path: '/login'

+ 19 - 11
src/components/videoCy/index.vue

@@ -65,13 +65,13 @@ export default {
     }
   },
   watch: {
-    HideVideo: function(newVal, oldVal) {
-      if (newVal) {
-        document.getElementById("player-tencent").style.display = "none";
-      } else {
-        document.getElementById("player-tencent").style.display = "block";
-      }
-    },
+    // HideVideo: function(newVal, oldVal) {
+    //   if (newVal) {
+    //     document.getElementById("player-tencent").setAttribute("style","visibility:hidden");
+    //   } else {
+    //     document.getElementById("player-tencent").setAttribute("style","visibility:visible");
+    //   }
+    // },
     //因为刚开始获取不到goodsData的数据 所以需要监听
     goodsData: function(newVal, oldVal) {
       if (newVal) {
@@ -119,10 +119,17 @@ export default {
             viewSign == 2 ? "pause" : "s2j_onVideoPause",
             this.onVideoPause
           ); //视频暂停时触发
-          this[viewSign == 2 ? "player_tencent" : "player"].on(
-            viewSign == 2 ? "playing" : "s2j_onVideoPlay",
-            this.onVideoPlay
-          ); //视频播放或由暂停恢复播放时触发
+          // this[viewSign == 2 ? "player_tencent" : "player"].on(
+          //   viewSign == 2 ? "playing" : "s2j_onVideoPlay",
+          //   this.onVideoPlay
+          // );
+          if(viewSign == 2){
+            this.player_tencent.on("playing",this.onVideoPlay)
+          }else{
+            this.player.on("s2j_onPlayStart",this.onVideoPlay)
+            this.player.on("s2j_onVideoPlay",this.onVideoPlay)
+          }
+          //视频播放或由暂停恢复播放时触发
           this[viewSign == 2 ? "player_tencent" : "player"].on(
             viewSign == 2 ? "ended" : "s2j_onPlayOver",
             this.onPlayOver
@@ -571,6 +578,7 @@ export default {
     },
     //视频恢复播放时触发
     onVideoPlay() {
+      console.log("触发一下吧")
       if (this.firstPlay) {
         this.firstPlay = false;
         //计算拍照逻辑

+ 0 - 2
src/pages/course-exam/index.vue

@@ -2245,8 +2245,6 @@ export default {
 
     &__body {
       .explain-record {
-        &__header {
-        }
 
         &__body {
           border: 1px solid #eee;

+ 3 - 4
src/pages/person-center/my-course/index.vue

@@ -88,9 +88,9 @@
                 </div>
 
                 <div class="state" style="margin-bottom: 14px">
-                  <template v-if="item.periodStatus == -1 || item.educationName == '考前培训'">
+                  <template v-if="item.periodStatus == -1">
                     学习状态:
-                    <div class="note" v-if="item.studyStatus == 1">未学习</div>
+                    <div class="note" v-if="!item.studyStatus">未学习</div>
                     <div
                       class="note note--blue"
                       v-else-if="item.stuAllNum + item.recordNum < item.secAllNum + item.examNum"
@@ -104,8 +104,7 @@
                       已学完
                     </div>
                   </template>
-                  <!-- v-else -->
-                  <template v-else-if="item.educationName != '考前培训'">
+                  <template v-else>
                     学习状态:
                     <div class="note" v-if="item.periodStatus == 0">
                       学时审核不通过

+ 0 - 2
src/store/index.js

@@ -109,7 +109,6 @@ export default new Vuex.Store({
       state.userInfo = data;
     },
     setHomeSetList(state, data) {
-      console.log(data,'data')
       data.forEach(item => {
         // if (item.configKey === 'home.header') {
         //   state.header = JSON.parse(item.configValue)
@@ -131,7 +130,6 @@ export default new Vuex.Store({
           let configValue = JSON.parse(item.configValue) || {}
           for(let k in configValue){
             state[k] = configValue[k]
-            console.log(k,configValue[k],'k')
           }
         }
       })