谢杰标 2 anni fa
parent
commit
0a90b7c12a
2 ha cambiato i file con 195 aggiunte e 188 eliminazioni
  1. 12 13
      src/pages/course-detail/index.vue
  2. 183 175
      src/router/index.js

+ 12 - 13
src/pages/course-detail/index.vue

@@ -3573,10 +3573,11 @@ export default {
           reject(false);
         }
         if (sizeToM > 2) {
-          imageConversion.compressAccurately(file, {
+          imageConversion
+            .compressAccurately(file, {
               size: 1024 * 2,
-              width:1000,
-              height:1000
+              width: 1000,
+              height: 1000,
             })
             .then((res) => {
               res = new File([res], file.name, { type: res.type });
@@ -4883,10 +4884,10 @@ export default {
             resolve(res.data);
           })
           .catch((err) => {
-            if(err.toString().indexOf('timeout')!=-1){
+            if (err.toString().indexOf("timeout") != -1) {
               err = {
-                msg:'拍照超时,请重新拍照'
-              }
+                msg: "拍照超时,请重新拍照",
+              };
             }
             this.loading = false;
             this.$message({
@@ -5316,7 +5317,6 @@ export default {
      * 点击节
      */
     async getResource(section, type, flag) {
-      
       if (flag) {
         //节卷
         let data = this.sectionExamList.filter(
@@ -6140,7 +6140,7 @@ export default {
           moduleId: parseInt(self.moduleId),
         };
         this.$request.getPhotoLastRecord(data).then((res) => {
-          console.log(res,666)
+          console.log(res, 666);
           //清空历史数据
           self.photoHistoryList = [];
           this.photoIndex = 0;
@@ -6438,11 +6438,10 @@ export default {
           self.ossAvatarUrl = "";
         })
         .catch((err) => {
-          console.log(err);
-          this.$message({
-            type: "warning",
-            message: err.msg,
-          });
+          // this.$message({
+          //   type: "warning",
+          //   message: err.msg,
+          // });
         });
     },
 

+ 183 - 175
src/router/index.js

@@ -6,29 +6,29 @@ import { Notification, MessageBox, Message } from 'element-ui'
 import tools from '../common/tools'
 Vue.use(Router)
 
-let bankAdmin = ['/person-center/bank-record','/person-center/my-bank/index','/person-center/free-bank/index','/person-center/my-collect','/person-center/my-wrong','/person-center/my-bank/bank-detail/','/person-center/my-bank/bank-statistics/','/person-center/my-bank/bank-explain-detail/','/person-center/free-bank/bank-detail/','/person-center/free-bank/bank-statistics/','/person-center/free-bank/bank-explain-detail/','/bank-exam-continue/','/bank-exam/','/subject/collect-bank/','/bank-exam-explain/','/bank-report/'];
+let bankAdmin = ['/person-center/bank-record', '/person-center/my-bank/index', '/person-center/free-bank/index', '/person-center/my-collect', '/person-center/my-wrong', '/person-center/my-bank/bank-detail/', '/person-center/my-bank/bank-statistics/', '/person-center/my-bank/bank-explain-detail/', '/person-center/free-bank/bank-detail/', '/person-center/free-bank/bank-statistics/', '/person-center/free-bank/bank-explain-detail/', '/bank-exam-continue/', '/bank-exam/', '/subject/collect-bank/', '/bank-exam-explain/', '/bank-report/'];
 let canToBank = null;
-let courseAdmin = ['/my-course-detail/','/course-exam/']
+let courseAdmin = ['/my-course-detail/', '/course-exam/']
 let canToCourse = null;
 
-const router =  new Router({
-  mode:'history',
+const router = new Router({
+  mode: 'history',
   scrollBehavior: () => ({ y: 0 }),
   routes: [
     {
       path: '*',
       redirect: '/home',
-      component: resolve => require(['@/pages/home/index'],resolve)
+      component: resolve => require(['@/pages/home/index'], resolve)
     },
     {
       path: '/refresh',
       name: '刷新页',
-      component: resolve => require(['@/pages/refresh'],resolve),
+      component: resolve => require(['@/pages/refresh'], resolve),
     },
     {
       path: '/home',
       name: '首页',
-      component: resolve => require(['@/pages/home/index'],resolve),
+      component: resolve => require(['@/pages/home/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -40,7 +40,7 @@ const router =  new Router({
     {
       path: '/login',
       name: '登录',
-      component: resolve => require(['@/pages/login/index'],resolve),
+      component: resolve => require(['@/pages/login/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -52,7 +52,7 @@ const router =  new Router({
     {
       path: '/about',
       name: '走进祥粤',
-      component: resolve => require(['@/pages/about/index'],resolve),
+      component: resolve => require(['@/pages/about/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训报名报考平台',
         content: {
@@ -64,12 +64,12 @@ const router =  new Router({
     {
       path: '/cart',
       name: '购物车',
-      component: resolve => require(['@/pages/cart/index'],resolve),
+      component: resolve => require(['@/pages/cart/index'], resolve),
     },
     {
       path: '/payment',
       name: '支付',
-      component: resolve => require(['@/pages/payment/index'],resolve),
+      component: resolve => require(['@/pages/payment/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -81,7 +81,7 @@ const router =  new Router({
     {
       path: '/payment-success',
       name: '支付成功',
-      component: resolve => require(['@/pages/payment-success/index'],resolve),
+      component: resolve => require(['@/pages/payment-success/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -93,7 +93,7 @@ const router =  new Router({
     {
       path: '/course-list',
       name: '课程列表',
-      component: resolve => require(['@/pages/course-list/index'],resolve),
+      component: resolve => require(['@/pages/course-list/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -105,7 +105,7 @@ const router =  new Router({
     {
       path: '/bank-list',
       name: '题库列表',
-      component: resolve => require(['@/pages/bank-list/index'],resolve),
+      component: resolve => require(['@/pages/bank-list/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -114,11 +114,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/live-list',
       name: '直播列表',
-      component: resolve => require(['@/pages/live-list/index'],resolve),
+      component: resolve => require(['@/pages/live-list/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -130,7 +130,7 @@ const router =  new Router({
     {
       path: '/course-detail/:goodsId',
       name: '课程详情',
-      component: resolve => require(['@/pages/goods-detail/course-detail'],resolve),
+      component: resolve => require(['@/pages/goods-detail/course-detail'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -142,7 +142,7 @@ const router =  new Router({
     {
       path: '/bank-detail/:goodsId',
       name: '题库详情',
-      component: resolve => require(['@/pages/goods-detail/bank-detail'],resolve),
+      component: resolve => require(['@/pages/goods-detail/bank-detail'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -154,7 +154,7 @@ const router =  new Router({
     {
       path: '/live-detail/:goodsId',
       name: '直播详情',
-      component: resolve => require(['@/pages/goods-detail/live-detail'],resolve),
+      component: resolve => require(['@/pages/goods-detail/live-detail'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -166,7 +166,7 @@ const router =  new Router({
     {
       path: '/my-course-detail/:goodsId',
       name: '课程详情',
-      component: resolve => require(['@/pages/course-detail/index'],resolve),
+      component: resolve => require(['@/pages/course-detail/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -175,11 +175,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/my-live-detail/:goodsId',
       name: '直播详情',
-      component: resolve => require(['@/pages/live-detail/index'],resolve),
+      component: resolve => require(['@/pages/live-detail/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -192,7 +192,7 @@ const router =  new Router({
       path: '/living-room/:channelId',
       // name: '课程详情',
       name: '直播页面详情1',
-      component: resolve => require(['@/pages/living-room/index'],resolve),
+      component: resolve => require(['@/pages/living-room/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -201,11 +201,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/mock-countdown',
       name: '课程详情',
-      component: resolve => require(['@/pages/mock-countdown/index'],resolve),
+      component: resolve => require(['@/pages/mock-countdown/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -214,11 +214,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/mock-report',
       name: '课程详情',
-      component: resolve => require(['@/pages/mock-report/index'],resolve),
+      component: resolve => require(['@/pages/mock-report/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -230,7 +230,7 @@ const router =  new Router({
     {
       path: '/course-report',
       name: '试卷报告',
-      component: resolve => require(['@/pages/course-report/index'],resolve),
+      component: resolve => require(['@/pages/course-report/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -239,11 +239,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/bank-report/:goodsId',
       name: '试卷报告',
-      component: resolve => require(['@/pages/bank-report/index'],resolve),
+      component: resolve => require(['@/pages/bank-report/index'], resolve),
       meta: {
         title: '祥粤云学堂-建造师造价师在线教育培训平台报名报考',
         content: {
@@ -255,7 +255,7 @@ const router =  new Router({
     {
       path: '/course-exam/:goodsId',
       name: '做题',
-      component: resolve => require(['@/pages/course-exam/index'],resolve),
+      component: resolve => require(['@/pages/course-exam/index'], resolve),
       meta: {
         title: '祥粤云学堂-一二级建造师、工程师、建筑师视频课程、免费直播课',
         content: {
@@ -267,7 +267,7 @@ const router =  new Router({
     {
       path: '/bank-exam/:goodsId',
       name: '做题',
-      component: resolve => require(['@/pages/bank-exam/index'],resolve),
+      component: resolve => require(['@/pages/bank-exam/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -279,7 +279,7 @@ const router =  new Router({
     {
       path: '/mock-exam',
       name: '模考',
-      component: resolve => require(['@/pages/mock-exam/index'],resolve),
+      component: resolve => require(['@/pages/mock-exam/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -288,11 +288,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/bank-exam-continue/:goodsId',
       name: '继续做题',
-      component: resolve => require(['@/pages/bank-exam-continue/index'],resolve),
+      component: resolve => require(['@/pages/bank-exam-continue/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -304,7 +304,7 @@ const router =  new Router({
     {
       path: '/bank-exam-all-explain/:recordId',
       name: '全部解析',
-      component: resolve => require(['@/pages/bank-exam-all-explain/index'],resolve),
+      component: resolve => require(['@/pages/bank-exam-all-explain/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -316,7 +316,7 @@ const router =  new Router({
     {
       path: '/bank-exam-wrong-explain/:recordId',
       name: '错题解析',
-      component: resolve => require(['@/pages/bank-exam-wrong-explain/index'],resolve),
+      component: resolve => require(['@/pages/bank-exam-wrong-explain/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -328,7 +328,7 @@ const router =  new Router({
     {
       path: '/mock-exam-all-explain/:recordId',
       name: '全部解析',
-      component: resolve => require(['@/pages/mock-exam-all-explain/index'],resolve),
+      component: resolve => require(['@/pages/mock-exam-all-explain/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -340,7 +340,7 @@ const router =  new Router({
     {
       path: '/mock-exam-wrong-explain/:recordId',
       name: '错题解析',
-      component: resolve => require(['@/pages/mock-exam-wrong-explain/index'],resolve),
+      component: resolve => require(['@/pages/mock-exam-wrong-explain/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -352,7 +352,7 @@ const router =  new Router({
     {
       path: '/bank-exam-explain/:goodsId',
       name: '题目解析',
-      component: resolve => require(['@/pages/bank-exam-explain/index'],resolve),
+      component: resolve => require(['@/pages/bank-exam-explain/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -361,11 +361,11 @@ const router =  new Router({
         }
       }
     },
-    
+
     {
       path: '/subject/wrong-type-bank/:type',
       name: '错题',
-      component: resolve => require(['@/pages/subject/wrong-type-bank'],resolve),
+      component: resolve => require(['@/pages/subject/wrong-type-bank'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -377,7 +377,7 @@ const router =  new Router({
     {
       path: '/subject/wrong-bank/:examId',
       name: '错题',
-      component: resolve => require(['@/pages/subject/wrong-bank'],resolve),
+      component: resolve => require(['@/pages/subject/wrong-bank'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -389,7 +389,7 @@ const router =  new Router({
     {
       path: '/subject/collect-type-bank/:type',
       name: '收藏',
-      component: resolve => require(['@/pages/subject/collect-type-bank'],resolve),
+      component: resolve => require(['@/pages/subject/collect-type-bank'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -401,7 +401,7 @@ const router =  new Router({
     {
       path: '/subject/collect-bank/:examId',
       name: '收藏',
-      component: resolve => require(['@/pages/subject/collect-bank'],resolve),
+      component: resolve => require(['@/pages/subject/collect-bank'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -413,7 +413,7 @@ const router =  new Router({
     {
       path: '/goodsTopic',
       name: '商品专题',
-      component: resolve => require(['@/pages/goodsTopic/index'],resolve),
+      component: resolve => require(['@/pages/goodsTopic/index'], resolve),
       meta: {
         title: '祥粤云学堂-题库-一建二建试题下载_考试科目题库_考题答案_历年试题_在线真题_水平测试_历年真题_在线题库',
         content: {
@@ -425,208 +425,208 @@ const router =  new Router({
     {
       path: '/person-center',
       name: '个人中心',
-      component: resolve => require(['@/pages/person-center/index'],resolve),
-      beforeEnter:(to,from,next) => {
+      component: resolve => require(['@/pages/person-center/index'], resolve),
+      beforeEnter: (to, from, next) => {
         let token = window.localStorage.getItem('token');
 
-        if(token == null || token == '' || token === undefined){
+        if (token == null || token == '' || token === undefined) {
 
           next('/login')
 
-        }else{
+        } else {
 
           next();
 
         }
       },
-      children:[
+      children: [
         {
           path: '/',
           // redirect: 'my-course',
         },
         {
           path: 'my-course',
-          component: resolve => require(['@/pages/person-center/my-course/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-course/index'], resolve),
           name: '我的课程'
         },
         {
           path: 'my-live',
-          component: resolve => require(['@/pages/person-center/my-live/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-live/index'], resolve),
           name: '我的直播课'
         },
         {
           path: 'play-record',
-          component: resolve => require(['@/pages/person-center/play-record/index'],resolve),
+          component: resolve => require(['@/pages/person-center/play-record/index'], resolve),
           name: '播放记录'
         },
         {
           path: 'my-bank',
-          component: resolve => require(['@/pages/person-center/my-bank/index'],resolve),
-          name:'自购题卷',
-          children:[
+          component: resolve => require(['@/pages/person-center/my-bank/index'], resolve),
+          name: '自购题卷',
+          children: [
             {
               path: '/',
               redirect: 'index',
             },
             {
               path: 'index',
-              component: resolve => require(['@/pages/person-center/my-bank/index/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-bank/index/index'], resolve),
               name: '自购题卷',
             },
             {
               path: 'bank-detail/:goodsId',
-              component: resolve => require(['@/pages/person-center/my-bank/bank-detail/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-bank/bank-detail/index'], resolve),
               name: '题库详情'
             },
             {
               path: 'bank-statistics/:goodsId',
-              component: resolve => require(['@/pages/person-center/my-bank/bank-statistics/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-bank/bank-statistics/index'], resolve),
               name: '做题统计'
             },
             {
               path: 'bank-explain-detail/:goodsId',
-              component: resolve => require(['@/pages/person-center/my-bank/bank-explain-detail/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-bank/bank-explain-detail/index'], resolve),
               name: '详情'
             },
           ]
         },
         {
           path: 'free-bank',
-          component: resolve => require(['@/pages/person-center/free-bank/index'],resolve),
-          name:'赠送题卷',
-          children:[
+          component: resolve => require(['@/pages/person-center/free-bank/index'], resolve),
+          name: '赠送题卷',
+          children: [
             {
               path: '/',
               redirect: 'index',
             },
             {
               path: 'index',
-              component: resolve => require(['@/pages/person-center/free-bank/index/index'],resolve),
+              component: resolve => require(['@/pages/person-center/free-bank/index/index'], resolve),
               name: '赠送题卷',
             },
             {
               path: 'bank-detail/:goodsId',
-              component: resolve => require(['@/pages/person-center/free-bank/bank-detail/index'],resolve),
+              component: resolve => require(['@/pages/person-center/free-bank/bank-detail/index'], resolve),
               name: '题库详情'
             },
             {
               path: 'bank-statistics/:goodsId',
-              component: resolve => require(['@/pages/person-center/free-bank/bank-statistics/index'],resolve),
+              component: resolve => require(['@/pages/person-center/free-bank/bank-statistics/index'], resolve),
               name: '做题统计'
             },
             {
               path: 'bank-explain-detail/:goodsId',
-              component: resolve => require(['@/pages/person-center/free-bank/bank-explain-detail/index'],resolve),
+              component: resolve => require(['@/pages/person-center/free-bank/bank-explain-detail/index'], resolve),
               name: '详情'
             },
           ]
         },
         {
           path: 'bank-record',
-          component: resolve => require(['@/pages/person-center/bank-record/index'],resolve),
+          component: resolve => require(['@/pages/person-center/bank-record/index'], resolve),
           name: '做题记录'
         },
         {
           path: 'mock-record',
-          component: resolve => require(['@/pages/person-center/mock-record/index'],resolve),
+          component: resolve => require(['@/pages/person-center/mock-record/index'], resolve),
           name: '模考记录'
         },
         {
           path: 'my-collect',
-          component: resolve => require(['@/pages/person-center/my-collect/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-collect/index'], resolve),
           name: '收藏集'
         },
-        
+
         {
           path: 'my-wrong',
-          component: resolve => require(['@/pages/person-center/my-wrong/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-wrong/index'], resolve),
           name: '错题集'
         },
-        
+
         {
           path: 'record-list/:goodsId',
-          component: resolve => require(['@/pages/person-center/bank-record/record-list/index'],resolve),
+          component: resolve => require(['@/pages/person-center/bank-record/record-list/index'], resolve),
           name: '更多记录'
         },
         {
           path: 'mock-record-list/:goodsId',
-          component: resolve => require(['@/pages/person-center/mock-record/record-list/index'],resolve),
+          component: resolve => require(['@/pages/person-center/mock-record/record-list/index'], resolve),
           name: '更多模考记录'
         },
         {
           path: 'my-order',
-          component: resolve => require(['@/pages/person-center/my-order/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-order/index'], resolve),
           name: '我的订单'
         },
         {
           path: 'my-examination',
-          component: resolve => require(['@/pages/person-center/my-examination/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-examination/index'], resolve),
           name: '我的考试'
         },
         {
           path: 'my-mock',
-          component: resolve => require(['@/pages/person-center/my-mock/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-mock/index'], resolve),
           name: '我的模考'
         },
         {
           path: 'my-message',
-          component: resolve => require(['@/pages/person-center/my-message/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-message/index'], resolve),
           name: '我的消息'
         },
         {
           path: 'my-info',
-          component: resolve => require(['@/pages/person-center/my-info/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-info/index'], resolve),
           name: '我的资料'
         },
         {
           path: 'my-invoice',
           name: '我的发票',
-          component: resolve => require(['@/pages/person-center/my-invoice/index'],resolve),
-          children:[
-            
+          component: resolve => require(['@/pages/person-center/my-invoice/index'], resolve),
+          children: [
+
             {
               path: '/',
               redirect: 'index',
             },
             {
               path: 'index',
-              component: resolve => require(['@/pages/person-center/my-invoice/index/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-invoice/index/index'], resolve),
               name: '我的发票',
             },
             {
               path: 'add',
-              component: resolve => require(['@/pages/person-center/my-invoice/add/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-invoice/add/index'], resolve),
               name: '申请发票',
             },
           ]
         },
         {
           path: 'my-classhour',
-          component: resolve => require(['@/pages/person-center/my-classhour/index'],resolve),
+          component: resolve => require(['@/pages/person-center/my-classhour/index'], resolve),
           name: '我的学时',
-          children:[
+          children: [
             {
               path: '/',
               redirect: 'index',
             },
             {
               path: 'index',
-              component: resolve => require(['@/pages/person-center/my-classhour/index/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-classhour/index/index'], resolve),
               name: '我的学时',
             },
             {
               path: 'appointment',
-              component: resolve => require(['@/pages/person-center/my-classhour/appointment/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-classhour/appointment/index'], resolve),
               name: '预约考试',
             },
             {
               path: 'appointment-add',
-              component: resolve => require(['@/pages/person-center/my-classhour/appointment-add/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-classhour/appointment-add/index'], resolve),
               name: '预约考试',
             },
             {
               path: 'appointment-add-kp',
-              component: resolve => require(['@/pages/person-center/my-classhour/appointment-add-kp/index'],resolve),
+              component: resolve => require(['@/pages/person-center/my-classhour/appointment-add-kp/index'], resolve),
               name: '预约考试',
             }
           ]
@@ -641,32 +641,40 @@ Router.prototype.push = function push(location) {
   return originalPush.call(this, location).catch((err) => err)
 }
 
-router.beforeEach((to,from,next) => {
-  console.log(to,'to')
-  console.log(from,'from')
+router.beforeEach((to, from, next) => {
+  console.log(to, 'to')
+  console.log(from, 'from')
   if (to.meta.content) {
-		let head = document.getElementsByTagName('head');
-		let meta = document.createElement('meta');
-		document.querySelector('meta[name="keywords"]').setAttribute('content', to.meta.content.keywords)
-		document.querySelector('meta[name="description"]').setAttribute('content', to.meta.content.description)
-		meta.content = to.meta.content;
-		head[0].appendChild(meta)
-	}
-	if (to.meta.title) {
-		document.title = to.meta.title;
-	}
-  if(to.path === '/login'){
+    let head = document.getElementsByTagName('head');
+    let meta = document.createElement('meta');
+    document.querySelector('meta[name="keywords"]').setAttribute('content', to.meta.content.keywords)
+    document.querySelector('meta[name="description"]').setAttribute('content', to.meta.content.description)
+    meta.content = to.meta.content;
+    head[0].appendChild(meta)
+  }
+  if (to.meta.title) {
+    document.title = to.meta.title;
+  }
+  if (to.path === '/login') {
+    if (canToBank) {
+      clearInterval(canToBank)
+      canToBank = null;
+    } 
+    if (canToCourse) {
+      clearInterval(canToCourse)
+      canToCourse = null;
+    }
 
     next();
 
-  }else{
+  } else {
 
     let token = window.localStorage.getItem('token');
 
     //进入页面有token获取用户信息
-    if(token){
+    if (token) {
       store.token = token;
-      if(!store.state.userInfo) {
+      if (!store.state.userInfo) {
         //获取用户信息
         store.dispatch('getUserInfo')
         store.dispatch('getbusinessList')
@@ -676,15 +684,15 @@ router.beforeEach((to,from,next) => {
       let isBankLock = bankAdmin.some(item => {
         return to.path.indexOf(item) != -1
       })
-      console.log(isBankLock,'isBankLock', canToBank)
-      if(isBankLock) {
-        
+      console.log(isBankLock, 'isBankLock', canToBank)
+      if (isBankLock) {
+
         //没有执行定时器,开启锁定
-        if(!canToBank) {
+        if (!canToBank) {
           request
             .lockLockStatus({
               action: "bank",
-              uuid:tools.getUuid()
+              uuid: tools.getUuid()
             })
             .then((res) => {
               //有其他端在操作,不能学习
@@ -692,36 +700,36 @@ router.beforeEach((to,from,next) => {
                 type: "warning",
                 message: res.msg,
               });
-              
-              if(from.path=='/') {
+
+              if (from.path == '/') {
                 next('/')
               }
 
             }).catch(err => {
               //可以学习,开启锁定
-                canToBank = 1;
+              canToBank = 1;
               request.lockLockAction({
-                action:'bank',
-                uuid:tools.getUuid()
+                action: 'bank',
+                uuid: tools.getUuid()
               }).then(res => {
               })
               canToBank = setInterval(() => {
                 request.lockLockAction({
-                  action:'bank',
-                  uuid:tools.getUuid()
+                  action: 'bank',
+                  uuid: tools.getUuid()
                 }).then(res => {
-                  
+
                 })
               }, 10000);
               next()
             })
 
-            return;
+          return;
         } else {
           //正在执行定时器,可以直接进入
           next()
         }
-        
+
         return;
       } else {
         //从题库页面离开删除锁定
@@ -730,78 +738,78 @@ router.beforeEach((to,from,next) => {
           return from.path.indexOf(item) != -1
         })
 
-        if(isLeaveBank) {
-          
+        if (isLeaveBank) {
+
           clearInterval(canToBank)
           canToBank = null;
           request.lockDelLock({
-            action:'bank',
-            uuid:tools.getUuid()
+            action: 'bank',
+            uuid: tools.getUuid()
           }).then(res => {
-            
+
           })
         }
       }
-      
+
       let isCourseLock = courseAdmin.some(item => {
         return to.path.indexOf(item) != -1
       })
 
-      console.log(isCourseLock,'isCourseLock')
-      if(isCourseLock) {
-        
+      console.log(isCourseLock, 'isCourseLock')
+      if (isCourseLock) {
+
         //没有执行定时器,开启锁定
-        if(!canToCourse) {
-          
+        if (!canToCourse) {
+
           request.goodsDetail(to.params.goodsId).then(res => {
             //继续教育锁定
             // if(res.data.educationName == '继续教育') {
-              request
-                .lockLockStatus({
-                  action: "jxjy",
-                  uuid:tools.getUuid()
+            request
+              .lockLockStatus({
+                action: "jxjy",
+                uuid: tools.getUuid()
+              })
+              .then((res) => {
+                //有其他端在操作,不能学习
+                Message({
+                  type: "warning",
+                  message: res.msg,
+                });
+
+                if (from.path == '/') {
+                  next('/')
+                }
+
+              }).catch(err => {
+                //可以学习,开启锁定
+                canToCourse = 1;
+                request.lockLockAction({
+                  action: 'jxjy',
+                  uuid: tools.getUuid()
+                }).then(res => {
                 })
-                .then((res) => {
-                  //有其他端在操作,不能学习
-                  Message({
-                    type: "warning",
-                    message: res.msg,
-                  });
-                  
-                  if(from.path=='/') {
-                    next('/')
-                  }
-
-                }).catch(err => {
-                  //可以学习,开启锁定
-                  canToCourse = 1;
+                canToCourse = setInterval(() => {
                   request.lockLockAction({
-                    action:'jxjy',
-                    uuid:tools.getUuid()
+                    action: 'jxjy',
+                    uuid: tools.getUuid()
                   }).then(res => {
+
                   })
-                  canToCourse = setInterval(() => {
-                    request.lockLockAction({
-                      action:'jxjy',
-                      uuid:tools.getUuid()
-                    }).then(res => {
-                      
-                    })
-                  }, 10000);
-                  next()
-                })
+                }, 10000);
+                next()
+              })
             // } else {
             //   next()
             // }
           })
-          
 
-            return;
+
+          return;
         } else {
           //正在执行定时器,可以直接进入
           next()
         }
-        
+
         return;
       } else {
         //非题库页面删除锁定
@@ -809,22 +817,22 @@ router.beforeEach((to,from,next) => {
           return from.path.indexOf(item) != -1
         })
 
-        if(isLeaveCouese) {
-          
+        if (isLeaveCouese) {
+
           clearInterval(canToCourse)
           canToCourse = null;
           request.lockDelLock({
-            action:'jxjy',
-            uuid:tools.getUuid()
+            action: 'jxjy',
+            uuid: tools.getUuid()
           }).then(res => {
-            
+
           })
         }
       }
-      
+
       next()
     } else {
-      
+
       next()
     }