From e662aa7d894a0b259dc1816e79514c1f0d38da9f Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 21 五月 2025 16:14:05 +0800 Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui --- packages/components/src/views/RechargeResultView/RechargeResultView.vue | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/components/src/views/RechargeResultView/RechargeResultView.vue b/packages/components/src/views/RechargeResultView/RechargeResultView.vue index 001e556..066527c 100644 --- a/packages/components/src/views/RechargeResultView/RechargeResultView.vue +++ b/packages/components/src/views/RechargeResultView/RechargeResultView.vue @@ -1,5 +1,5 @@ <template> - <div class="recharge-result-view"> + <!-- <div class="recharge-result-view"> <div class="recharge-result-view-title">{{ title }}</div> <div class="recharge-result-view-subtitle">璁㈠崟鍙凤細{{ orderNo }}</div> <div class="recharge-result-view-tips"> @@ -14,12 +14,33 @@ <div class="recharge-result-view-btn-wrapper"> <div class="recharge-result-view-btn" @click="emit('goBackHome')">鍥為椤�</div> </div> - </div> + </div> --> + <Result + v-bind="$attrs" + :title="title" + :refundCheckRemark="refundCheckRemark" + :orderNo="orderNo" + :icon="OssAssets.result.Success" + :customerServiceTips="CustomerServiceTips" + :dangerTips="dangerTips" + warningTips="濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥!!!" + > + <template #actions> + <div class="chunk-form-actions"> + <nut-button class="recharge-button" type="primary" @click="emit('goBackHome')"> + <div class="recharge-button-inner"> + <div class="recharge-button-text">杩斿洖棣栭〉</div> + </div> + </nut-button> + </div> + </template> + </Result> </template> <script setup lang="ts"> import { LifeRechargeConstants } from '@life-payment/core-vue'; -import { CustomerServiceTips } from '../../constants'; +import { CustomerServiceTips, OssAssets } from '../../constants'; +import Result from '../../components/Result/Result.vue'; defineOptions({ name: 'RechargeResultView', @@ -27,12 +48,17 @@ type Props = { title?: string; + refundCheckRemark?: string; orderNo?: string; + dangerTips?: string; lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum; }; const props = withDefaults(defineProps<Props>(), { - title: '鏀粯鎴愬姛锛屽厖鍊兼灏嗗湪0-24灏忔椂鍐呭埌璐�', + title: '鏀粯鎴愬姛', + refundCheckRemark: '鍏呭�兼灏嗗湪0-24灏忔椂鍐呭埌璐�', + dangerTips: + '鍚屼竴鍙风爜鍏呭�兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�', }); const emit = defineEmits<{ -- Gitblit v1.9.1