From add9b3bb61fcc337b02c15e7973967d670e7d3be Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 21 五月 2025 17:17:28 +0800 Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui --- apps/taro/src/subpackages/recharge/rechargeGasResult/rechargeGasResult.vue | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/apps/taro/src/subpackages/recharge/rechargeGasResult/rechargeGasResult.vue b/apps/taro/src/subpackages/recharge/rechargeGasResult/rechargeGasResult.vue index 8cefd70..7d96951 100644 --- a/apps/taro/src/subpackages/recharge/rechargeGasResult/rechargeGasResult.vue +++ b/apps/taro/src/subpackages/recharge/rechargeGasResult/rechargeGasResult.vue @@ -1,13 +1,17 @@ <template> <PageLayout title="鍏呭�兼垚鍔�" class="rechargeGasResult-page-wrapper" hasBorder> <ContentScrollView> - <RechargeResultView + <ResultWithTips + :title="title" + :orderNo="orderNo" + type="success" + dangerTips="鍚屼竴鐕冩皵璐硅处鎴峰湪鍏呭�兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�" @go-back-home="goHome()" - title="鏀粯鎴愬姛" - refund-check-remark="鍏呭�兼灏嗗湪0-72灏忔椂鍐呭埌璐�" - danger-tips="鍚屼竴鐕冩皵璐硅处鎴峰湪鍏呭�兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�" > - </RechargeResultView> + <template #remark> + <div class="result-content-remark-item">鍏呭�兼灏嗗湪0-72灏忔椂鍐呭埌璐�</div> + </template> + </ResultWithTips> </ContentScrollView> </PageLayout> </template> @@ -15,9 +19,18 @@ <script setup lang="ts"> import { PageLayout } from '@/components'; import { goHome } from '@/utils'; -import { RechargeResultView } from '@life-payment/components'; +import { ResultWithTips } from '@life-payment/components'; defineOptions({ name: 'rechargeGasResult', }); + +type Props = { + title?: string; + orderNo?: string; +}; + +const props = withDefaults(defineProps<Props>(), { + title: '鏀粯鎴愬姛', +}); </script> -- Gitblit v1.9.1