|
@@ -134,35 +134,35 @@ export default {
|
|
|
console.log(e)
|
|
|
if(e.type == 'xcz'){
|
|
|
// 进度消息
|
|
|
- if(e.data.level == 'c'){
|
|
|
- this.curWorkStutesText= e.data.message
|
|
|
+ if(e.data.level == 'C'){
|
|
|
+ this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
// 洗车完成
|
|
|
- if(e.data.code=="XCWC"){
|
|
|
+ if(e.data.msgCode=="XCWC"){
|
|
|
this.washCarSuccess()
|
|
|
}
|
|
|
}
|
|
|
// 错误消息
|
|
|
- if(e.data.level == 'f'){
|
|
|
- this.curWorkStutesText= e.data.message
|
|
|
+ if(e.data.level == 'F'){
|
|
|
+ this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
this.devError()
|
|
|
}
|
|
|
// 复位状态
|
|
|
- if(e.data.leve == 'd'){
|
|
|
- this.curWorkStutesText= e.data.message
|
|
|
+ if(e.data.leve == 'D'){
|
|
|
+ this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
// 开始复位
|
|
|
- if(e.data.code=="FW_START"){
|
|
|
+ if(e.data.msgCode=="FW_START"){
|
|
|
this.showStart = true;
|
|
|
this.showStop = false;
|
|
|
}
|
|
|
// 复位成功
|
|
|
- if(e.data.code=="FW_SUCC"){
|
|
|
+ if(e.data.msgCode=="FW_SUCC"){
|
|
|
this.resetRabtSuccess()
|
|
|
}
|
|
|
}
|
|
|
// 停止
|
|
|
- if(e.data.level == 'a'){
|
|
|
- if(e.data.code=="JJTZ"||e.data.code=="XCX_JJTZ"){
|
|
|
- this.curWorkStutesText= e.data.message
|
|
|
+ if(e.data.level == 'A'){
|
|
|
+ if(e.data.msgCode=="JJTZ"||e.data.msgCode=="XCX_JJTZ"){
|
|
|
+ this.curWorkStutesText= e.data.msgCodeInfo
|
|
|
this.stopWashCarSuccess()
|
|
|
}else{
|
|
|
this.devError()
|
|
@@ -222,7 +222,8 @@ export default {
|
|
|
this.showStart = false;
|
|
|
this.step = 0;
|
|
|
// 进度条,服务时间根据不同的服务类型而不同
|
|
|
- let serverTime = this.washDuration/60
|
|
|
+ // let serverTime = this.washDuration/60
|
|
|
+ let serverTime = 20
|
|
|
this.interId = setInterval(()=>{
|
|
|
// 小于60时说明洗车机正在工作中
|
|
|
if(this.step<=60){
|
|
@@ -270,9 +271,7 @@ export default {
|
|
|
showCancel: false,
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
- uni.redirectTo({
|
|
|
- url: "/pages/order/orderDetail"
|
|
|
- })
|
|
|
+ uni.navigateBack()
|
|
|
}
|
|
|
}
|
|
|
});
|