Commit b0cb5f6a authored by zhengke's avatar zhengke

修改

parent 0c7fc8ef
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<van-icon name="cross" size="32rpx" @click="goBack()" /> <van-icon name="cross" size="32rpx" @click="goBack()" />
</template> </template>
<template #title> <template #title>
{{current+1}}/{{dataList.length}} <text class="Exam_Current">{{current+1}}</text><text class="Exam_Count">/{{Count}}</text>
</template> </template>
</van-nav-bar> </van-nav-bar>
<swiper class="swiper-box" :style="{ <swiper class="swiper-box" :style="{
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
} from "../../api/exam"; } from "../../api/exam";
export default { export default {
props: { props: {
paperData: Array paperData: Array,
Count: Number
}, },
setup(props, context) { setup(props, context) {
let { let {
...@@ -104,7 +105,6 @@ ...@@ -104,7 +105,6 @@
x.StundetAnswer = ''; x.StundetAnswer = '';
}) })
data.dataList = [...data.dataList, ...val]; data.dataList = [...data.dataList, ...val];
console.log(data.dataList, 'datalist');
}) })
let methods = { let methods = {
goBack() { goBack() {
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
QuestionTypeKey: item1.QuestionTypeKey, QuestionTypeKey: item1.QuestionTypeKey,
Answer: item1.StundetAnswer, Answer: item1.StundetAnswer,
AnswerParse: item1.AnswerParse, AnswerParse: item1.AnswerParse,
LevelType:item1.LevelType,
IsAnswer: 0, IsAnswer: 0,
IsWrong: 0 IsWrong: 0
} }
...@@ -175,47 +176,6 @@ ...@@ -175,47 +176,6 @@
}; };
</script> </script>
<style scoped> <style scoped>
.AnswerBtn {
margin-top: 20rpx;
padding: 0 20px;
}
.clear {
clear: both
}
.AnswerBtnFirst {
width: 250rpx;
height: 60rpx;
text-align: center;
line-height: 60rpx;
border-radius: 10rpx;
border: 1px solid #00ACF9;
color: #00ACF9;
float: left;
}
.AnswerBtnSecond {
width: 250rpx;
height: 60rpx;
text-align: center;
line-height: 60rpx;
border-radius: 10rpx;
background-color: #00ACF9;
color: #fff;
float: right;
}
.name {
height: 90rpx;
font-size: 30rpx;
font-family: PingFang SC;
font-weight: 800;
color: #111111;
display: flex;
align-items: center;
justify-content: space-between;
}
.isTrueAnswer { .isTrueAnswer {
color: green !important; color: green !important;
...@@ -232,27 +192,6 @@ ...@@ -232,27 +192,6 @@
border-radius: 5px; border-radius: 5px;
} }
.Single_Before {
font-size: 30rpx;
font-weight: bold;
color: #da7878;
}
.ExamIndex_Box {
margin-right: 40rpx;
}
.Exam_Total {
font-size: 25rpx;
color: gray;
}
.answerSheet {
font-size: 30rpx;
margin-left: 20rpx;
color: #000;
}
.swiper-box { .swiper-box {
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -264,12 +203,10 @@ ...@@ -264,12 +203,10 @@
} }
.item { .item {
/* margin-bottom: 40rpx; */
position: relative; position: relative;
} }
.item1 { .item1 {
/* margin: 25rpx 0; */
align-items: center; align-items: center;
} }
...@@ -278,11 +215,6 @@ ...@@ -278,11 +215,6 @@
margin: 30rpx 0; margin: 30rpx 0;
} }
.myAnswer {
background-color: #00acf9 !important;
color: #ffffff !important;
}
.chooseNum { .chooseNum {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
...@@ -303,4 +235,12 @@ ...@@ -303,4 +235,12 @@
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
} }
.Exam_Current{
font-size:35rpx;
color:red;
}
.Exam_Count{
color:gray;
font-size:26rpx;
}
</style> </style>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</van-nav-bar> </van-nav-bar>
<view class="exam-con"> <view class="exam-con">
<!-- 单词 --> <!-- 单词 -->
<word :paperData="dataList" v-if="Type==1" /> <word :paperData="dataList" v-if="Type==1" :Count="Count" />
<!-- 阅读理解 --> <!-- 阅读理解 -->
<readingCompre :paperData="dataList" v-if="Type==4"/> <readingCompre :paperData="dataList" v-if="Type==4"/>
</view> </view>
...@@ -54,6 +54,7 @@ export default { ...@@ -54,6 +54,7 @@ export default {
PageSize:20, PageSize:20,
BankType: 1 BankType: 1
}, },
Count:0, //题目总数
Type: 1, //1单词 2语法 3听力 4阅读 Type: 1, //1单词 2语法 3听力 4阅读
}); });
let methods = { let methods = {
...@@ -72,7 +73,7 @@ export default { ...@@ -72,7 +73,7 @@ export default {
if (res) { if (res) {
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
console.log(data.dataList,'数据'); this.Count = res.Data.Count;
} }
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment