Commit 91fd55b1 authored by qipeng's avatar qipeng

Merge branch 'develop' into electronicInvoice

parents e2c43b61 30db04da
...@@ -718,7 +718,6 @@ export default { ...@@ -718,7 +718,6 @@ export default {
}, },
}, },
onReachBottom(){//上拉加载 onReachBottom(){//上拉加载
this.pageIndex++
this.getData(2) this.getData(2)
}, },
onUnload() { onUnload() {
......
...@@ -65,7 +65,8 @@ export default { ...@@ -65,7 +65,8 @@ export default {
//如果是半屏小程序直接返回上一个小程序 //如果是半屏小程序直接返回上一个小程序
uni.navigateBackMiniProgram({ uni.navigateBackMiniProgram({
extraData: { extraData: {
pdPay: 'success' pdPay: 'success',
orderId:this.orderId
}, },
success(res) { success(res) {
// 返回成功 // 返回成功
...@@ -86,7 +87,8 @@ export default { ...@@ -86,7 +87,8 @@ export default {
if(apiCategory=='embedded'){ if(apiCategory=='embedded'){
uni.navigateBackMiniProgram({ uni.navigateBackMiniProgram({
extraData: { extraData: {
pdPay: 'success' pdPay: 'success',
orderId:this.orderId
}, },
success(res) { success(res) {
// 返回成功 // 返回成功
......
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