Skip to content

J
jz_Travel
Commit 64e57829 authored by youjie's avatar youjie
Browse files
Options

no message

parent a7652d90
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 19 deletions
pages/airTicket/airTicketOrderDetail.vue
View file @ 64e57829
...@@ -333,6 +333,13 @@ ...@@ -333,6 +333,13 @@
:showModal="showModal" :showModal="showModal"
@cancel="cancelModal" @cancel="cancelModal"
:orderNo="OrderNo"></cancelPrompt> :orderNo="OrderNo"></cancelPrompt>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -368,6 +375,7 @@ ...@@ -368,6 +375,7 @@
showModal: false, showModal: false,
erpBaseInfo: null, erpBaseInfo: null,
b2b_user: {}, b2b_user: {},
successVisible: false,
} }
}, },
computed:{ computed:{
...@@ -424,6 +432,23 @@ ...@@ -424,6 +432,23 @@
this.navigatorToHomeHandle() this.navigatorToHomeHandle()
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '16'
// #endif
// #ifdef MP-AG
OrderTypeStr = '1'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
cancelModal(){ cancelModal(){
this.showModal = false this.showModal = false
}, },
...@@ -475,10 +500,11 @@ ...@@ -475,10 +500,11 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
uni.showToast({ that.successVisible = true
title: "支付失败", // uni.showToast({
icon: "none", // title: "支付失败",
}); // icon: "none",
// });
}, },
}); });
}, },
......
pages/bus/orderdetails.vue
View file @ 64e57829
...@@ -264,6 +264,13 @@ ...@@ -264,6 +264,13 @@
@cancel="cancelModal" @cancel="cancelModal"
:orderNo="OrderNo" :orderNo="OrderNo"
:CancelPolicy="CancelPolicy"></cancelPrompt> :CancelPolicy="CancelPolicy"></cancelPrompt>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -365,6 +372,7 @@ ...@@ -365,6 +372,7 @@
showModal: false, showModal: false,
OrderNo: '', OrderNo: '',
CancelPolicy: '', CancelPolicy: '',
successVisible: false,
}; };
}, },
created() { created() {
...@@ -390,6 +398,23 @@ ...@@ -390,6 +398,23 @@
if (this.id) this.getOrderDetail(); if (this.id) this.getOrderDetail();
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '12,13,14'
// #endif
// #ifdef MP-AG
OrderTypeStr = '5'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
cancelModal(){ cancelModal(){
this.showModal = false this.showModal = false
}, },
...@@ -443,10 +468,11 @@ ...@@ -443,10 +468,11 @@
}, },
fail: function(err) { fail: function(err) {
that.submit = false; that.submit = false;
uni.showToast({ that.successVisible = true
title: "支付失败", // uni.showToast({
icon: "none", // title: "支付失败",
}); // icon: "none",
// });
}, },
}); });
}, },
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 64e57829
...@@ -603,6 +603,13 @@ ...@@ -603,6 +603,13 @@
:showModal="showModal" :showModal="showModal"
@cancel="cancelModal" @cancel="cancelModal"
:orderNo="orderData.OrderNo"></cancelPrompt> :orderNo="orderData.OrderNo"></cancelPrompt>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -638,7 +645,8 @@ ...@@ -638,7 +645,8 @@
showCoupons:false, showCoupons:false,
couponMessage:[], couponMessage:[],
showModal: false, showModal: false,
b2b_user: {} b2b_user: {},
successVisible: false,
}; };
}, },
created() {}, created() {},
...@@ -661,6 +669,23 @@ ...@@ -661,6 +669,23 @@
} }
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '1,2,3'
// #endif
// #ifdef MP-AG
OrderTypeStr = '2'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
cancelModal(){ cancelModal(){
this.showModal = false this.showModal = false
}, },
...@@ -718,10 +743,11 @@ ...@@ -718,10 +743,11 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
uni.showToast({ that.successVisible = true
title: "支付失败", // uni.showToast({
icon: "none", // title: "支付失败",
}); // icon: "none",
// });
}, },
}); });
}, },
......
pages/visa/visa_SureOrder.vue
View file @ 64e57829
...@@ -540,7 +540,7 @@ ...@@ -540,7 +540,7 @@
</button> </button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-AG --> <!-- #ifdef MP-AG -->
<button v-if="!submit&&((b2b_user.isGuideOrLeader==1&&orderData.OrderModel.Income==0&&orderData.OrderModel.VisaOrderStatus==3)||b2b_user.isGuideOrLeader!=1)" class="jz_OrderReNow" @click="goCancel" <button v-if="((b2b_user.isGuideOrLeader==1&&orderData.OrderModel.Income==0&&orderData.OrderModel.VisaOrderStatus==3)||b2b_user.isGuideOrLeader!=1)" class="jz_OrderReNow" @click="goCancel"
style="background: #fff; color: #111; border: 1px solid #111" style="background: #fff; color: #111; border: 1px solid #111"
:disabled="submitCancel" :disabled="submitCancel"
:loading="submitCancel"> :loading="submitCancel">
...@@ -560,6 +560,13 @@ ...@@ -560,6 +560,13 @@
<cancelPrompt v-if="showModal" <cancelPrompt v-if="showModal"
:showModal="showModal" :showModal="showModal"
@cancel="cancelModal" :orderNo="orderData.OrderNo"></cancelPrompt> @cancel="cancelModal" :orderNo="orderData.OrderNo"></cancelPrompt>
<u-modal :border-radius="16"
@confirm="nativageToOrderHandle"
title="订单提醒"
content="订单创建成功,请您在5分钟内完成付款,否则将会被取消."
@cancel="navigatorToHomeHandle"
v-model="successVisible" confirm-text='查看订单' cancel-text='返回首页'
confirm-color='#DEBF7B' cancel-color='#080A09' :show-cancel-button="true"></u-modal>
</view> </view>
</template> </template>
...@@ -593,7 +600,8 @@ ...@@ -593,7 +600,8 @@
OrderTypeStr: 0, OrderTypeStr: 0,
OrderNo: '', OrderNo: '',
showModal: false, showModal: false,
b2b_user: {} b2b_user: {},
successVisible: false,
}; };
}, },
created() {}, created() {},
...@@ -610,6 +618,23 @@ ...@@ -610,6 +618,23 @@
} }
}, },
methods: { methods: {
navigatorToHomeHandle() {
uni.redirectTo({
url: '/pages/index/index'
})
},
nativageToOrderHandle(){
let OrderTypeStr = ''
// #ifdef MP-DI
OrderTypeStr = '15'
// #endif
// #ifdef MP-AG
OrderTypeStr = '6'
// #endif
uni.redirectTo({
url: `/pages/AggregateOrders/AggregateOrdersList?OrderTypeStr=${OrderTypeStr}`,
});
},
cancelModal(){ cancelModal(){
this.showModal = false this.showModal = false
}, },
...@@ -660,10 +685,11 @@ ...@@ -660,10 +685,11 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
uni.showToast({ that.successVisible = true
title: "支付失败", // uni.showToast({
icon: "none", // title: "支付失败",
}); // icon: "none",
// });
}, },
}); });
}, },
......
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