Merge branch 'develop' into electronicInvoice

pages/my/order/orderList/orderList.vue

@@ -718,7 +718,6 @@ export default {
     },
   },
   onReachBottom(){//上拉加载
-    this.pageIndex++
     this.getData(2)
   },
   onUnload() {

pages/payment/paySuccess/paySuccess.vue

@@ -65,7 +65,8 @@ export default {
               //如果是半屏小程序直接返回上一个小程序
               uni.navigateBackMiniProgram({
                 extraData: {
-                  pdPay: 'success'
+                  pdPay: 'success',
+                  orderId:this.orderId
                 },
                 success(res) {
                   // 返回成功
@@ -86,7 +87,8 @@ export default {
             if(apiCategory=='embedded'){
               uni.navigateBackMiniProgram({
                 extraData: {
-                  pdPay: 'success'
+                  pdPay: 'success',
+                  orderId:this.orderId
                 },
                 success(res) {
                   // 返回成功