From f0f4bc8dcbd2e2c9815a6246cb660af6363f3e87 Mon Sep 17 00:00:00 2001 From: wangsongsole Date: Tue, 11 Jul 2023 17:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=AA=20optimize:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=BA=A2=E5=8C=85=E6=A8=A1=E6=9D=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/redPackets/mobileComponent.jsx | 67 +------------------ src/components/redPackets/timeComponent.jsx | 66 ++++++++++++++++++ .../redPackets/ysf-mobileComponent.jsx | 66 +----------------- 3 files changed, 70 insertions(+), 129 deletions(-) create mode 100644 src/components/redPackets/timeComponent.jsx diff --git a/src/components/redPackets/mobileComponent.jsx b/src/components/redPackets/mobileComponent.jsx index 42da719c..a1618a99 100644 --- a/src/components/redPackets/mobileComponent.jsx +++ b/src/components/redPackets/mobileComponent.jsx @@ -1,14 +1,8 @@ import "./index.less" import { Placeholder } from "zent" -import { useState, useEffect } from "react" -import { sortWeeks } from "@/tools/utils.js" +import TimeComponent from "./timeComponent" const widths = [24, 100, 100, 100, 80, 100, 100, 100, 80, 100, 100, 100, 80, 100, 100, 100, 100] export default ({ data }) => { - const [newWeek, setNewWeek] = useState([]) - useEffect(() => { - setNewWeek(sortWeeks(data.receive_rule.week)) - }, [data.receive_rule.week, data.receive_irregular]) - /* 动态font */ function fonts() { const { cash_amount_type, min_denomination, max_denomination } = data @@ -31,63 +25,6 @@ export default ({ data }) => { } } - function createElement() { - switch (data.receive_type) { - case 1: - return ( -
-

领取时间

- -
- ) - case 2: - return ( -
-

领取时间

- -
- ) - case 3: - return ( -
-

领取时间

- -
- ) - } - } return (
@@ -132,7 +69,7 @@ export default ({ data }) => { {data.instruction || [1, 2, 3].includes(data.receive_type) ? ( <> - {createElement()} +

使用规则

{ + setNewWeek(sortWeeks(data.receive_rule.week)) + }, [data.receive_rule.week, data.receive_irregular]) + + function createElement() { + if (data.receive_type === 1) { + return ( +

+

领取时间

+
    + {newWeek?.map((item) => ( +
  • + {item} + {data.receive_rule.time.map((item1, index) => { + if (item1[1]) + return ( +

    + {item1[0]}~{item1[1]} +

    + ) + })} +
  • + ))} +
+
+ ) + } else if (data.receive_type === 2) { + return ( +
+

领取时间

+
    + {data.receive_irregular?.map((item) => ( +
  • + {item.date} + {item.time.map((item1) => { + if (item1[1]) + return ( +

    + {item1[0]}~{item1[1]} +

    + ) + })} +
  • + ))} +
+
+ ) + } else if (data.receive_type === 3) { + return ( +
+

领取时间

+
    + {data.receive_day?.map((item) => ( +
  • {item.join(" ~ ")}
  • + ))} +
+
+ ) + } + } + return createElement() +} diff --git a/src/components/redPackets/ysf-mobileComponent.jsx b/src/components/redPackets/ysf-mobileComponent.jsx index f3a46174..b0e73408 100644 --- a/src/components/redPackets/ysf-mobileComponent.jsx +++ b/src/components/redPackets/ysf-mobileComponent.jsx @@ -1,70 +1,8 @@ import "./index.less" import { Placeholder } from "zent" -import { useState, useEffect } from "react" -import { sortWeeks } from "@/tools/utils.js" +import TimeComponent from "./timeComponent" const widths = [24, 100, 100, 100, 80, 100, 100, 100, 80, 100, 100, 100, 80, 100, 100, 100, 100] export default ({ data }) => { - const [newWeek, setNewWeek] = useState([]) - useEffect(() => { - setNewWeek(sortWeeks(data.receive_rule.week)) - }, [data.receive_rule.week, data.receive_irregular]) - - function createElement() { - if (data.receive_type === 1) { - return ( -
-

领取时间

-
    - {newWeek?.map((item) => ( -
  • - {item} - {data.receive_rule.time.map((item1, index) => { - if (item1[1]) - return ( -

    - {item1[0]}~{item1[1]} -

    - ) - })} -
  • - ))} -
-
- ) - } else if (data.receive_type === 2) { - return ( -
-

领取时间

-
    - {data.receive_irregular?.map((item) => ( -
  • - {item.date} - {item.time.map((item1) => { - if (item1[1]) - return ( -

    - {item1[0]}~{item1[1]} -

    - ) - })} -
  • - ))} -
-
- ) - } else if (data.receive_type === 3) { - return ( -
-

领取时间

-
    - {data.receive_day?.map((item) => ( -
  • {item.join(" ~ ")}
  • - ))} -
-
- ) - } - } return (
{
{data.instruction || [1, 2, 3].includes(data.receive_type) ? ( <> - {createElement()} +

活动说明