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