Skip to content

J
jz_Travel
Commit 6cb1c8f0 authored by youjie's avatar youjie
Browse files
Options

no message

parent 64e57829
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 118 deletions
pages/airTicket/airTicketOrderDetail.vue
View file @ 6cb1c8f0
...@@ -333,13 +333,6 @@ ...@@ -333,13 +333,6 @@
: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>
...@@ -375,7 +368,6 @@ ...@@ -375,7 +368,6 @@
showModal: false, showModal: false,
erpBaseInfo: null, erpBaseInfo: null,
b2b_user: {}, b2b_user: {},
successVisible: false,
} }
}, },
computed:{ computed:{
...@@ -432,23 +424,6 @@ ...@@ -432,23 +424,6 @@
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
}, },
...@@ -500,11 +475,10 @@ ...@@ -500,11 +475,10 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
that.successVisible = true uni.showToast({
// uni.showToast({ title: "支付失败",
// title: "支付失败", icon: "none",
// icon: "none", });
// });
}, },
}); });
}, },
......
pages/bus/order.vue
View file @ 6cb1c8f0
...@@ -628,15 +628,15 @@ ...@@ -628,15 +628,15 @@
}, },
fail: function(err) { fail: function(err) {
that.submit = true; that.submit = true;
// that.successVisible = true that.successVisible = true
uni.showToast({ // uni.showToast({
title: "支付失败", // title: "支付失败",
icon: "none", // icon: "none",
}); // });
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ // uni.redirectTo({
url: `/pages/bus/orderdetails?orderId=${that.ErpOrderId}&OrderNo=${item.OrderNo}`, // url: `/pages/bus/orderdetails?orderId=${that.ErpOrderId}&OrderNo=${item.OrderNo}`,
}); // });
// let OrderTypeStr = '' // let OrderTypeStr = ''
// // #ifdef MP-DI // // #ifdef MP-DI
// OrderTypeStr = '12,13,14' // OrderTypeStr = '12,13,14'
......
pages/jiuzhai/jz_Reserve.vue
View file @ 6cb1c8f0
...@@ -849,16 +849,16 @@ ...@@ -849,16 +849,16 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
// that.successVisible = true that.successVisible = true
uni.showToast({ // uni.showToast({
title: "支付失败", // title: "支付失败",
icon: "none", // icon: "none",
}); // });
setTimeout(() => { // setTimeout(() => {
uni.redirectTo({ // uni.redirectTo({
url: "/pages/jiuzhai/jz_SureOrder?OrderNo=" + OrderNo, // url: "/pages/jiuzhai/jz_SureOrder?OrderNo=" + OrderNo,
}); // });
}, 100); // }, 100);
}, },
}); });
}, },
......
pages/jiuzhai/jz_SureOrder.vue
View file @ 6cb1c8f0
...@@ -603,13 +603,6 @@ ...@@ -603,13 +603,6 @@
: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>
...@@ -646,7 +639,6 @@ ...@@ -646,7 +639,6 @@
couponMessage:[], couponMessage:[],
showModal: false, showModal: false,
b2b_user: {}, b2b_user: {},
successVisible: false,
}; };
}, },
created() {}, created() {},
...@@ -669,23 +661,6 @@ ...@@ -669,23 +661,6 @@
} }
}, },
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
}, },
...@@ -743,11 +718,10 @@ ...@@ -743,11 +718,10 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
that.successVisible = true uni.showToast({
// uni.showToast({ title: "支付失败",
// title: "支付失败", icon: "none",
// icon: "none", });
// });
}, },
}); });
}, },
......
pages/visa/visa_Reserve.vue
View file @ 6cb1c8f0
...@@ -997,16 +997,16 @@ ...@@ -997,16 +997,16 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
// that.successVisible = true that.successVisible = true
uni.showToast({ // uni.showToast({
title: "支付失败", // title: "支付失败",
icon: "none", // icon: "none",
}); // });
setTimeout(() => { // setTimeout(() => {
uni.redirectTo({ // uni.redirectTo({
url: `/pages/visa/visa_SureOrder?OrderNo=${OrderNo}`, // url: `/pages/visa/visa_SureOrder?OrderNo=${OrderNo}`,
}); // });
}, 100); // }, 100);
}, },
}); });
}, },
......
pages/visa/visa_SureOrder.vue
View file @ 6cb1c8f0
...@@ -560,13 +560,6 @@ ...@@ -560,13 +560,6 @@
<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>
...@@ -601,7 +594,6 @@ ...@@ -601,7 +594,6 @@
OrderNo: '', OrderNo: '',
showModal: false, showModal: false,
b2b_user: {}, b2b_user: {},
successVisible: false,
}; };
}, },
created() {}, created() {},
...@@ -618,23 +610,6 @@ ...@@ -618,23 +610,6 @@
} }
}, },
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
}, },
...@@ -685,11 +660,10 @@ ...@@ -685,11 +660,10 @@
fail: function(err) { fail: function(err) {
console.log("fail:", err); console.log("fail:", err);
that.submit = false; that.submit = false;
that.successVisible = true uni.showToast({
// uni.showToast({ title: "支付失败",
// title: "支付失败", icon: "none",
// 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