Commit ccc619a4 authored by 李俊赕's avatar 李俊赕

Merge branch 'dev-photo-tools' of...

Merge branch 'dev-photo-tools' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-tools
parents c4e3fbe5 ecd96af6
......@@ -6,18 +6,18 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
{
"path": "pages/exam/index",
"style": {
"navigationBarTitleText": "入驻考试"
}
},{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/exam/start",
"style": {
......
......@@ -21,11 +21,11 @@
</view>
<view class="itemBackView" v-for="(item,ikey) in currentItem.answerList" :key="ikey">
<view class="itemView">
<view class="itemIndexView">
<text :class="item.isSelect ? 'itemIndexText selectedColor' : 'itemIndexText defaultColor' ">A</text>
<view class="itemView" @click="itemClick(item,ikey)">
<view :class="item.isSelect ? 'itemIndexView' : 'itemIndexView grayBorder' ">
<text :class="item.isSelect ? 'itemIndexText whiteColor selectBackColor' : 'itemIndexText defaultColor' ">A</text>
</view>
<text class="itemText" @click="itemClick(item,ikey)">{{item.content}}</text>
<text :class="item.isSelect ? 'itemText selectedColor' : 'itemText defaultColor' ">{{item.content}}</text>
<!--view></view-->
</view>
......@@ -36,11 +36,16 @@
@click="itemClick(item,ikey)">{{item.content}}</text>
</view-->
<view class="answerBottomView">
<image class="timeIcon" src="" mode=""></image>
<text class="timeText">{{currentTime}}</text>
<view :class="isSelect ? 'nextBtn selectedColor' : 'nextBtn defaultColor' " @click="nextClick()">
<text class="bottomTitle">{{bottomTitle}}</text>
<view class="bottomLeftView">
<image class="timeIcon" :src="clock_url" mode=""></image>
<text class="timeText">倒计时:{{currentTime}}</text>
</view>
<view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' " @click="nextClick()">
<text class="bottomTitle">{{bottomTitle}}</text>
</view>
</view>
</view>
</view>
......@@ -61,10 +66,11 @@
currentNumber: 1,
currentItem: null,
isSelect: false,
currentTime: 30,
currentTime: 100,
progress: '',
bottomTitle: '下一题',
isStop: false,
clock_url:'https://qn-static.banshouhui.com/clock_exam.png'
}
},
onLoad(e) {
......@@ -270,8 +276,9 @@
if (res.data.data.answerList) {
that.handleData()
that.currentTime = 30
//that.startCounting()
that.currentTime = 100
that.isSelect = false//重置
that.startCounting()
} else {
that.isSelect = true
that.bottomTitle = '完成考试,现在签约'
......@@ -329,7 +336,7 @@
if (this.currentTime > 0) {
setTimeout(this.startCounting, 1000);
} else {
this.currentTime = 30
this.currentTime = 100
this.nextClick()
}
......@@ -525,6 +532,10 @@
align-items: center;
justify-content: center;
}
.grayBorder{
border: 2rpx solid #999999;
}
.itemIndexText {
width: 40rpx;
......@@ -572,33 +583,47 @@
.answerBottomView {
background-color: #FFFFFF;
width: 100%;
height: 140rpx;
height: 200rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
position: fixed;
bottom: 0;
}
.bottomLeftView{
height: 160rpx;
display: flex;
flex-direction: row;
align-items: center;
}
.bottomRightView{
height: 160rpx;
display: flex;
flex-direction: row;
align-items: center;
}
.timeIcon {
background-color: #999999;
margin-left: 80rpx;
width: 80rpx;
height: 80rpx;
border-radius: 40rpx;
margin-left: 30rpx;
width: 48rpx;
height: 48rpx;
}
.timeText {
margin-left: 20rpx;
font-size: 32rpx;
color: #999999;
margin-left: 10rpx;
font-size: 28rpx;
color: #333333;
}
.nextBtn {
width: 400rpx;
height: 80rpx;
border-radius: 40rpx;
margin-left: 40rpx;
height: 104rpx;
border-radius: 52rpx;
margin-right: 30rpx;
display: flex;
align-items: center;
justify-content: center;
......@@ -608,11 +633,22 @@
background-color: #FFFFFF;
color: #999999;
}
.defaultBackColor {
background-color: #999999;
}
.selectedColor {
background-color: #2272FF;
color: #2272FF;
}
.whiteColor{
color: #FFFFFF;
}
.selectBackColor {
background-color: #2272FF;
}
.bottom-padding {
padding-bottom: 180rpx;
......
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