diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue index 4f3e445..d1eaf02 100644 --- a/pages/YNEduApp/learnProj/learnProjDetail.vue +++ b/pages/YNEduApp/learnProj/learnProjDetail.vue @@ -2,53 +2,27 @@ -

{{ name }}

- 合格标准:学习进度达到{{ eligibility }}% +

{{ name }}

+ 合格标准:学习进度达到{{ eligibility }}%
- {{ stageItem.stageName }} - + {{ stageItem.stageName }} +
- - + + + 素材
- + + 课程
- -
+ + 练习 +
@@ -125,8 +101,9 @@
- -
+ + 考试 +
@@ -157,43 +134,6 @@
- - @@ -214,34 +154,6 @@ export default { learnIconObj: { color: '#1A63AC', size: '18', type: 'calendar' }, pracIconObj: { color: '#38B022', size: '18', type: 'compose' }, listStage: [] - // theoryLearnList: [ - // { title: '高压电', id: 121, percent: 86 }, - // { title: '氨基酸', id: 122, percent: 42 }, - // { title: '维他命', id: 123, percent: 66 }, - // { title: '电功率', id: 124, percent: 13 } - // ], - // theoryPracList: [ - // { title: '物理练习', id: 141, ifPrac: false }, - // { title: '魔法练习', id: 142, ifPrac: true }, - // { title: '近战练习', id: 143, ifPrac: true }, - // { title: '远程练习', id: 144, ifPrac: false } - // ], - // theoryExamList: [ - // { title: '物理考试', id: 161, ifExam: false, time: '00:34:21' }, - // { title: '魔法考试', id: 162, ifExam: true, time: '00:34:21' }, - // { title: '近战考试', id: 163, ifExam: true, time: '00:34:21' }, - // { title: '远程考试', id: 164, ifExam: false, time: '00:34:21' } - // ], - // commentList: [ - // { username: '王二', avatar: '/static/eduImg/avatar.jpg', cont: '写的什么东西' }, - // { username: '张三', avatar: '/static/eduImg/avatar.jpg', cont: '我感觉写得挺好' }, - // { username: '李四', avatar: '/static/eduImg/avatar.jpg', cont: '+3' }, - // { - // username: '孙笑川', - // avatar: '/static/eduImg/avatar.jpg', - // cont: '我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了' - // } - // ] } }, onLoad(params) { @@ -416,7 +328,7 @@ export default { ::v-deep .u-cell__body { padding: 5px !important; } -::v-deep .u-collapse-item__content__text{ +::v-deep .u-collapse-item__content__text { padding: 0 5px !important; } @@ -425,10 +337,12 @@ export default { height: 100vh; background-color: #f8f8f8; box-sizing: border-box; - padding: 5vw 5px; + padding: 5vw 10px; position: relative; + font-style: 20px; .item-stage { + height: 50px; margin: 8px 0; font-size: 16px; display: flex; @@ -439,13 +353,20 @@ export default { .proj-cont { width: 100%; box-sizing: border-box; - padding: 30rpx 20rpx; + padding: 30rpx 0; background-color: #fff; border-radius: 20rpx; display: flex; flex-direction: column; box-shadow: #f4f4f4 2px 2px; + .slot-item-title { + margin-left: 10px; + height: 45px; + line-height: 45px; + font-size: 18px; + } + .user-info { width: 100%; /* height: 8vh; */ @@ -455,6 +376,7 @@ export default { margin-bottom: 2vh; .training-content { + margin: 0 10px; display: flex; margin-top: 10px; white-space: normal; @@ -521,6 +443,8 @@ export default { } .list-wrapper { + padding: 10px; + min-height: 90px; display: flex; justify-content: space-between; align-items: center; @@ -528,11 +452,12 @@ export default { margin-bottom: 10px; padding-bottom: 5px; border-bottom: 1px solid #f0f0f0; - font-size: 12px; color: #b0b0b0; /* height: 400px; */ + background-color: #e6f0fa; overflow: auto; .left-content { + font-size: 18px; width: 50vw; .title { display: flex; @@ -540,8 +465,8 @@ export default { } .note { /* width: 130px; */ - margin-top: 10px; - font-size: 14px; + margin-top: 15px; + margin-bottom: 10px; color: #333; word-wrap: break-word; }