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

bug-commit

parent 1b6e57dd
......@@ -6,7 +6,13 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/exam/index",
"style": {
"navigationBarTitleText": "入驻考试"
......@@ -18,12 +24,6 @@
"navigationBarTitleText": "考试"
}
},{
"path": "pages/settle/index",
"style": {
"navigationBarTitleText": "充电桩安装招募"
}
},{
"path": "pages/settle/sign-contract",
"style": {
......
......@@ -61,7 +61,7 @@
if(!this.isStop){
return
}
if(this.status>1){
if(this.status>0){
uni.navigateTo({
url:'/pages/settle/prompt'
})
......
......@@ -87,6 +87,7 @@
...this.payResult
}
const res = await this.$u.api.getSettleDepositResult(params);
console.log(res,'res')
if(res.code !== 200){
return
}
......
......@@ -45,13 +45,13 @@
btnTxt:'重新提交',
url:'/pages/settle/file'
},{
// status:5,
// statusName:'step4',
// txtArr:['你已通过','“充电桩安装入驻考试”'],
// tipsArr:['可以正式签约了'],
// btnTxt:'去签约',
// url:'/pages/settle/sign-contract'
// },{
status:8,
statusName:'step4',
txtArr:['你已通过','“充电桩安装入驻考试”'],
tipsArr:['可以正式签约了'],
btnTxt:'去签约',
url:'/pages/settle/sign-contract'
},{
status:[5,6],
statusName:'未支付保证金',
txtArr:['你已成为',"充电桩安装的签约服务商"],
......@@ -65,7 +65,7 @@
btnTxt:'去接单广场逛逛',
url:'/pages/take/index'
}],
// 入驻状态:1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金'
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试'
status:'',
info:null,
......@@ -106,7 +106,12 @@
const status = record.status
const infoArr = this.promptList.filter(item=>{
const itemStatus = parseInt(item.status)
return itemStatus===status || itemStatus.indexOf(status)>=0
// console.log(itemStatus,'itemStatus')
let idx = -2
if(Array.isArray(itemStatus)){
idx = itemStatus.indexOf(status)
}
return itemStatus===status || idx>=0
})
const info = infoArr.length>0 && infoArr[0]
if(status===6){
......
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