From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 27 三月 2025 09:30:55 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
packages/components/src/components/RechargeTipsView/RechargeTipsView.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue b/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
index 294e782..eaa93a0 100644
--- a/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
+++ b/packages/components/src/components/RechargeTipsView/RechargeTipsView.vue
@@ -1,7 +1,7 @@
<template>
<div class="recharge-tips-view">
- <div class="recharge-tips-title">鍏呭�奸』鐭�</div>
- <div class="recharge-tips-content">
+ <!-- <div class="recharge-tips-title">鍏呭�奸』鐭�</div> -->
+ <!-- <div class="recharge-tips-content">
<div class="recharge-tips-top">
<slot name="tips-top">
*鍚屼竴鍙风爜鍏呭�兼湡闂淬�愬垏鍕垮骞冲彴閲嶅鍏呭�笺�戯紒锛侊紒鍦ㄤ笅鍗曞墠锛岃鍔″繀浠旂粏闃呰鍏憡鍐呭锛侊紒锛佽嫢鎺ュ埌闄岀敓鏉ョ數锛岃鍕胯交淇★紒锛侊紒
@@ -12,18 +12,30 @@
{{ index + 1 }}.{{ item }}
</div>
</div>
- </div>
+ </div> -->
+ <RichContent :content="introInfo" size="small" />
</div>
</template>
<script setup lang="ts">
+import RichContent from '../RichEditCard/RichContent.vue';
+import { useIntroInfo } from '../../hooks';
+import { LifeRechargeConstants } from '@life-payment/core-vue';
+
defineOptions({
name: 'RechargeTipsView',
});
type Props = {
- tips: string[];
+ tips?: string[];
+ lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
};
-const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {
+ tips: () => [],
+});
+
+const { introInfo } = useIntroInfo({
+ lifePayOrderType: props.lifePayOrderType,
+});
</script>
--
Gitblit v1.9.1