Merge branch 'zcwy_0716_learning' into dev0515

src/components/UserCenter/menu.vue

@@ -457,6 +457,7 @@ export default {
       }
       console.log('2')
       if(path == '/uc/study/task'){
+        console.log(route.query.type,(this.fistTotals && 1),'type')
         return '/uc/study/task?type=' + (route.query.type || (this.fistTotals && 1) ||  2)
       }
       console.log('3')
@@ -466,7 +467,6 @@ export default {
       if (meta.activeMenu) {
         return meta.activeMenu;
       }
-      console.log(path,'sendpath')
       return path;
     },
   },
@@ -524,11 +524,12 @@ export default {
         apiCourseStudy.myStudysFromES(reqData).then(res=>{
           this.courseNum = res.result.count;
           sessionStorage.setItem('courseNums',this.courseNum)
+          console.log(this.courseNum,'this.courseNum')
         })
       }else{
         this.courseNum = sessionStorage.getItem('courseNums')
+        console.log(this.courseNum,'this.courseNum')
       }
-      console.log(this.courseNum,'this.courseNum')
     },
     learnTotal(){
       // const route = this.$route;

src/layout/index.vue

@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import top from './components/TopNav/Index.vue'
+import top from '@/components/PortalHeader.vue'
 import UcHeader from '@/components/UcHeader/Index.vue'
 import Hamburger from '@/components/Hamburger'
 import { AppMain, Navbar, Settings} from './components'