diff --git a/components/payment/payment.vue b/components/payment/payment.vue index 44d09ed7..f650b4a3 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -932,6 +932,12 @@ popup_view_pay_html_is_show: false, }); this.to_other(); + + let back_data = { + temp_pay_index: this.propTempPayIndex, + payment_id: this.payment_id, + }; + this.$emit('pay-html-close', back_data); }, }, }; diff --git a/pages/user-order-detail/user-order-detail.vue b/pages/user-order-detail/user-order-detail.vue index e78ec978..bf6052b2 100644 --- a/pages/user-order-detail/user-order-detail.vue +++ b/pages/user-order-detail/user-order-detail.vue @@ -36,10 +36,11 @@ {{detail.status_name}} - + {{payment_currency_symbol}} {{pay_price}} + {{status_tips}} @@ -357,7 +358,9 @@ :propPayPrice="pay_price" :propIsShowPayment="is_show_payment_popup" @close-payment-popup="payment_popup_event_close" - @pay-success="order_item_pay_success_handle" + @pay-success="order_item_pay_back_handle" + @pay-fail="order_item_pay_back_handle" + @pay-html-close="order_item_pay_back_handle" > @@ -387,6 +390,7 @@ detail_list: [], extension_data: [], site_fictitious: null, + status_tips: null, goods_use_guide_data_active_index: 0, // 商品服务插件 order_item_goods_info_data: null, @@ -508,7 +512,8 @@ { name: this.$t('user-order-detail.user-order-detail.8o2of3'), value: data.data.close_time || '' }, ], extension_data: data.data.extension_data || [], - site_fictitious: data.site_fictitious || null, + site_fictitious: data.site_fictitious || null, + status_tips: data.status_tips || null, data_list_loding_status: 3, data_bottom_line_status: true, data_list_loding_msg: '', @@ -630,9 +635,8 @@ }); }, - // 支付成功数据设置 - // 订单完成回调 - order_item_pay_success_handle(data) { + // 订单成功和失败回调 + order_item_pay_back_handle(data) { this.init(); },