diff --git a/pages.json b/pages.json index cfc3b2d..63cf7cc 100644 --- a/pages.json +++ b/pages.json @@ -122,13 +122,6 @@ "navigationBarTitleText": "" } }, - { - "path" : "pages/YNEduApp/learnProj/studyList", - "style" : - { - "navigationBarTitleText" : "学习列表" - } - }, { "path" : "pages/YNEduApp/learnProj/pdfStudy", "style" : @@ -149,6 +142,13 @@ { "navigationStyle" : "custom" } + }, + { + "path" : "pages/YNEduApp/learn/learn", + "style" : + { + "navigationBarTitleText" : "学习" + } } ], "globalStyle": { diff --git a/pages/YNEduApp/learnProj/components/ListItem.vue b/pages/YNEduApp/learn/components/ListItem.vue similarity index 100% rename from pages/YNEduApp/learnProj/components/ListItem.vue rename to pages/YNEduApp/learn/components/ListItem.vue diff --git a/pages/YNEduApp/learnProj/components/VideoStudy.vue b/pages/YNEduApp/learn/components/VideoStudy.vue similarity index 100% rename from pages/YNEduApp/learnProj/components/VideoStudy.vue rename to pages/YNEduApp/learn/components/VideoStudy.vue diff --git a/pages/YNEduApp/learnProj/studyList.vue b/pages/YNEduApp/learn/learn.vue similarity index 100% rename from pages/YNEduApp/learnProj/studyList.vue rename to pages/YNEduApp/learn/learn.vue diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue index 0a9391b..63e1c99 100644 --- a/pages/YNEduApp/learnProj/learnProjDetail.vue +++ b/pages/YNEduApp/learnProj/learnProjDetail.vue @@ -158,11 +158,14 @@ toggleTheoryLearn(id) { console.log(id) uni.navigateTo({ - url: '/pages/YNEduApp/learnProj/studyList?id=' + id + url: '/pages/YNEduApp/learn/learn?id=' + id }) }, toggleTheoryPrac(id) { console.log(id) + uni.navigateTo({ + url: '/pages/YNEduApp/prac/prac?id=' + id + }) }, }, onLoad(params) {