Commit e2f3bc0c authored by ZJG's avatar ZJG

1

parent 9bfc6419
...@@ -82,8 +82,12 @@ export default { ...@@ -82,8 +82,12 @@ export default {
url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo) url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo)
}); });
}else{ }else{
uni.navigateTo({ // uni.navigateTo({
url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo) // url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
// });
uni.reLaunch({
url: '/pages/jiuzhai/paysuccess?PreferPrice='+that.payInfo.total_price+'&isFrom=2'
}); });
} }
......
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
}, 1000); }, 1000);
}, },
onLoad(option) { onLoad(option) {
this.current = option.status || -1; this.current = option.status || 0;
this.getHeadList(); this.getHeadList();
this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId; this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
showCoupons: false, showCoupons: false,
couponMessage: '', couponMessage: '',
PreferPrice:'', PreferPrice:'',
isLineOrder:false isLineOrder:0,
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -51,21 +51,26 @@ ...@@ -51,21 +51,26 @@
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.themCustomStyle.color = this.mainColor; this.themCustomStyle.color = this.mainColor;
this.themCustomStyle.borderColor = this.mainColor; this.themCustomStyle.borderColor = this.mainColor;
if(option.isFrom==1){ if(option.isFrom){
this.isLineOrder=true this.isLineOrder=option.isFrom
} }
}, },
methods: { methods: {
redictToOrders() { redictToOrders() {
if(!this.isLineOrder){ if(this.isLineOrder==0){
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/allorderList' url: '/pages/jiuzhai/allorderList'
}); });
}else{ }else if(this.isLineOrder==1){
uni.redirectTo({ uni.redirectTo({
url: '/pages/jiuzhai/jz_MyOrder' url: '/pages/jiuzhai/jz_MyOrder'
}); });
}else if(this.isLineOrder==2){//司导订单
uni.redirectTo({
url: '/pages/guidecar/orderList'
});
} }
}, },
goHome() { goHome() {
......
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