Commit b19f341d authored by 和慭琛's avatar 和慭琛

bug fix

parent a04a5a02
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
}, },
......
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
TimeID:-1, TimeID:-1,
userType:'', userType:'',
isContentShow:true, isContentShow:true,
fromWhere:'',
//退单弹窗相关 //退单弹窗相关
isCancelShow:false, isCancelShow:false,
result:{ result:{
...@@ -205,6 +205,11 @@ ...@@ -205,6 +205,11 @@
this.isBottomShow = e.isBottomShow this.isBottomShow = e.isBottomShow
} }
if(e && e.fromWhere){
this.fromWhere = e.fromWhere
}
this.datetime = this.getTime() this.datetime = this.getTime()
//console.log('当前时间:'+this.datetime) //console.log('当前时间:'+this.datetime)
...@@ -570,7 +575,7 @@ ...@@ -570,7 +575,7 @@
}, },
//退单点击
cancelClick: function () { cancelClick: function () {
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
...@@ -605,6 +610,8 @@ ...@@ -605,6 +610,8 @@
//退单请求 //退单请求
cancelPost: function (rejectReason) { cancelPost: function (rejectReason) {
let that = this
uni.showLoading({ uni.showLoading({
title:'请稍候' title:'请稍候'
...@@ -633,8 +640,14 @@ ...@@ -633,8 +640,14 @@
title:'退单成功', title:'退单成功',
}) })
var delta = 1
if(that.fromWhere == '抢单页'){
delta = 2
}
setTimeout(function() { setTimeout(function() {
uni.navigateBack({}) uni.navigateBack({
delta:delta
})
}, 1000); }, 1000);
}else{ }else{
......
...@@ -521,7 +521,8 @@ ...@@ -521,7 +521,8 @@
setTimeout(function() { setTimeout(function() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/detail' url: '/pages/take/detail'
+'?orderId='+that.orderId, +'?orderId='+that.orderId
+'&fromWhere=抢单页',
}) })
}, 1000); }, 1000);
......
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