From b3d55bbbda5f59353009dadafc8088778297a8cc Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Fri, 4 Aug 2023 11:40:11 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E7=AB=8B=E5=87=8F=E9=87=91?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E5=9B=BA=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E9=A2=86=E5=8F=96=E5=90=8E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/knockGold/index.less | 6 ++++++ src/components/knockGold/timeComponent.jsx | 21 +++++++++++++++++++ .../knockGold/ysf-mobileComponent.jsx | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less index d8c4791c..314092f0 100644 --- a/src/components/knockGold/index.less +++ b/src/components/knockGold/index.less @@ -636,4 +636,10 @@ line-height: 22px; min-height: 200px; } +} + +.r-f { + margin: 5px 0; + font-size: 11px; + color: #a8a8a8; } \ No newline at end of file diff --git a/src/components/knockGold/timeComponent.jsx b/src/components/knockGold/timeComponent.jsx index 2646bfd4..1f959f50 100644 --- a/src/components/knockGold/timeComponent.jsx +++ b/src/components/knockGold/timeComponent.jsx @@ -7,6 +7,27 @@ export default ({ data }) => { }, [data.ruleWeek]) function createElement() { + console.log(data) + if (data.usable_time === "received") { + return ( +
+

可用时间

+

+ 领取后{data.effect_date_type.text},有效期 {data.effect_date} 天 +

+
+ ) + } + if (data.usable_time === "fiexd") { + return ( +
+

可用时间

+

+ {data.fixed_time[0]} ~ {data.fixed_time[1]} +

+
+ ) + } if (data.usable_time === "week") { return (
diff --git a/src/components/knockGold/ysf-mobileComponent.jsx b/src/components/knockGold/ysf-mobileComponent.jsx index 53251313..e7ab6e94 100644 --- a/src/components/knockGold/ysf-mobileComponent.jsx +++ b/src/components/knockGold/ysf-mobileComponent.jsx @@ -59,7 +59,7 @@ export default ({ data }) => {
- {data.instruction || ["week", "irregular"].includes(data.usable_time) ? ( + {data.instruction || data.usable_time ? ( <>

活动说明