Commit c502a311 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 3f7dacd2 c0541458
......@@ -6,30 +6,30 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/exam/index",
"style": {
"navigationBarTitleText": "入驻考试"
}
{
"path": "pages/settle/sign-contract",
"style": {
"navigationBarTitleText": "签约页面"
}
},{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/exam/index",
"style": {
"navigationBarTitleText": "入驻考试"
}
},{
"path": "pages/exam/start",
"style": {
"navigationBarTitleText": "考试"
}
},{
"path": "pages/settle/sign-contract",
"style": {
"navigationBarTitleText": "签约页面"
}
},{
"path": "pages/index/index",
"style": {
......
......@@ -41,7 +41,8 @@
<text class="timeText">倒计时:{{currentTime}}</text>
</view>
<view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' " @click="nextClick()">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@click="nextClick()">
<text class="bottomTitle">{{bottomTitle}}</text>
</view>
</view>
......@@ -70,12 +71,14 @@
progress: '',
bottomTitle: '下一题',
isStop: false,
clock_url:'https://qn-static.banshouhui.com/clock_exam.png'
clock_url:'https://qn-static.banshouhui.com/clock_exam.png',
examScore:1,
}
},
onLoad(e) {
//this.postResult()
this.getUserExamInfo()
},
......@@ -388,9 +391,10 @@
console.log(this.bottomTitle)
if (this.bottomTitle == '完成考试,现在签约') {
uni.navigateTo({
url: '/pages/settle/prompt'
})
this.postResult()
// uni.navigateTo({
// url: '/pages/settle/prompt'
// })
return
}
......@@ -399,6 +403,61 @@
this.handleAnswer()
//this.getNext()
},
//上传考试结果
postResult: function () {
uni.showLoading({
title: '请稍候'
})
let that = this
uni.request({
url: 'https://rest-u.test.ibanshou.cn/v1/settled/update-settled-exam-score'
+'?access-token='+getApp().globalData.token,
method: 'POST',
data: {
score:this.examScore,
},
success: (res) => {
uni.hideLoading()
console.log('上传考试结果 成功')
console.log(res)
if (res.statusCode == 401) {
uni.navigateTo({
url: '/pages/login/wxlogin'
})
return
}
if (res.statusCode == 200) {
uni.navigateTo({
url: '/pages/settle/prompt'
})
} else {
uni.showToast({
icon: 'none',
title: "上传考试结果失败"
})
}
},
fail: (e) => {
uni.hideLoading()
uni.showToast({
icon: 'none',
title: '上传考试结果失败'
})
// console.log('获取下单列表 失败')
// console.log(e)
}
})
},
//所选答案
handleAnswer: function() {
......
......@@ -68,7 +68,7 @@
<view class="addressBackView">
<textarea
class="addressTextAreaView"
maxlength="300"
maxlength="100"
v-model="baseInfo.address"
auto-height="true"
value=""
......@@ -81,12 +81,12 @@
</view>
<view class="seat"></view>
<view class="btn-wrap flex-xc">
<<<<<<< HEAD
<button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)">
=======
<!--view class="">submitBaseInfo</view-->
<button class="btn-submit" :disabled="!submitStatus" @click="submitBaseInfo()">
>>>>>>> 0dade5e4a5ee0777e1ef0c34a1dacaef53b723bb
<!--button class="btn-submit" :disabled="!submitStatus" @click="submitBaseInfo()"-->
确定
</button>
</view>
......
......@@ -21,47 +21,47 @@
promptList:[{
status:1,
statusName:'待审核',
txtArr:['你已成功提交资料','正在审核中'],
txtArr:['您已成功提交资料','正在审核中'],
btnTxt:'去接单广场逛逛',
url:'/pages/take/index'
},{
status:2,
statusName:'已通过',
txtArr:['你已通过','“充电桩安装入驻审核”'],
txtArr:['您已通过','“充电桩安装入驻审核”'],
btnTxt:'去考试',
url:'/pages/exam/index'
},{
status:3,
statusName:'备选',
txtArr:['你已成为',"“充电桩安装备选服务商”"],
txtArr:['您已成为',"“充电桩安装备选服务商”"],
tipsArr:['后续如有业务,请留意通知!'],
btnTxt:'去接单广场逛逛',
url:'/pages/take/index'
},{
status:4,
statusName:'已驳回',
txtArr:['你的入驻资料已被驳回!','可重新提交资料!'],
txtArr:['您的入驻资料已被驳回!','可重新提交资料!'],
tipsArr:['原因:','图片不够清楚'],
btnTxt:'重新提交',
url:'/pages/settle/file'
},{
status:8,
statusName:'step4',
txtArr:['你已通过','“充电桩安装入驻考试”'],
txtArr:['您已通过','“充电桩安装入驻考试”'],
tipsArr:['可以正式签约了'],
btnTxt:'去签约',
url:'/pages/settle/sign-contract'
},{
status:[5,6],
statusName:'未支付保证金',
txtArr:['你已成为',"充电桩安装的签约服务商"],
txtArr:['您已成为',"充电桩安装的签约服务商"],
tipsArr:['请缴纳1000元质保金'],
btnTxt:'去缴纳保证金',
url:'/pages/settle/pay-ensure'
},{
status:7,
statusName:'已支付保证金',
txtArr:['你已成为',"充电桩安装的正式服务商"],
txtArr:['您已成为',"充电桩安装的正式服务商"],
btnTxt:'去接单广场逛逛',
url:'/pages/take/index'
}],
......
......@@ -25,25 +25,25 @@
<template v-if="baseInfo.pay_type==='bankcard'">
<view class="item item-input flex u-row-between">
<label class="label">银行名称</label>
<input placeholder="请输入银行名称" v-model="baseInfo.bank_name" class="input flex1" />
<input placeholder="请输入银行名称" maxlength="100" v-model="baseInfo.bank_name" class="input flex1" />
</view>
<view class="item item-input flex u-row-between">
<label class="label">银行卡号</label>
<input placeholder="请输入银行卡号" v-model="baseInfo.bank_no" type="number" class="input flex1" />
<input placeholder="请输入银行卡号" maxlength="30" v-model="baseInfo.bank_no" type="number" class="input flex1" />
</view>
<view class="item item-input flex u-row-between">
<label class="label">支行名称</label>
<input placeholder="请输入支行名称" v-model="baseInfo.bank_site" class="input flex1" />
<input placeholder="请输入支行名称" maxlength="100" v-model="baseInfo.bank_site" class="input flex1" />
</view>
</template>
<template v-else>
<view class="item item-input flex u-row-between">
<label class="label">姓名</label>
<input placeholder="请输入账户名称" v-model="baseInfo.bank_name" class="input flex1" />
<input placeholder="请输入账户名称" maxlength="30" v-model="baseInfo.bank_name" class="input flex1" />
</view>
<view class="item item-input flex u-row-between">
<label class="label">支付宝账号</label>
<input placeholder="请输入支付宝账号" v-model="baseInfo.bank_no" class="input flex1" />
<input placeholder="请输入支付宝账号" maxlength="100" v-model="baseInfo.bank_no" class="input flex1" />
</view>
</template>
</view>
......
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