diff --git a/src/mods/conv/AppLegalLearning/AppLegalLearning.vue b/src/mods/conv/AppLegalLearning/AppLegalLearning.vue index 4fd5777..e48c8c7 100644 --- a/src/mods/conv/AppLegalLearning/AppLegalLearning.vue +++ b/src/mods/conv/AppLegalLearning/AppLegalLearning.vue @@ -4,8 +4,8 @@ - - + + @@ -17,7 +17,7 @@ export default { appName: '法治学习', data() { return { - currIndex: 1, + currIndex: 0, tabs: [ { name: '在线课堂', @@ -46,8 +46,11 @@ export default { } }, methods: { - LinkToTest() { + toTest() { uni.navigateTo({url: "./testForm"}) + }, + toDetail() { + uni.navigateTo({url: "./classDetail"}) } } } diff --git a/src/mods/conv/AppLegalLearning/classDetail.vue b/src/mods/conv/AppLegalLearning/classDetail.vue new file mode 100644 index 0000000..66d5198 --- /dev/null +++ b/src/mods/conv/AppLegalLearning/classDetail.vue @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue b/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue index fe721c9..3833203 100644 --- a/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue +++ b/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue @@ -42,8 +42,8 @@ export default { getList() { console.log('普法考试列表'); }, - toTest() { - this.$emit('LinkToTest') + handleToTest() { + this.$emit('toTest') } }, onReachBottom() { @@ -88,13 +88,13 @@ export default { .card_title { font-weight: 500; - font-size: 40px; + font-size: 36px; color: #333333; - overflow:hidden; + overflow: hidden; text-overflow:ellipsis; display: -webkit-box; - -webkit-box-orient:vertical; - -webkit-line-clamp:2; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; } .card_count, diff --git a/src/mods/conv/AppLegalLearning/components/OnlineClass.vue b/src/mods/conv/AppLegalLearning/components/OnlineClass.vue index 41405f6..bc985c0 100644 --- a/src/mods/conv/AppLegalLearning/components/OnlineClass.vue +++ b/src/mods/conv/AppLegalLearning/components/OnlineClass.vue @@ -1,6 +1,22 @@ @@ -9,6 +25,7 @@ export default { data() { return { current: 1, + keyword: '', } }, onLoad() { @@ -18,6 +35,9 @@ export default { methods: { getList() { console.log('在线课堂列表'); + }, + handleToDetail() { + this.$emit('toDetail') } }, onReachBottom() { @@ -29,6 +49,63 @@ export default { diff --git a/src/mods/conv/AppLegalLearning/img/bg.png b/src/mods/conv/AppLegalLearning/img/bg.png new file mode 100644 index 0000000..e651656 Binary files /dev/null and b/src/mods/conv/AppLegalLearning/img/bg.png differ diff --git a/src/mods/conv/AppLegalLearning/img/navbar.png b/src/mods/conv/AppLegalLearning/img/navbar.png new file mode 100644 index 0000000..c95faaf Binary files /dev/null and b/src/mods/conv/AppLegalLearning/img/navbar.png differ diff --git a/src/mods/conv/AppLegalLearning/testForm.vue b/src/mods/conv/AppLegalLearning/testForm.vue index 1d00aa2..b02b4cc 100644 --- a/src/mods/conv/AppLegalLearning/testForm.vue +++ b/src/mods/conv/AppLegalLearning/testForm.vue @@ -1,19 +1,29 @@