Skip to content

E
educationStu
Commit 7b63a3b1 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master 

# Conflicts:
#	src/pages/exam/examPaper.vue
parents d6300413 cf56b230
Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 309 deletions
src/components/subject/FillInTheBlanks.vue
View file @ 7b63a3b1
...@@ -116,6 +116,10 @@ ...@@ -116,6 +116,10 @@
font-weight: bold; font-weight: bold;
color: #DA7878; color: #DA7878;
} }
.Exam_Total{
font-size:25rpx;
color:gray;
}
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); height: calc(100vh - 270rpx);
box-sizing: border-box; box-sizing: border-box;
......
src/components/subject/ListenTopic.vue
View file @ 7b63a3b1
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>
<!-- <view>{{ item1.Title }}</view> --> <!-- <view>{{ item1.Title }}</view> -->
</view> </view>
...@@ -34,6 +33,7 @@ ...@@ -34,6 +33,7 @@
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
<swiper-item></swiper-item>
</swiper> </swiper>
<van-toast id="van-toast" /> <van-toast id="van-toast" />
</view> </view>
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
export default { export default {
props: { props: {
paperData: Object, paperData: Object,
sort: Number sort: Number,
isLast: Boolean
}, },
setup(props, context) { setup(props, context) {
let { let {
...@@ -98,8 +99,10 @@ ...@@ -98,8 +99,10 @@
}, },
onchange(e) { onchange(e) {
data.ExamIndex = e.detail.current; data.ExamIndex = e.detail.current;
console.log(data.ExamIndex,'data.ExamIndex');
console.log(data.data.DetailsList.length + 1,'length');
if (data.ExamIndex === data.data.DetailsList.length + 1) { if (data.ExamIndex === data.data.DetailsList.length + 1) {
console.log('进入') console.log('进入翻页')
this.$emit('getAfterTopic'); this.$emit('getAfterTopic');
} }
if (e.detail.current == 0) { if (e.detail.current == 0) {
...@@ -107,6 +110,11 @@ ...@@ -107,6 +110,11 @@
} }
} }
}; };
onMounted(()=>{
if(props.isLast){
data.current = props.paperData.DetailsList.length;
}
})
return { return {
...toRefs(data), ...toRefs(data),
...methods, ...methods,
...@@ -125,6 +133,15 @@ ...@@ -125,6 +133,15 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before{
font-size: 28rpx;
font-weight: bold;
color:#DA7878;
}
.Exam_Total{
font-size:25rpx;
color:gray;
}
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); height: calc(100vh - 270rpx);
box-sizing: border-box; box-sizing: border-box;
......
src/components/subject/MultipleChoice.vue
View file @ 7b63a3b1
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id"> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>
</view> </view>
<view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id" <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
...@@ -128,6 +127,10 @@ ...@@ -128,6 +127,10 @@
font-weight: bold; font-weight: bold;
color:#DA7878; color:#DA7878;
} }
.Exam_Total{
font-size:25rpx;
color:gray;
}
.swiper-box { .swiper-box {
height: calc(100vh - 270rpx); height: calc(100vh - 270rpx);
box-sizing: border-box; box-sizing: border-box;
......
src/components/subject/SingleChoice.vue
View file @ 7b63a3b1
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
> >
<view class="item1"> <view class="item1">
<view class="flex flex_start_center"> <view class="flex flex_start_center">
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view> <view class="num" v-html="item1.Title"></view>
</view> </view>
...@@ -62,7 +61,7 @@ import { ...@@ -62,7 +61,7 @@ import {
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import { changeNumToHan } from "../../utils/index";
export default { export default {
props: { paperData: Object, sort: Number }, props: { paperData: Object, sort: Number , isLast: Boolean},
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let { ctx } = getCurrentInstance();
...@@ -70,7 +69,7 @@ export default { ...@@ -70,7 +69,7 @@ export default {
autoplay: false, autoplay: false,
sortIndex: props.sort+1, sortIndex: props.sort+1,
data: props.paperData, data: props.paperData,
current: 35 ,//默认从第几个开始-用于从快捷菜单点入 current: 1 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题 ExamIndex: 1, //第几题
}); });
...@@ -101,7 +100,9 @@ export default { ...@@ -101,7 +100,9 @@ export default {
} }
}; };
onMounted(()=>{ onMounted(()=>{
console.log(props.paperData,'props.paperData'); if(props.isLast){
data.current = props.paperData.DetailsList.length;
}
}) })
let that = methods; let that = methods;
return { return {
......
src/components/subject/SingleChoiceNumber.vue
View file @ 7b63a3b1
<template> <template>
<!-- 单选题 --> <!-- 单选题 -->
<view> <view>
<view class="item"> <view class="item">
<view class="name"> <view class="name">
<view> <view>
{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text> <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text>
</view> </view>
<view> <view>
<text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text> <text class="Single_Before">{{ExamIndex}}</text>/<text
</view> class="Exam_Total">{{data.DetailsList.length}}</text>
</view> </view>
<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange"> </view>
<swiper-item <swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
v-for="(item1, index1) in data.DetailsList" <swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
:key="item1.id" <view class="item1">
> <view class="flex flex_start_center">
<view class="item1"> <view class="num" v-html="item1.Title"></view>
<view class="flex flex_start_center"> </view>
<view>{{ index1 + 1 }}、</view>
<view class="num" v-html="item1.Title"></view>
</view>
<view <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
v-for="(item2, index2) in item1.QuestionContentObj" class="flex item2 flex_start_center">
:key="item2.id" <view class="chooseNum" :class="{ myAnswer: item1.myAnswer === item2.Name }"
class="flex item2 flex_start_center" @click="change(index1, index2)">{{ item2.Name }}
> </view>
<view <view class="chooseName" @click="change(index1, index2)" v-html="item2.Content"></view>
class="chooseNum" </view>
:class="{ myAnswer: item1.myAnswer === item2.Name }" </view>
@click="change(index1, index2)" </swiper-item>
>{{ item2.Name }} <swiper-item></swiper-item>
</view> </swiper>
<view </view>
class="chooseName" <van-toast id="van-toast" />
@click="change(index1, index2)" </view>
v-html="item2.Content"
></view>
</view>
</view>
</swiper-item>
<swiper-item></swiper-item>
</swiper>
</view>
<van-toast id="van-toast" />
</view>
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
toRef, toRef,
getCurrentInstance, getCurrentInstance,
watch, watch,
computed, computed,
onMounted, onMounted,
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import {
export default { changeNumToHan
props: { paperData: Object, sort: Number, isLast: Boolean}, } from "../../utils/index";
setup(props, context) { export default {
let { ctx } = getCurrentInstance(); props: {
paperData: Object,
let data = reactive({ sort: Number,
autoplay: false, isLast: Boolean
},
setup(props, context) {
let {
ctx
} = getCurrentInstance();
data: props.paperData, let data = reactive({
sortIndex: props.sort+1, autoplay: false,
current: 0 ,//默认从第几个开始-用于从快捷菜单点入 data: props.paperData,
ExamIndex: 1, //第几题 sortIndex: props.sort + 1,
}); current: 0, //默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题
});
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/exam/examPaper", url: "/pages/exam/examPaper",
}); });
}, },
back() { back() {
uni.navigateBack(); uni.navigateBack();
}, },
//选题 //选题
change(index1, index2) { change(index1, index2) {
data.data.DetailsList[index1].myAnswer = data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
onchange(e){ onchange(e) {
data.ExamIndex = e.detail.current+1; data.ExamIndex = e.detail.current+1;
if(data.ExamIndex===data.data.DetailsList.length+1){ if (data.ExamIndex === data.data.DetailsList.length+1) {
this.$emit('getAfterTopic'); this.$emit('getAfterTopic');
} }
} }
}; };
onMounted(()=>{ onMounted(() => {
// if(props.isLast){ if (props.isLast) {
// data.current = props.paperData.DetailsList.length; data.current = data.data.DetailsList.length-1;
// } }
}) })
let that = methods; let that = methods;
return { return {
...toRefs(data), ...toRefs(data),
...methods, ...methods,
}; };
}, },
}; };
</script> </script>
<style scoped> <style scoped>
.name { .name {
height: 90rpx; height: 90rpx;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 800; font-weight: 800;
color: #111111; color: #111111;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.Single_Before{
font-size: 28rpx; .Single_Before {
font-weight: bold; font-size: 28rpx;
color:#DA7878; font-weight: bold;
} color: #DA7878;
.Exam_Total{ }
font-size:25rpx;
color:gray; .Exam_Total {
} font-size: 25rpx;
.swiper-box { color: gray;
/* height: calc(100vh - 250rpx - constant(safe-area-inset-top, 40rpx)); */ }
height: calc(100vh - 270rpx);
box-sizing: border-box; .swiper-box {
/* padding-bottom: env(safe-area-inset-top, 40rpx); */ /* height: calc(100vh - 250rpx - constant(safe-area-inset-top, 40rpx)); */
/* background-color: #f00; */ height: calc(100vh - 270rpx);
} box-sizing: border-box;
.num { /* padding-bottom: env(safe-area-inset-top, 40rpx); */
font-size: 26rpx; /* background-color: #f00; */
font-family: PingFang SC; }
font-weight: bold;
color: #111111; .num {
} font-size: 26rpx;
.item { font-family: PingFang SC;
/* margin-bottom: 40rpx; */ font-weight: bold;
position: relative; color: #111111;
} }
.item1 {
/* margin: 25rpx 0; */ .item {
align-items: center; /* margin-bottom: 40rpx; */
} position: relative;
.item2 { }
padding-left: 25rpx;
margin: 30rpx 0; .item1 {
} /* margin: 25rpx 0; */
.myAnswer { align-items: center;
background-color: #00acf9 !important; }
color: #ffffff !important;
} .item2 {
.chooseNum { padding-left: 25rpx;
width: 40rpx; margin: 30rpx 0;
height: 40rpx; }
text-align: center;
line-height: 40rpx; .myAnswer {
border-radius: 50%; background-color: #00acf9 !important;
border: 1px solid #e2e2e2; color: #ffffff !important;
margin-right: 30rpx; }
font-size: 26rpx;
font-family: PingFang SC; .chooseNum {
font-weight: bold; width: 40rpx;
color: #111111; height: 40rpx;
} text-align: center;
.chooseName { line-height: 40rpx;
font-size: 24rpx; border-radius: 50%;
font-family: PingFang SC; border: 1px solid #e2e2e2;
font-weight: 500; margin-right: 30rpx;
color: #111111; font-size: 26rpx;
} font-family: PingFang SC;
</style> font-weight: bold;
\ No newline at end of file color: #111111;
}
.chooseName {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
</style>
src/components/subject/judge.vue
View file @ 7b63a3b1
<template> <template>
<!-- 单选题 --> <!-- 单选题 -->
<view> <view>
<view class="item"> <view class="item">
<view class="name" <view class="name">
>{{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }}</view <view>
> {{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }}
<view <text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text>
v-for="(item1, index1) in data.DetailsList" </view>
:key="item1.id" <view>
class="item1" <text class="Single_Before">{{ExamIndex}}</text>/<text class="Exam_Total">{{data.DetailsList.length}}</text>
> </view>
<view class="flex flex_start_center"> </view>
<view>{{ index1 + 1 }}、</view> <swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
<view class="num" v-html="item1.Title"></view> <swiper-item></swiper-item>
</view> <swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
<view class="item1">
<view class="flex flex_start_center">
<view class="num" v-html="item1.Title"></view>
</view>
<view <view v-for="(item2, index2) in item1.QuestionContentObj" :key="item2.id"
v-for="(item2, index2) in item1.QuestionContentObj" class="flex item2 flex_start_center">
:key="item2.id" <view class="chooseNum" :class="{ myAnswer: item1.myAnswer === item2.Name }"
class="flex item2 flex_start_center" @click="change(index1, index2)">{{ item2.Name }}
> </view>
<view <view class="chooseName" @click="change(index1, index2)" v-html="item2.Content"></view>
class="chooseNum" </view>
:class="{ myAnswer: item1.myAnswer === item2.Name }" </view>
@click="change(index1, index2)" </swiper-item>
>{{ item2.Name }} <swiper-item></swiper-item>
</view> </swiper>
<view </view>
class="chooseName" <van-toast id="van-toast" />
@click="change(index1, index2)" </view>
v-html="item2.Content"
></view>
</view>
</view>
</view>
<van-toast id="van-toast" />
</view>
</template> </template>
<script> <script>
import { import {
ref, ref,
reactive, reactive,
toRefs, toRefs,
toRef, toRef,
getCurrentInstance, getCurrentInstance,
watch, watch,
computed, computed,
onMounted, onMounted,
} from "vue"; } from "vue";
import { changeNumToHan } from "../../utils/index"; import {
export default { changeNumToHan
props: { paperData: Object }, } from "../../utils/index";
setup(props, context) { export default {
console.log(57, props.paperData); props: {
let { ctx } = getCurrentInstance(); paperData: Object,
let data = reactive({ sort: Number,
data: props.paperData, isLast: Boolean
}); },
setup(props, context) {
let {ctx} = getCurrentInstance();
let data = reactive({
autoplay: false,
sortIndex: props.sort+1,
data: props.paperData,
current: 1 ,//默认从第几个开始-用于从快捷菜单点入
ExamIndex: 1, //第几题
});
let methods = { let methods = {
changeNumToHan, changeNumToHan,
jumpPage() { jumpPage() {
uni.navigateTo({ uni.navigateTo({
url: "/pages/exam/examPaper", url: "/pages/exam/examPaper",
}); });
}, },
back() { back() {
uni.navigateBack(); uni.navigateBack();
}, },
//选题 //选题
change(index1, index2) { change(index1, index2) {
data.data.DetailsList[index1].myAnswer = data.data.DetailsList[index1].myAnswer =
data.data.DetailsList[index1].QuestionContentObj[index2].Name; data.data.DetailsList[index1].QuestionContentObj[index2].Name;
}, },
}; onchange(e){
return { data.ExamIndex = e.detail.current;
...toRefs(data), if(data.ExamIndex===data.data.DetailsList.length+1){
...methods, this.$emit('getAfterTopic');
}; }
}, if(e.detail.current==0){
}; this.$emit('getBeforeTopic');
}
}
};
onMounted(()=>{
if(props.isLast){
data.current = props.paperData.DetailsList.length;
}
})
let that = methods;
return {
...toRefs(data),
...methods,
};
},
};
</script> </script>
<style scoped> <style scoped>
.name { .name {
font-size: 28rpx; height: 90rpx;
font-family: PingFang SC; font-size: 28rpx;
font-weight: 800; font-family: PingFang SC;
color: #111111; font-weight: 800;
} color: #111111;
.num { display: flex;
font-size: 26rpx; align-items: center;
font-family: PingFang SC; justify-content: space-between;
font-weight: bold; }
color: #111111;
} .Single_Before {
.item { font-size: 28rpx;
margin-bottom: 40rpx; font-weight: bold;
} color: #DA7878;
.item1 { }
margin: 25rpx 0; .Exam_Total{
align-items: center; font-size:25rpx;
} color:gray;
.item2 { }
padding-left: 25rpx; .swiper-box {
margin: 30rpx 0; height: calc(100vh - 270rpx);
} box-sizing: border-box;
.myAnswer { }
background-color: #00acf9 !important; .num {
color: #ffffff !important; font-size: 26rpx;
} font-family: PingFang SC;
.chooseNum { font-weight: bold;
width: 40rpx; color: #111111;
height: 40rpx; }
text-align: center;
line-height: 40rpx; .item {
border-radius: 50%; margin-bottom: 40rpx;
border: 1px solid #e2e2e2; }
margin-right: 30rpx;
font-size: 26rpx; .item1 {
font-family: PingFang SC; margin: 25rpx 0;
font-weight: bold; align-items: center;
color: #111111; }
}
.chooseName { .item2 {
font-size: 24rpx; padding-left: 25rpx;
font-family: PingFang SC; margin: 30rpx 0;
font-weight: 500; }
color: #111111;
} .myAnswer {
</style> background-color: #00acf9 !important;
\ No newline at end of file color: #ffffff !important;
}
.chooseNum {
width: 40rpx;
height: 40rpx;
text-align: center;
line-height: 40rpx;
border-radius: 50%;
border: 1px solid #e2e2e2;
margin-right: 30rpx;
font-size: 26rpx;
font-family: PingFang SC;
font-weight: bold;
color: #111111;
}
.chooseName {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: 500;
color: #111111;
}
</style>
src/components/subject/readingCompre.vue
View file @ 7b63a3b1
...@@ -92,6 +92,7 @@ export default { ...@@ -92,6 +92,7 @@ export default {
props: { props: {
paperData: Object, paperData: Object,
sort: Number, sort: Number,
isLast: Boolean
}, },
setup(props, context) { setup(props, context) {
let { ctx } = getCurrentInstance(); let { ctx } = getCurrentInstance();
...@@ -159,7 +160,9 @@ export default { ...@@ -159,7 +160,9 @@ export default {
}, },
}; };
onMounted(() => { onMounted(() => {
console.log(props.paperData, "props.paperData"); if(props.isLast){
data.current = props.paperData.DetailsList.length;
}
}); });
let that = methods; let that = methods;
return { return {
......
src/pages/exam/examPaper.vue
View file @ 7b63a3b1
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
@getAfterTopic="getAfterTopic()" @getAfterTopic="getAfterTopic()"
v-if="item.QuestionTypeKey === 'fill-in' && index === changeIndex" v-if="item.QuestionTypeKey === 'fill-in' && index === changeIndex"
/> />
<<<<<<< HEAD
<!-- 阅读理解 --> <!-- 阅读理解 -->
<readingCompre <readingCompre
:paperData="item" :paperData="item"
...@@ -84,6 +85,31 @@ ...@@ -84,6 +85,31 @@
/> />
<!-- <Judge :paperData="item" v-if="item.QuestionTypeKey === 'judge'" /> <!-- <Judge :paperData="item" v-if="item.QuestionTypeKey === 'judge'" />
<Write <Write
=======
<!-- 阅读理解 -->
<readingCompre
:paperData="item"
:isLast="isLast"
:sort="index"
@getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()"
v-if="
item.QuestionTypeKey === 'reading-comprehensio' &&
index === changeIndex
"
/>
<!-- 判断题 -->
<Judge
:paperData="item"
:isLast="isLast"
:sort="index"
@getAfterTopic="getAfterTopic()"
@getBeforeTopic="getBeforeTopic()"
v-if="item.QuestionTypeKey === 'judge' && index === changeIndex"
/>
<!--简答题、名词解释、论述题、计算题、口语题、其它-->
<!-- <Write
>>>>>>> cf56b230171a1070596b5408cec3117e0a398f3c
:paperData="item" :paperData="item"
v-if=" v-if="
item.QuestionTypeKey === 'short-answer' || item.QuestionTypeKey === 'short-answer' ||
...@@ -92,8 +118,8 @@ ...@@ -92,8 +118,8 @@
item.QuestionTypeKey === 'calculation' || item.QuestionTypeKey === 'calculation' ||
item.QuestionTypeKey === 'entry-problem' item.QuestionTypeKey === 'entry-problem'
" "
/> /> -->
<Connect :paperData="item" v-if="item.QuestionTypeKey === 'matching'" /> <!-- <Connect :paperData="item" v-if="item.QuestionTypeKey === 'matching'" />
<Sort <Sort
:paperData="item" :paperData="item"
v-if=" v-if="
...@@ -126,8 +152,8 @@ import MultipleChoice from "../../components/subject/MultipleChoice.vue"; ...@@ -126,8 +152,8 @@ import MultipleChoice from "../../components/subject/MultipleChoice.vue";
import ListenTopic from "../../components/subject/ListenTopic.vue"; import ListenTopic from "../../components/subject/ListenTopic.vue";
import FillInTheBlanks from "../../components/subject/FillInTheBlanks"; import FillInTheBlanks from "../../components/subject/FillInTheBlanks";
import readingCompre from "../../components/subject/readingCompre"; import readingCompre from "../../components/subject/readingCompre";
import Judge from "../../components/subject/judge.vue"; import Judge from "../../components/subject/judge.vue";
import Write from "../../components/subject/write.vue"; import Write from "../../components/subject/write.vue";
import Connect from "../../components/subject/Connect.vue"; //"连线题" import Connect from "../../components/subject/Connect.vue"; //"连线题"
import Sort from "../../components/subject/Sort"; //"排序题" import Sort from "../../components/subject/Sort"; //"排序题"
...@@ -151,8 +177,7 @@ export default { ...@@ -151,8 +177,7 @@ export default {
time: 2 * 60 * 60 * 1000, time: 2 * 60 * 60 * 1000,
statusBarHeight: 0, statusBarHeight: 0,
// msg: { GuestId: Gid, PaperId: 6, Id: 3 }, // msg: { GuestId: Gid, PaperId: 6, Id: 3 },
msg: { GuestId: Gid, PaperId: 25, Id: 6 }, msg: { GuestId: Gid, PaperId: 5, Id: 0 },
// msg: { GuestId: Gid, PaperId: 5, Id: 0 },
peaperDetail: {}, peaperDetail: {},
changeIndex: 0, changeIndex: 0,
isLast: false, //用于判断是否从后往前翻 isLast: false, //用于判断是否从后往前翻
...@@ -179,6 +204,7 @@ export default { ...@@ -179,6 +204,7 @@ export default {
//往后翻 //往后翻
getAfterTopic() { getAfterTopic() {
this.changeIndex++; this.changeIndex++;
this.isLast = false;
}, },
//往前翻 //往前翻
getBeforeTopic() { getBeforeTopic() {
......
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