Commit 79310d69 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 445c1574 50b9f5e3
...@@ -280,29 +280,29 @@ ...@@ -280,29 +280,29 @@
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8", "navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8" "backgroundColor": "#F8F8F8"
},
"condition": { //模式配置,仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [{
"name": "观看视频", //模式名称
"path": "pages/video/index", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
// },{
// "name": "基本信息", //模式名称
// "path": "pages/settle/base", //启动页面,必选
// "query": "" //启动参数,在页面的onLoad函数里面得到
},{
"name": "资料信息", //模式名称
"path": "pages/settle/file", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
},{
"name": "缴纳保证金", //模式名称
"path": "pages/settle/pay-ensure", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
},{
"name": "签约页面", //模式名称
"path": "pages/settle/sign-contract", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
}]
} }
} // "condition": { //模式配置,仅开发期间生效
// "current": 0, //当前激活的模式(list 的索引项)
// "list": [{
// "name": "观看视频", //模式名称
// "path": "pages/video/index", //启动页面,必选
// "query": "" //启动参数,在页面的onLoad函数里面得到
// // },{
// // "name": "基本信息", //模式名称
// // "path": "pages/settle/base", //启动页面,必选
// // "query": "" //启动参数,在页面的onLoad函数里面得到
// },{
// "name": "资料信息", //模式名称
// "path": "pages/settle/file", //启动页面,必选
// "query": "" //启动参数,在页面的onLoad函数里面得到
// },{
// "name": "缴纳保证金", //模式名称
// "path": "pages/settle/pay-ensure", //启动页面,必选
// "query": "" //启动参数,在页面的onLoad函数里面得到
// },{
// "name": "签约页面", //模式名称
// "path": "pages/settle/sign-contract", //启动页面,必选
// "query": "" //启动参数,在页面的onLoad函数里面得到
// }]
// }
}
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
onLoad(e) { onLoad(e) {
this.getUserExamInfo()
}, },
methods: { methods: {
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
if(res.data.data.answerList){ if(res.data.data.answerList){
that.handleData() that.handleData()
that.currentTime = 30 that.currentTime = 30
that.startCounting() //that.startCounting()
}else{ }else{
that.isSelect = true that.isSelect = true
that.bottomTitle = '完成考试,现在签约' that.bottomTitle = '完成考试,现在签约'
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
} }
.numberView{ .numberView{
margin-top: 100rpx; margin-top: 40rpx;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
...@@ -468,26 +468,29 @@ ...@@ -468,26 +468,29 @@
} }
.numberText{ .numberText{
color: #333333;
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
} }
.topicView{ .topicView{
margin-top: 100rpx; margin-top: 60rpx;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
} }
.topicText{ .topicText{
color: #333333;
font-size: 28rpx; font-size: 28rpx;
padding-left: 40rpx; padding-left: 28rpx;
padding-right: 40rpx; padding-right: 36rpx;
padding-bottom: 20rpx;
line-height: 48rpx;
} }
.itemView{ .itemView{
margin-top: 100rpx; margin-top: 40rpx;
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
padding-left: 30rpx; padding-left: 30rpx;
padding-right: 40rpx; padding-right: 40rpx;
font-size: 36rpx; font-size: 36rpx;
font-weight: bold;
line-height: 48rpx; line-height: 48rpx;
color: #333333; color: #333333;
} }
......
...@@ -452,9 +452,9 @@ ...@@ -452,9 +452,9 @@
} }
// yuan /pages/take/index // yuan
uni.navigateTo({ uni.navigateTo({
url: '/pages/exam/index' url: '/pages/take/index'
}) })
......
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