Commit b8c5c029 authored by 罗超's avatar 罗超

2

parent 2fd18c68
...@@ -158,27 +158,30 @@ ...@@ -158,27 +158,30 @@
font-weight: 500; font-weight: 500;
color: #111111; color: #111111;
margin-bottom: 80rpx; margin-bottom: 80rpx;
text-align: center; display: flex;
/* text-align-last: left; */ justify-content: center;
word-wrap: break-word; align-items: center;
} }
.Japanese { .Japanese {
font-size: 60rpx; font-size: 60rpx;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
text-align: center; display: flex;
/* text-align-last: left; */ justify-content: center;
margin-bottom: 60rpx; align-items: center;
word-wrap: break-word; margin-bottom: 60rpx;
padding: 0 20rpx; padding: 0 20rpx;
} }
.wordPronItem .desc { .wordPronItem .desc {
display: flex; display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-bottom: 200rpx; margin-bottom: 200rpx;
padding: 0 20rpx;
box-sizing: border-box;
} }
.wordPronItem .attr { .wordPronItem .attr {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
} }
.dc2 { .dc2 {
font-size: 30rpx; font-size: 32rpx;
color: #111111; color: #111111;
font-weight: 500; font-weight: 500;
margin-top: 160rpx; margin-top: 160rpx;
...@@ -46,31 +46,36 @@ ...@@ -46,31 +46,36 @@
} }
.choice-item { .choice-item {
height: 106rpx; min-height: 85rpx;
border-radius: 54rpx; border-radius: 54rpx;
background: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 32rpx; font-size: 32rpx;
color: #111111; color: #111111;
margin-bottom: 19px; margin-bottom: 38rpx;
position: relative; position: relative;
overflow-x: scroll;
box-sizing: border-box;
padding: 20rpx 30rpx;
font-weight: 500;
} }
.correct { .correct {
background: #4C50E7; background-color: #4C50E7;
color: #FFFFFF; color: #FFFFFF;
} }
.sign { .sign {
position: absolute; position: absolute;
right: 33px; right: 66rpx;
top: 36rpx; top: 50%;
transform: translateY(-50%);
} }
.error { .error {
background: #F66633; background-color: #F66633;
color: #FFFFFF; color: #FFFFFF;
} }
</style> </style>
...@@ -145,7 +150,7 @@ ...@@ -145,7 +150,7 @@
if (data.current !== props.item.Answer) { if (data.current !== props.item.Answer) {
setTimeout(() => { setTimeout(() => {
data.isShowExplain = true data.isShowExplain = true
}, 500) }, 800)
} else { } else {
setTimeout(() => { setTimeout(() => {
emit('next',1) emit('next',1)
......
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
margin-top: 160rpx; margin-top: 160rpx;
background: #E4E5FB; background: #E4E5FB;
position: relative; position: relative;
} }
.correct{ .correct{
background: #4C50E7; background: #4C50E7;
......
...@@ -67,6 +67,10 @@ ...@@ -67,6 +67,10 @@
@click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId}&&ChapterId=${pageData.Words.NextCourseNo}&&ReviewChapterId=${pageData.Words.ReviewCourseNo}&&ClassId=${pageData.Words.ClassId}`)"> @click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId}&&ChapterId=${pageData.Words.NextCourseNo}&&ReviewChapterId=${pageData.Words.ReviewCourseNo}&&ClassId=${pageData.Words.ClassId}`)">
开始学习 开始学习
</view> </view>
<view class="wordBtn"
@click="jumpPage(`/pages/word/test?CourseId=${pageData.Words.CourseId}&&ChapterId=${pageData.Words.NextCourseNo}&&ReviewChapterId=${pageData.Words.ReviewCourseNo}&&ClassId=${pageData.Words.ClassId}`)">
开始ces
</view>
</view> </view>
<view class="courseBox"> <view class="courseBox">
<view class="courseInnerBox" @click="jumpTimetable"> <view class="courseInnerBox" @click="jumpTimetable">
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<swiper-item v-for="(item,index) in ReviewList" v-if="Type==1" :key="index" class="swiper-item"> <swiper-item v-for="(item,index) in ReviewList" v-if="Type==1" :key="index" class="swiper-item">
<Pronunciation :item="item" :cur="index+1" :total="ReviewList.length" :type="1"></Pronunciation> <Pronunciation :item="item" :cur="index+1" :total="ReviewList.length" :type="1"></Pronunciation>
</swiper-item> </swiper-item>
<swiper-item></swiper-item>
</swiper> </swiper>
</view> </view>
</template> </template>
...@@ -91,12 +91,7 @@ ...@@ -91,12 +91,7 @@
} }
data.readMsg.StudyType = type; data.readMsg.StudyType = type;
proxy.$request('/AppletWords/SetStuWordsPrep', data.readMsg).then(res => { proxy.$request('/AppletWords/SetStuWordsPrep', data.readMsg).then(res => {
if(res.Data.StudyNum==res.Data.TotalNum){
uni.navigateTo({
url: "/pages/word/studyComplete?CourseId=" + data.readMsg.CourseId + '&&ChapterId=' + data.readMsg.ChapterId +
'&&NextChapterId=' + '0'
})
}
}) })
} }
} }
......
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