diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 1fe4f7b8..d13730d8 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -97,23 +97,16 @@ 去学习 - 去练习 + 去练习 - - 去考试 - + 去考试 @@ -145,7 +138,7 @@ const scrollTop = ref(0); const practiceButtonDisabled = computed(() => isPreview.value === 'preview' || form.value.examStat === '01'); const examinationButtonDisabled = computed(() => isPreview.value === 'preview' || form.value.examStat !== '00'); - + const tabSwitch = (item) => { tabAct.value = item.index; }; @@ -157,16 +150,14 @@ }; const getData = async () => { - common.loading() - try{ + common.loading(); + try { const { body } = await getCourseDetailApi({ crsId: crsId.value }); form.value = body; - } catch(e) { - - } - common.hideLoading() + } catch (e) {} + common.hideLoading(); }; const toStudyPrgh = (info) => { common.navigateTo( @@ -191,6 +182,11 @@ scrollTop.value = e.detail.scrollTop; }; + // 去评论 + const goto_submit = async () => { + if (isPreview.value === 'preview') return common.msg('预览课程不可以评价。'); + common.navigateTo('/pages/courseDetail/submit?crsId=' + crsId.value + '&imgId=' + form.value.imgId); + }; // 去考试 const goto_examination = async () => { if (isPreview.value === 'preview') return common.msg('预览课程不允许考试'); diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 6b4efab4..56442649 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -17,6 +17,7 @@ 剩余时间 { // 判断是否需要查分 + const flagQueryDetail = res.body.flagQueryDetail===''?res.body.flagQuery:res.body.flagQueryDetail common.redirectTo( - `/pages/examination/result?execId=${res.body.execId}&flagQuery=${res.body.flagQuery}&flagQueryDetail=${res.body.flagQueryDetail}&examLenTm=${examLenTm}&papersName=${paperData.papersName}&papersId=${paperData.papersId}&mode=${mode}&crsId=${paperData.crsId}` + `/pages/examination/result?execId=${res.body.execId}&flagQuery=${res.body.flagQuery}&flagQueryDetail=${flagQueryDetail}&examLenTm=${examLenTm}&papersName=${paperData.papersName}&papersId=${paperData.papersId}&mode=${mode}&crsId=${paperData.crsId}` ); - - // if (res.body.flagQuery === 'Y') { - // // 需要查分 - // } else { - // // todo 此处应该有个弹窗交代下结果 - // common.navigateBack(); - // } }) .catch((res) => { console.log('error', res); @@ -723,14 +718,14 @@ .question { display: flex; align-items: center; - // background-color: red; width: 242rpx; - color: red; - + flex-wrap: nowrap; .grey { margin-right: 8rpx; } - + .countdown_time { + white-space: nowrap; + } :deep(.uv-count-down__text) { color: #ffffff !important; font-weight: 600; @@ -740,6 +735,7 @@ .grey { color: #b6e2ff; + white-space: nowrap; } .bold { diff --git a/src/pages/examination/result.vue b/src/pages/examination/result.vue index 1b8ee339..fa7d966c 100644 --- a/src/pages/examination/result.vue +++ b/src/pages/examination/result.vue @@ -83,11 +83,10 @@ :current="sheet_swiper_index" @change="sheet_swiper_change" > - - - + + {{ groupIndex * 10 + index + 1 }} @@ -96,7 +95,6 @@ - @@ -107,7 +105,6 @@ 您暂无权限查看此试卷详情 { + return topicList.map((res) => { + if(res.judgeResult === 'P') { + return 'success' + }else if(res.judgeResult === 'U' && res.anserResult !== '') { + return 'error' + } + }); + }); const flagQuery = ref('N'); const flagQueryDetail = ref('N'); const scrollTop = ref(0); const topic = ref(); - const sheet_index = ref(-1); + const sheet_index = ref(0); const statusImage = computed(() => { // 根据状态返回对应的图片资源 if (pass_status.value === 1) { @@ -352,11 +359,7 @@ margin-left: $bg-margin-left; } - .current { - background-color: rgba(0, 102, 255, 0.6); - border-color: #0066ff; - color: #ffffff; - } + .scroll-Y { // max-height: calc(100vh - var(--status-bar-height) - 70rpx - 70rpx - 40rpx - 64rpx - 68rpx - 60rpx); height: calc(100vh - var(--status-bar-height) - 70rpx - 10rpx); @@ -438,7 +441,12 @@ } .swiper-dots { - height: 20rpx; + display: none; + height: 10rpx; + width: 80rpx; + margin: 0 auto; + border-radius: 10rpx; + background-color: #FCE8E9; } .sheet_table { @@ -457,39 +465,34 @@ margin: 20rpx; } + .circle.success { + // 已完成 + background-color: #E7F8ED; + border-color: #15B859; + color: #15B859; + } + + .circle.error { + // 已完成 + background-color: #FCE8E9; + border-color: #F5212D; + color: #F5212D; + } + .current { - background-color: rgba(0, 102, 255, 0.6); - border-color: #0066ff; - color: #ffffff; - } - - .completed { - // 已完成 - background-color: rgba(0, 102, 255, 0.1); - border-color: #0066ff; - color: #0066ff; - } - - .mark, - .completed.mark { - background-color: rgba(232, 181, 49, 0.1); - color: #e8b531; - border-color: #e8b531; - } - - .current.mark { - // 已完成 - background-color: rgba(0, 102, 255, 0.6); - color: #ffffff; - border-color: #e8b531; + // background-color: rgba(0, 102, 255, 0.6); + // border-color: #0066ff; + // color: #ffffff; } + + } // 主内容框 .main-div { display: flex; flex-direction: column; - padding: 34rpx 0 30rpx 0; + padding: 34rpx 0 20rpx 0; margin: 30rpx 28rpx 20rpx 28rpx; border-radius: 16rpx; position: relative; diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue index f50c1904..7bee6a94 100644 --- a/src/pages/practice/index.vue +++ b/src/pages/practice/index.vue @@ -4,6 +4,7 @@ {{ paperData.name }} + @@ -18,11 +19,12 @@ 练习时长 - + {{ formatSeconds(practiceTime) }} + - - + 暂无数据 +