diff --git a/otherPages/authentication/components/questionCard.vue b/otherPages/authentication/components/questionCard.vue index c691d27..0e75094 100644 --- a/otherPages/authentication/components/questionCard.vue +++ b/otherPages/authentication/components/questionCard.vue @@ -3,18 +3,60 @@ {{ `${props.index + 1}、${props.data.question}` }} - - {{ `${String.fromCharCode(65 + oIdx)}、${option.label}` }} - + + @@ -57,15 +108,57 @@ const onClick = (val) => { padding: 23rpx; border-radius: 28rpx; + position: relative; + & + & { margin-top: 20rpx; } + + .icon { + position: absolute; + right: 45rpx; + bottom: 23rpx; + display: none; + + } } -.question__view.select { +.textarea { + background-color: #F3F3F3; + padding: 23rpx; + border-radius: 16rpx; + + .highlight { + color: #FF2A2A; + font-size: 28rpx; + } +} + +.question__view.edit { .option.is-selected { background-color: rgba($color: #FFBF60, $alpha: 0.22); color: #FFBF60; } } + +.question__view.display { + .option { + &.is-correct { + background-color: rgba($color: #05C160, $alpha: 0.08); + color: #05C160; + + .icon-correct { + display: block; + } + } + &.is-error { + background-color: rgba($color: #FFEBCE, $alpha: 0.36); + color: #FF2A2A; + + .icon-error { + display: block; + } + } + } +} \ No newline at end of file diff --git a/otherPages/authentication/components/stepProgress.vue b/otherPages/authentication/components/stepProgress.vue index 509e813..c6d2994 100644 --- a/otherPages/authentication/components/stepProgress.vue +++ b/otherPages/authentication/components/stepProgress.vue @@ -83,12 +83,16 @@ const steps = reactive(['基本考核', '培训考核', '最终准备']) .desc { white-space: nowrap; + color: #BDBDBD; } .line.is-active, .step.is-active .num { background-color: #FFBF60; } + .step.is-active .desc { + color: #000000; + } } } \ No newline at end of file diff --git a/otherPages/authentication/examination/base.vue b/otherPages/authentication/examination/base.vue index 6204457..a06b1e9 100644 --- a/otherPages/authentication/examination/base.vue +++ b/otherPages/authentication/examination/base.vue @@ -2,7 +2,7 @@ - + {{ `答题进度 ${answered}/${total}` }} @@ -42,11 +42,8 @@ import { usePageList } from "@/utils/pageList"; import questionCard from '../components/questionCard.vue'; -const total = ref(0) - - // todo -const { list, getData } = usePageList() +const { list, total, getData } = usePageList() onShow(() => { // todo: delete test data @@ -87,7 +84,7 @@ onShow(() => { value: null, }, { - question: '3、狗狗和猫咪一样是肉食性动物,最好可以纯肉喂养,对狗狗的身心健康有很大好处', + question: '狗狗和猫咪一样是肉食性动物,最好可以纯肉喂养,对狗狗的身心健康有很大好处', options: [ { label: '对', @@ -133,7 +130,7 @@ onShow(() => { value: null, }, { - question: '3、狗狗和猫咪一样是肉食性动物,最好可以纯肉喂养,对狗狗的身心健康有很大好处', + question: '狗狗和猫咪一样是肉食性动物,最好可以纯肉喂养,对狗狗的身心健康有很大好处', options: [ { label: '对', diff --git a/otherPages/authentication/examination/baseCompleted.vue b/otherPages/authentication/examination/baseCompleted.vue index 02b8d50..04ac673 100644 --- a/otherPages/authentication/examination/baseCompleted.vue +++ b/otherPages/authentication/examination/baseCompleted.vue @@ -7,37 +7,51 @@ - + 基本考核答题已完成 - + 进行培训考核的答题前请认真观看下面的视频和资料! - - + + 平台&服务介绍 - - - - 猫妈狗爸平台介绍 - - - - 喂养学习视频 + + + + + + {{ item.title }} - - + + 服务培训 + + + + + - - + + 进入培训考核 @@ -47,6 +61,8 @@ \ No newline at end of file diff --git a/otherPages/authentication/examination/errorDetail.vue b/otherPages/authentication/examination/errorDetail.vue index d805733..5416c64 100644 --- a/otherPages/authentication/examination/errorDetail.vue +++ b/otherPages/authentication/examination/errorDetail.vue @@ -1,41 +1,25 @@