Merge branch 'zcwy_0716_learning' into dev0515

This commit is contained in:
nisen
2024-07-17 11:33:24 +08:00
2 changed files with 4 additions and 3 deletions

View File

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

View File

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