From 6cdaad5420e10f436772e2339f476342846feeab Mon Sep 17 00:00:00 2001 From: al Date: Wed, 8 Jan 2025 12:04:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=A0=87=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PagesManage/index.js | 6 +- .../HotManage/components/BannerList/index.jsx | 4 +- .../HotManage/components/HotList/index.jsx | 239 ++++++++++---- src/pages/Notices/index.jsx | 138 ++++++-- .../StreamerNickTextMachineReview/index.jsx | 298 +++++++++--------- src/routes/index.js | 2 +- 6 files changed, 444 insertions(+), 243 deletions(-) diff --git a/src/components/PagesManage/index.js b/src/components/PagesManage/index.js index 482d7bf..2b8af44 100644 --- a/src/components/PagesManage/index.js +++ b/src/components/PagesManage/index.js @@ -167,6 +167,7 @@ export default function PagesManage() {
{ @@ -177,6 +178,7 @@ export default function PagesManage() { }} /> { setFormData((old) => ({ @@ -187,6 +189,7 @@ export default function PagesManage() { placeholder="APP页面值" /> { setFormData((old) => ({ @@ -198,6 +201,7 @@ export default function PagesManage() { />
-
+
handleShowDialog(it)} diff --git a/src/pages/HotManage/components/BannerList/index.jsx b/src/pages/HotManage/components/BannerList/index.jsx index fdd3686..4ba7595 100644 --- a/src/pages/HotManage/components/BannerList/index.jsx +++ b/src/pages/HotManage/components/BannerList/index.jsx @@ -510,7 +510,7 @@ const BannerList = (props) => { message: "请填写具体链接地址", }, ]} - label="添加链接" + label="跳转位置" name="link" className="mb-2" > @@ -525,7 +525,7 @@ const BannerList = (props) => { }} >
{ key: "priority", width: 90, }, + { + title: "开始时间", + dataIndex: "st", + key: "st", + width: 120, + render: (item) => { + return ( + + {item ? dayjs(item * 1000).format("YYYY-MM-DD HH:mm:ss") : "-"} + + ); + }, + }, + { + title: "结束时间", + dataIndex: "et", + key: "et", + width: 120, + render: (item) => { + return ( + + {item ? dayjs(item * 1000).format("YYYY-MM-DD HH:mm:ss") : "-"} + + ); + }, + }, { title: "状态", dataIndex: "status", @@ -151,14 +177,45 @@ const HotList = (props) => { const handleSubmit = async (value) => { const { action, params, pageName, st, et, link, ueser_id, id } = value; const paramsObj = pageName ? JSON.parse(pageName) : null; + + // const hyperlinks = + // action === "inward" + // ? ["app_route_path", "h5_route_path"].map((item, index) => { + // if (index == 1) { + // let pathName = paramsObj[item]; + // splitParams.forEach((it) => { + // console.log(pathName, it); + // pathName = pathName.replace(it, value[it]); + // }); + // return { + // action, + // params: pathName, + // }; + // } + // let pathName = paramsObj[item]; + // splitParams.forEach((it) => { + // console.log(pathName, it.toUpperCase()); + // pathName = pathName.replace(it.toUpperCase(), value[it]); + // }); + // return { + // action, + // params: pathName, + // }; + // }) + // : [ + // { + // action, + // params: link, + // }, + // ]; const hyperlinks = paramsObj ? [ { - url: paramsObj.h5_route_path + "?" + params, + url: paramsObj.h5_route_path + "?" + value.mid, action, }, { - url: paramsObj.app_route_path + "?" + params, + url: paramsObj.app_route_path + "?" + value.mid, action, }, ] @@ -168,19 +225,27 @@ const HotList = (props) => { action, }, ]; + const ccc = { + ...value, + st: Math.floor(new Date(st).getTime() / (60 * 1000)) * 60, + et: Math.floor(new Date(et).getTime() / (60 * 1000)) * 60, + hyperlinks, + user_id: "", + }; + debugger; try { //通过图片审核，如果是视频直接跳过 const base = baseRequest(); const body = JSON.stringify({ ...value, - st: new Date(st).getTime(), - et: new Date(et).getTime(), + st: Math.floor(new Date(st).getTime() / (60 * 1000)) * 60, + et: Math.floor(new Date(et).getTime() / (60 * 1000)) * 60, hyperlinks, user_id: "", ...base, }); const response = await fetch( - `/op/activity_hot/${id ? "update" : "create"}`, + `/op/activity_hot/${id !== null ? "update" : "create"}`, { method: "POST", headers: { @@ -209,6 +274,7 @@ const HotList = (props) => { const [displayImageId, setDisplayImageId] = useState([]); const [pagesOptions, setPagesOptions] = useState([]); const [currentStatus, setCurrentStatus] = useState("新建推送"); + const [currentPageName, setCurrentPageName] = useState(""); const [formData] = useState({ mid: null, title: "", @@ -346,8 +412,8 @@ const HotList = (props) => { const handleEditHot = async (data) => { setIsModalOpen(true); const { hyperlinks, st, et, mid, status, user_id, id } = data; - const newSt = dayjs(st); - const newEt = dayjs(et); + const newSt = dayjs(st * 1000); + const newEt = dayjs(et * 1000); const currentPageName = hyperlinks[0].url.split("?")[0]; const params = hyperlinks[0].url.split("?")[1]; const action = hyperlinks[0].action; @@ -454,6 +520,49 @@ const HotList = (props) => { return null; } }, [zones, selectedStreamer, displayImageId]); + const findBracketedFields = (text) => { + const regex = /\[(.*?)\]/g; + const matches = []; + let match; + + while ((match = regex.exec(text)) !== null) { + matches.push(match[1]); + } + + return matches; + }; + const splitParams = useMemo(() => { + const newCurrentPageName = form.getFieldValue("pageName"); + if (!newCurrentPageName) return []; + const CurrentPageNameObj = JSON.parse(newCurrentPageName); + const { app_route_path, h5_route_path } = CurrentPageNameObj; + const newCurrentPageNameStr = app_route_path || h5_route_path; + if ( + newCurrentPageNameStr.indexOf("?") !== -1 || + newCurrentPageNameStr.indexOf("[") !== -1 + ) { + if (newCurrentPageNameStr.indexOf("?") !== -1) { + const splitParamsStr = newCurrentPageNameStr.split("?")[1]; + return splitParamsStr.split("&").map((item) => item.split("=")[0]); + } + // const regex = /\[.*?\]/g; + if (newCurrentPageNameStr) { + // const matches = []; + // let match; + // while ((match = regex.exec(newCurrentPageNameStr)) !== null) { + // matches.push(match[1]); + // console.log("Regex: ", match[1]); + // } + const matches = findBracketedFields(newCurrentPageNameStr); + console.log("Regex: ", matches); + return matches; + } else { + return []; + } + } else { + return []; + } + }, [currentPageName]); return (
@@ -624,9 +733,9 @@ const HotList = (props) => { + + - {currentPagesOptions.length > 0 && - currentPagesOptions.map((it) => ( - - {it.label} - - ))} - - -
?
- + {currentPagesOptions.length > 0 && + currentPagesOptions.map((it) => { + return ( + + {it.label} + + ); + })} + {/* x1 + x2 + x3 + x5 */} + + + {splitParams.length > 0 && ( +
?
+ )} + + - { - // console.log("value", value); - // setFormData((old) => ({ - // ...old, - // params: value.target.value, - // })); - // }} - /> - + {splitParams.map((it) => ( + + {it}：} + /> + + ))} +
@@ -767,6 +887,7 @@ const HotList = (props) => { // locale={{ // lang: { locale: "zh_CN", placeholder: "选择日期时间" }, // }} + minDate={dayjs(new Date())} locale={buddhistLocale} onChange={(value, dateString) => { // console.log("Time: ", new Date()); diff --git a/src/pages/Notices/index.jsx b/src/pages/Notices/index.jsx index 610dbf6..5d9d46b 100644 --- a/src/pages/Notices/index.jsx +++ b/src/pages/Notices/index.jsx @@ -13,8 +13,7 @@ import { DatePicker, Radio, Tag, - TimePicker, - // Spin, + Spin, } from "antd"; import { LoadingOutlined, PlusOutlined, LayoutFilled } from "@ant-design/icons"; import zh from "antd/es/date-picker/locale/zh_CN"; @@ -23,6 +22,8 @@ import UploadImgs from "../../components/UploadImgs"; import { formatDeadline } from "../../utils/tools"; import PagesManage from "../../components/PagesManage"; import { useMemo } from "react"; +import dayjs from "dayjs"; +import debounce from "lodash/debounce"; const NoticesContent = (props) => { //控制创建动态modal是否出现 const [isModalOpen, setIsModalOpen] = useState(false); @@ -34,9 +35,10 @@ const NoticesContent = (props) => { const [form] = Form.useForm(); const [pagesOptions, setPagesOptions] = useState([]); const [pathMethod, setPathMethod] = useState(""); + const [selectedStreamer, setSelectedStreamer] = useState(null); const { TextArea } = Input; const current = props.current; - + const [zones, setZones] = useState(null); //表头 const columns = [ { @@ -111,6 +113,7 @@ const NoticesContent = (props) => { }, { title: "链接标语", + width: 90, dataIndex: "link_text", key: "link_text", render: (data) =>
{data || "-"}
, @@ -149,8 +152,14 @@ const NoticesContent = (props) => { title: "推送时间", dataIndex: "push_time", key: "push_time", - render: (data) => { - return
{formatDeadline(data * 1000)}
; + render: (data, record) => { + return ( +
+ {dayjs(!!data ? data * 1000 * 1000 : record.ct * 1000).format( + "YYYY-MM-DD HH:mm:ss" + )} +
+ ); }, }, { @@ -177,9 +186,9 @@ const NoticesContent = (props) => { {data == 0 ? "所有主播" : data == 1 - ? "所有个人" + ? "所有普通用户" : data == 2 - ? "所有主播和个人" + ? "全部" : "自定义角色"}
); @@ -344,7 +353,7 @@ const NoticesContent = (props) => { params: "", pageName: null, link: null, - action: "inward", + action: null, link_text: null, thumbnail: null, obj_type: "0", @@ -427,6 +436,8 @@ const NoticesContent = (props) => { form.resetFields(); setPathMethod(""); setIsModalOpen(false); + setZones(null); + getData(); }; const handleSubmit = async (value) => { // if (!selectedUser) { @@ -468,7 +479,6 @@ const NoticesContent = (props) => { params: link, }, ]; - debugger; try { const base = baseRequest(); const response = await fetch(`/op/notification/create`, { @@ -492,6 +502,7 @@ const NoticesContent = (props) => { alert(data.msg); return; } + handleCancelModal(); message.success("发布成功"); } catch (error) { console.error(error); @@ -563,7 +574,36 @@ const NoticesContent = (props) => { return []; } }, [currentPageName]); - + //搜索空间 + const handleSearchMid = async (mid) => { + // const mid = form.getFieldValue("mid"); + if (!mid) return; + setLoading(true); + try { + const base = baseRequest(); + const detailResponse = await fetch(`/op/zone/list_by_user_id`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + user_id: parseInt(mid, 10), + ...base, + }), + }); + const detailData = await detailResponse.json(); + if (detailData.ret === -1) { + alert(detailData.msg); + return; + } + const zonesArr = detailData.data.list; + setZones(zonesArr); + } catch (error) { + console.error(error); + } finally { + setLoading(false); + } + }; return (
@@ -596,6 +636,7 @@ const NoticesContent = (props) => { footer={null} open={isModalOpen} onCancel={handleCancelModal} + onChange={setFormData} >
{ onFinish={handleSubmit} layout="vertical" initialValues={formData} + onChange={setFormData} > { ]} className={formData.obj_type == 3 ? "mb-2" : "mb-6"} > -
- - 所有主播 - 所有个人 - 所有主播和个人 - 自定义角色 - -
+ + 所有主播 + 所有普通用户 + 全部 + 自定义角色 + - {formData.obj_type == 3 && ( + {form.getFieldValue("obj_type") == 3 && ( { { style={{ width: 120, }} - value={formData.action} onChange={setPathMethod} options={[ { @@ -771,7 +811,7 @@ const NoticesContent = (props) => { pattern: /^(https?:\/\/).*$/, }, ]} - label="添加链接" + label="跳转位置" name="link" className="mb-2" > @@ -786,7 +826,7 @@ const NoticesContent = (props) => { }} >
@@ -827,6 +867,49 @@ const NoticesContent = (props) => { direction="vertical" className="bg-white rounded-xl p-4" > + + {it}：{selectedStreamer?.mid} +
+ {/* {it}：} - /> + value={selectedStreamer?.mid} + /> */} ))}
{ //表头 const columns = [ { - title: "发帖人", - dataIndex: "creator", - key: "creator", + title: "基本信息", + dataIndex: "account", + key: "account", render: (data) => (
- +

ID：{data.user_id}

@@ -31,110 +36,112 @@ const StreamerNickTextMachineReviewContent = (props) => { ), }, { - title: "动态内容", - dataIndex: "content", - key: "content", + title: "修改项目", + dataIndex: "item", + key: "item", render: (data) => ( -
-
-

- 文案：{data.text} -

- {data.is_creating_paid_text === 1 && ( -

- 付费文案：{data.paid_text} -

- )} -
-

媒体：

-
- item.urls[0])} - > - {data.media.images.map((item, index) => ( - - ))} - - {data.media.videos.map((item, index) => ( - - ))} -
+
+ {data === "name" &&

昵称

} + {data === "bio" &&

个性签名

} + {data === "auto_response_message" &&

私信自动回复

}
), }, { - title: "付费设置", - dataIndex: "paymentSettings", - key: "paymentSettings", - render: (data) => ( -
-

- 类型： - - {data.c_type === 0 ? "免费" : "付费"} - -

- {data.c_type === 1 && ( -
-
-

- 价格： - ¥{data.price} -

-
-

- 是否铁粉免费看： - - {data.is_ironfan_visible === 0 ? "否" : "是"} - -

-
-

- 文案可见行数： - {data.text_visible_range} -

- {data.m_type === 1 ? ( - <> -
-

- 图片可见张数： - - {data.media_visible_range} - -

- - ) : ( - <> -
-

- 是否模糊封面： - - {data.is_blurring_cover === 0 ? "否" : "是"} - -

- - )} -
- )} -
- ), + title: "新内容", + dataIndex: "newMedia", + key: "newMedia", + }, + { + title: "旧内容", + dataIndex: "oldMedia", + key: "oldMedia", }, { title: "审核结果", dataIndex: "info", key: "info", - render: (data) => ( -
-

文案审核结果：

-

{data.text_audit_opinion}

-
-

媒体审核结果：

-

{data.image_audit_opinion}

-
- ), + render: (data) => { + if (data.status === 2 || data.status === 5) + return

无违规

; + return ( +
+ {data.spam_label_details && ( +
+

垃圾审核：

+
    + {data.spam_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.politics_label_details && ( +
+

敏感审核：

+
    + {data.politics_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.abuse_label_details && ( +
+

辱骂审核：

+
    + {data.abuse_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.terrorism_label_details && ( +
+

暴恐审核：

+
    + {data.terrorism_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.porn_label_details && ( +
+

鉴黄审核：

+
    + {data.porn_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.flood_label_details && ( +
+

灌水审核：

+
    + {data.flood_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} + {data.contraband_label_details && ( +
+

违禁审核：

+
    + {data.contraband_label_details?.map((item, index) => ( +
  • {item}
    • + ))} +
+
+ )} +
+ ); + }, }, { - title: "发布时间", + title: "提交时间", dataIndex: "submitTime", key: "submitTime", }, @@ -143,14 +150,9 @@ const StreamerNickTextMachineReviewContent = (props) => { dataIndex: "remarks", key: "remarks", render: (_, record) => ( -
- -