Commit fb589d2d authored by 潘永坪's avatar 潘永坪

半屏小程序开发

parent ba31412a
...@@ -198,24 +198,6 @@ export default { ...@@ -198,24 +198,6 @@ export default {
} }
}) })
}, },
aaa(){
uni.openEmbeddedMiniProgram({
appId: 'wx888e5ed62eb274db', // 目标小程序的appid
path: 'pages/payment/orderPayment/orderPayment', // 打开的页面路径,可选
extraData: { // 需要传递给目标小程序的数据,可选
orderId: 'z0017322618978189e13cc13adb58918',
openid:'oroHZ5D2kemXkyFtTb_KnJMH1fqc'
},
success: (res) => {
// 打开成功的回调
console.log('打开嵌入的小程序成功', res)
},
fail: (err) => {
// 打开失败的回调
console.error('打开嵌入的小程序失败', err)
}
})
},
//---跳转到订单列表 //---跳转到订单列表
goOrderlist(orderStatus){ goOrderlist(orderStatus){
uni.navigateTo({ uni.navigateTo({
......
...@@ -76,7 +76,6 @@ export default { ...@@ -76,7 +76,6 @@ export default {
afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情 afterBuyUrl:'/pages/my/order/electronicTicket/electronicTicket', //支付成功后地址跳转,默认单票跳详情
ifyukuaiCode: '' ,//是否是渝快码跳入,渝快码跳入需要在H5端另外走流程 ifyukuaiCode: '' ,//是否是渝快码跳入,渝快码跳入需要在H5端另外走流程
albumOrderdetail:'',//是否跳影集订单详情 albumOrderdetail:'',//是否跳影集订单详情
navigateBackMiniProgram:'',//是否返回上一个小程序
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -88,7 +87,6 @@ export default { ...@@ -88,7 +87,6 @@ export default {
this.payType = 33 this.payType = 33
//#endif //#endif
this.orderId=this.$commonjs.getKey(option,'orderId') this.orderId=this.$commonjs.getKey(option,'orderId')
this.navigateBackMiniProgram=this.$commonjs.getKey(option,'navigateBackMiniProgram')
this.ifyukuaiCode = option.ifyukuaiCode||'' this.ifyukuaiCode = option.ifyukuaiCode||''
this.albumOrderdetail=option.albumOrderdetail||'' this.albumOrderdetail=option.albumOrderdetail||''
this.openid = uni.getStorageSync('openid') || '' this.openid = uni.getStorageSync('openid') || ''
...@@ -240,21 +238,6 @@ export default { ...@@ -240,21 +238,6 @@ export default {
signType: this.signType, signType: this.signType,
paySign: this.paySign, paySign: this.paySign,
success:res=>{ success:res=>{
// if(this.navigateBackMiniProgram){
// //如果是需要返回上一个小程序,直接返回上一个小程序
// uni.navigateBackMiniProgram({
// extraData: {
// pay: 'success'
// },
// success(res) {
// // 返回成功
// }
// })
// }else{
// uni.navigateTo({
// url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
// })
// }
uni.navigateTo({ uni.navigateTo({
url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode url: '/pages/payment/paySuccess/paySuccess?orderId=' + this.orderId+'&afterBuyUrl=' + this.afterBuyUrl + '&ifyukuaiCode=' + this.ifyukuaiCode
}) })
......
...@@ -59,10 +59,23 @@ export default { ...@@ -59,10 +59,23 @@ export default {
if (res.code == '00') { if (res.code == '00') {
//如果是组合票,直接跳订单列表页面 //如果是组合票,直接跳订单列表页面
let orderType=res.main.orderType let orderType=res.main.orderType
let apiCategory= wx.getEnterOptionsSync().apiCategory
if(orderType=='10'){ if(orderType=='10'){
uni.reLaunch({ if(apiCategory=='embedded'){
url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode //如果是半屏小程序直接返回上一个小程序
}) uni.navigateBackMiniProgram({
extraData: {
pdPay: 'success'
},
success(res) {
// 返回成功
}
})
}else{
uni.reLaunch({
url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
})
}
return return
} }
this.status = res.main.orderStatus this.status = res.main.orderStatus
...@@ -70,9 +83,20 @@ export default { ...@@ -70,9 +83,20 @@ export default {
if (this.status == '2' || this.status == '4' || this.status == '5') { if (this.status == '2' || this.status == '4' || this.status == '5') {
//1.跳订单列表,2.订单详情,3.停留该页面显示支付成功(ourPayment页面跳入时,无afterBuyUrl,停留在该页面) //1.跳订单列表,2.订单详情,3.停留该页面显示支付成功(ourPayment页面跳入时,无afterBuyUrl,停留在该页面)
this.title='支付成功!' this.title='支付成功!'
uni.reLaunch({ if(apiCategory=='embedded'){
url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode uni.navigateBackMiniProgram({
}) extraData: {
pdPay: 'success'
},
success(res) {
// 返回成功
}
})
}else{
uni.reLaunch({
url:this.afterBuyUrl+'?orderId=' + this.orderId+'&ifyukuaiCode='+this.ifyukuaiCode
})
}
}else{ }else{
this.title =res.main.errorMessage||'预订失败' this.title =res.main.errorMessage||'预订失败'
} }
......
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