|
@@ -287,18 +287,33 @@
|
|
// console.log("获取预付号",alipayRes.data)
|
|
// console.log("获取预付号",alipayRes.data)
|
|
if (!alipayRes.data.success) {
|
|
if (!alipayRes.data.success) {
|
|
console.log("获取预付号失败");
|
|
console.log("获取预付号失败");
|
|
- uni.showModal({
|
|
|
|
- content: '房间已被占用,请重新选房',
|
|
|
|
- showCancel: false,
|
|
|
|
- success: (res) => {
|
|
|
|
- if (res.confirm) {
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
|
|
|
|
- this.order.roomType
|
|
|
|
- })
|
|
|
|
|
|
+ //小程序创建的订单跳转至选择房间,pms预订单跳转至查询订单
|
|
|
|
+ if (this.order.orderSource === 'MINI_APP') {
|
|
|
|
+ uni.showModal({
|
|
|
|
+ content: '房间已被占用,请重新选房',
|
|
|
|
+ showCancel: false,
|
|
|
|
+ success: (res) => {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
|
|
|
|
+ this.order.roomType
|
|
|
|
+ })
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
|
|
+ uni.showModal({
|
|
|
|
+ content: '订单不可用,请重新选择订单',
|
|
|
|
+ showCancel: false,
|
|
|
|
+ success: (res) => {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: '/subpkg_checkin/queryOrder/queryOrder?'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -351,18 +366,33 @@
|
|
|
|
|
|
if (!alipayRes.data.success) {
|
|
if (!alipayRes.data.success) {
|
|
console.log("获取签名字符串失败");
|
|
console.log("获取签名字符串失败");
|
|
- uni.showModal({
|
|
|
|
- content: '房间已被占用,请重新选房',
|
|
|
|
- showCancel: false,
|
|
|
|
- success: (res) => {
|
|
|
|
- if (res.confirm) {
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
|
|
|
|
- this.order.roomType
|
|
|
|
- })
|
|
|
|
|
|
+ //小程序创建的订单跳转至选择房间,pms预订单跳转至查询订单
|
|
|
|
+ if (this.order.orderSource === 'MINI_APP') {
|
|
|
|
+ uni.showModal({
|
|
|
|
+ content: '房间已被占用,请重新选房',
|
|
|
|
+ showCancel: false,
|
|
|
|
+ success: (res) => {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: '/subpkg_checkin/selectRoom/selectRoom?roomType=' +
|
|
|
|
+ this.order.roomType
|
|
|
|
+ })
|
|
|
|
+ }
|
|
}
|
|
}
|
|
- }
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
|
|
+ uni.showModal({
|
|
|
|
+ content: '订单不可用,请重新选择订单',
|
|
|
|
+ showCancel: false,
|
|
|
|
+ success: (res) => {
|
|
|
|
+ if (res.confirm) {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: '/subpkg_checkin/queryOrder/queryOrder?'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|