Commit b5077e12 authored by zhengke's avatar zhengke

修改

parent b0cb5f6a
...@@ -10,10 +10,8 @@ ...@@ -10,10 +10,8 @@
<text class="Exam_Current">{{current+1}}</text><text class="Exam_Count">/{{Count}}</text> <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="{height: `calc(100vh - 300rpx - ${statusBarHeight}px)`,}"
height: `calc(100vh - 300rpx - ${statusBarHeight}px)`, :current="current" @change="onchange">
}" :autoplay="autoplay" :current="current" @change="onchange" :skip-hidden-item-layout="true"
:disable-programmatic-animation="true">
<swiper-item v-for="(item1, index1) in dataList" :key="index1"> <swiper-item v-for="(item1, index1) in dataList" :key="index1">
<view class="item1" :style="{height: `calc(100vh - 390rpx - ${statusBarHeight}px)`}"> <view class="item1" :style="{height: `calc(100vh - 390rpx - ${statusBarHeight}px)`}">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
...@@ -92,11 +90,10 @@ ...@@ -92,11 +90,10 @@
ctx ctx
} = getCurrentInstance(); } = getCurrentInstance();
let data = reactive({ let data = reactive({
autoplay: false,
dataList: [], dataList: [],
current: 0, //默认从第几个开始-用于从快捷菜单点入 current: 0, //默认从第几个开始-用于从快捷菜单点入
isOperate: false, statusBarHeight: 0,
statusBarHeight: 0 isDati: false
}); });
let UserInfo = uni.getStorageSync('userInfo'); let UserInfo = uni.getStorageSync('userInfo');
...@@ -112,6 +109,10 @@ ...@@ -112,6 +109,10 @@
}, },
onchange(e) { onchange(e) {
data.current = e.detail.current; data.current = e.detail.current;
if(data.current+1==data.dataList.length){
console.log('翻页');
this.$emit('getAfter');
}
}, },
//点击选择答案 //点击选择答案
change(item1, item2) { change(item1, item2) {
...@@ -227,6 +228,7 @@ ...@@ -227,6 +228,7 @@
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
flex-shrink: 0;
} }
.chooseName { .chooseName {
......
...@@ -203,22 +203,22 @@ ...@@ -203,22 +203,22 @@
<view class="Ques_CirContent"> <view class="Ques_CirContent">
<view class="Ques_Circle" @click="goExam(1)"> <view class="Ques_Circle" @click="goExam(1)">
<view class="Ques_Top">单词</view> <view class="Ques_Top">单词</view>
<view class="Ques_Num">{{TypeObj.wordsFinishCount}}/{{TypeObj.wordsTotalCount}}</view> <view class="Ques_Num" v-if="TypeObj">{{TypeObj.wordsFinishCount}}/{{TypeObj.wordsTotalCount}}</view>
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word1.png" alt="" /> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word1.png" alt="" />
</view> </view>
<view class="Ques_Circle"> <view class="Ques_Circle">
<view class="Ques_Top">语法</view> <view class="Ques_Top">语法</view>
<view class="Ques_Num">{{TypeObj.grammarFinishCount}}/{{TypeObj.grammarTotalCount}}</view> <view class="Ques_Num" v-if="TypeObj">{{TypeObj.grammarFinishCount}}/{{TypeObj.grammarTotalCount}}</view>
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word2.png" alt="" /> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word2.png" alt="" />
</view> </view>
<view class="Ques_Circle"> <view class="Ques_Circle">
<view class="Ques_Top">听力</view> <view class="Ques_Top">听力</view>
<view class="Ques_Num">{{TypeObj.listeningFinishCount}}/{{TypeObj.listeningTotalCount}}</view> <view class="Ques_Num" v-if="TypeObj">{{TypeObj.listeningFinishCount}}/{{TypeObj.listeningTotalCount}}</view>
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word3.png" alt="" /> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word3.png" alt="" />
</view> </view>
<view class="Ques_Circle" style="margin-right:0;" @click="goExam(4)"> <view class="Ques_Circle" style="margin-right:0;" @click="goExam(4)">
<view class="Ques_Top">阅读</view> <view class="Ques_Top">阅读</view>
<view class="Ques_Num">{{TypeObj.readingFinishCount}}/{{TypeObj.readingTotalCount}}</view> <view class="Ques_Num" v-if="TypeObj">{{TypeObj.readingFinishCount}}/{{TypeObj.readingTotalCount}}</view>
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word4.png" alt="" /> <img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/word4.png" alt="" />
</view> </view>
</view> </view>
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
//返回首页 //返回首页
goExam(Type) { goExam(Type) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/exam/examStart?Type='+Type+'&&BankType='+data.TypeMsg.BankType url: '/pages/exam/examStart?Type='+Type+'&&BankType='+data.TypeMsg.BankType+'&&StartId='+data.TypeObj.wordsStartId
}); });
}, },
showExambox() { showExambox() {
......
...@@ -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" :Count="Count" /> <word :paperData="dataList" v-if="Type==1" :Count="Count" @getAfter="getAfter()" />
<!-- 阅读理解 --> <!-- 阅读理解 -->
<readingCompre :paperData="dataList" v-if="Type==4"/> <readingCompre :paperData="dataList" v-if="Type==4"/>
</view> </view>
...@@ -52,7 +52,8 @@ export default { ...@@ -52,7 +52,8 @@ export default {
examMsg:{ examMsg:{
PageIndex: 1, PageIndex: 1,
PageSize:20, PageSize:20,
BankType: 1 BankType: 1,
StartId:0
}, },
Count:0, //题目总数 Count:0, //题目总数
Type: 1, //1单词 2语法 3听力 4阅读 Type: 1, //1单词 2语法 3听力 4阅读
...@@ -88,6 +89,13 @@ export default { ...@@ -88,6 +89,13 @@ export default {
} }
}); });
}, },
//往后追加题
getAfter(){
if(data.Type==1){
data.examMsg.PageIndex++;
this.GetWords();
}
},
//获取答案改变后的数据 //获取答案改变后的数据
getAnswerChange(val, index) { getAnswerChange(val, index) {
// data.peaperDetail.Paper.GroupList[index] = val; // data.peaperDetail.Paper.GroupList[index] = val;
...@@ -113,6 +121,9 @@ export default { ...@@ -113,6 +121,9 @@ export default {
if(options&&options.BankType){ if(options&&options.BankType){
this.examMsg.BankType = options.BankType; this.examMsg.BankType = options.BankType;
} }
if(options&&options.StartId){
this.examMsg.StartId = options.StartId;
}
//获取单词 //获取单词
if(this.Type==1){ if(this.Type==1){
this.GetWords(); this.GetWords();
......
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