From 07c9d504500cbaa1dd7a7d1a442bfd23b479cae7 Mon Sep 17 00:00:00 2001 From: al Date: Thu, 16 Jan 2025 20:26:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0webView=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImageUploader/index.jsx | 6 +- .../HotManage/components/BannerList/index.jsx | 313 ++++++++++++++---- .../HotManage/components/HotList/index.jsx | 263 ++++++++------- src/pages/Notices/index.jsx | 152 +++++---- 4 files changed, 486 insertions(+), 248 deletions(-) diff --git a/src/components/ImageUploader/index.jsx b/src/components/ImageUploader/index.jsx index e47f431..2b0a928 100644 --- a/src/components/ImageUploader/index.jsx +++ b/src/components/ImageUploader/index.jsx @@ -1,10 +1,12 @@ import React, { useEffect, useState } from "react"; import { uploadImage } from "../../utils/upload"; -const ImageUploader = ({ ids = [], setIds, uploadOne }) => { +const ImageUploader = ({ ids = [], setIds, uploadOne, preventEvent }) => { const [selectedImages, setSelectedImages] = useState([]); const [uploading, setUploading] = useState(false); - + useEffect(() => { + preventEvent(uploading); + }, [uploading]); const handleFileChange = async (event) => { const files = event.target.files; diff --git a/src/pages/HotManage/components/BannerList/index.jsx b/src/pages/HotManage/components/BannerList/index.jsx index c109526..51f14ed 100644 --- a/src/pages/HotManage/components/BannerList/index.jsx +++ b/src/pages/HotManage/components/BannerList/index.jsx @@ -1,4 +1,10 @@ -import React, { useState, useRef, useEffect, useMemo } from "react"; +import React, { + useState, + useRef, + useEffect, + useMemo, + useCallback, +} from "react"; import { Form, Input, @@ -13,14 +19,16 @@ import { Badge, message, Checkbox, + Spin, } from "antd"; import { DeleteFilled } from "@ant-design/icons"; import baseRequest from "../../../../utils/baseRequest"; import zh from "antd/es/date-picker/locale/zh_CN"; import ImageUploader from "../../../../components/ImageUploader"; -import { formatDeadline } from "../../../../utils/tools"; -import debounce from "lodash/debounce"; import dayjs from "dayjs"; +import debounce from "lodash/debounce"; +import { ConfigProvider } from "antd"; +import zhCN from "antd/es/locale/zh_CN"; const BannerList = (props) => { const [form] = Form.useForm(); const [messageApi, contextHolder] = message.useMessage(); @@ -95,6 +103,22 @@ const BannerList = (props) => { dataIndex: "priority", key: "priority", width: 90, + sorter: (a, b) => a.priority - b.priority, + sortDirections: ["ascend", "descend"], + }, + { + title: "设备类型", + dataIndex: "device_type", + key: "device_type", + width: 90, + render: (item) => { + if (item.length === 0) return "-"; + return item.map((item) => ( + + {item === 2 ? "H5" : item === 1 ? "IOS" : "Android"} + + )); + }, }, { title: "状态", @@ -102,6 +126,27 @@ const BannerList = (props) => { key: "status", width: 120, fixed: "right", + filters: [ + { + text: "推送中", + value: 0, + }, + { + text: "已暂停", + value: 1, + }, + { + text: "已失效", + value: 2, + }, + { + text: "未开始", + value: 3, + }, + ], + + filterMode: "tree", + onFilter: (value, record) => record.status == value, render: (item) => { return ( @@ -200,52 +245,73 @@ const BannerList = (props) => { newHyperlinks = paramsObj ? [ { - url: paramsObj.h5_route_path + "?" + value.mid, + url: paramsObj.app_route_path.replace( + "MID", + selectedStreamer.mid + ), action, + inward_action_type: "app", + frontend_route_id: paramsObj.id, }, { - url: paramsObj.app_route_path + "?" + value.mid, + url: paramsObj.h5_route_path.replace( + "[mid]", + selectedStreamer.mid + ), action, + inward_action_type: "h5", + frontend_route_id: paramsObj.id, }, ] : [ { url: link, action, + inward_action_type: "outward", }, ]; } - if (!status && new Date(st).getTime() < new Date().getTime()) { - messageApi.open({ - type: "warning", - content: "开始时间不能小于当前时间", - }); - return; - } else if (!status && new Date(st).getTime() > new Date(et).getTime()) { - messageApi.open({ - type: "warning", - content: "开始时间不能大于结束时间", - }); - return; - } else if ( - new Date(et).getTime() - new Date(st).getTime() < - 10 * 60 * 1000 - ) { - messageApi.open({ - type: "warning", - content: "两个时间间隔最短不小于10分钟", - }); - return; + if (!id) { + if (!status && new Date(st).getTime() < new Date().getTime()) { + messageApi.open({ + type: "warning", + content: "推送时间不能早于当前时间", + }); + return; + } else if (!status && new Date(st).getTime() > new Date(et).getTime()) { + messageApi.open({ + type: "warning", + content: "结束时间不能早于开始时间", + }); + return; + } else if ( + new Date(et).getTime() - new Date(st).getTime() < + 10 * 60 * 1000 + ) { + messageApi.open({ + type: "warning", + content: "两个时间间隔最短不小于10分钟", + }); + return; + } } try { //通过图片审核，如果是视频直接跳过 - const base = baseRequest(); - const body = JSON.stringify({ + const dataObj = { ...value, st: Math.floor(new Date(st).getTime() / (60 * 1000)) * 60, et: Math.floor(new Date(et).getTime() / (60 * 1000)) * 60, hyperlinks: newHyperlinks, image: image?.images ? image : { image_ids: displayImageId }, + user_id: "", + }; + if (id) { + delete dataObj.st; + delete dataObj.et; + } + const base = baseRequest(); + const body = JSON.stringify({ + ...dataObj, ...base, }); const response = await fetch( @@ -278,6 +344,7 @@ const BannerList = (props) => { const [displayImageId, setDisplayImageId] = useState([]); const [pagesOptions, setPagesOptions] = useState([]); const [currentPageName, setCurrentPageName] = useState(""); + const [buttonAble, setButtonAble] = useState(false); const [currentItem, setCurrentItem] = useState(null); const [formData] = useState({ title: "", @@ -310,13 +377,14 @@ const BannerList = (props) => { }; const currentPagesOptions = useMemo(() => { if (!pagesOptions.length) return []; - const pages = pagesOptions.map((it) => { - return { - label: it.desc, - value: JSON.stringify(it), - }; - }); - console.log("pages", pages); + const pages = pagesOptions + .filter((it) => it.desc === "达人空间") + .map((it) => { + return { + label: it.desc, + value: JSON.stringify(it), + }; + }); return pages; }, [pagesOptions, formData.action]); const onTimeOk = (value) => { @@ -382,15 +450,18 @@ const BannerList = (props) => { const { hyperlinks, st, et, mid, status, user_id, id } = data; 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; + const currentPageId = hyperlinks?.[0].frontend_route_id; + const params = + hyperlinks.length > 1 + ? hyperlinks + .filter((it) => it.inward_action_type === "app")[0] + .url.split("=")[1] + : ""; + const action = hyperlinks.length > 1 ? "inward" : "outward"; const link = action === "inward" ? "" : hyperlinks[0].url; const isCurrentPagePath = pagesOptions.filter( - (it) => - it.h5_route_path.indexOf(currentPageName) !== -1 || - it.app_route_path.indexOf(currentPageName) !== -1 + (it) => it.id === currentPageId ); const pageName = action === "inward" ? JSON.stringify(isCurrentPagePath[0]) : ""; @@ -412,7 +483,7 @@ const BannerList = (props) => { }); }; const handleStopAndStart = (data) => { - handleSubmit({ ...data, status: 2 }); + handleSubmit({ ...data, status: 1 }); }; const handleDeleteItem = async (id) => { try { @@ -490,8 +561,9 @@ const BannerList = (props) => { return matches; }; - const splitParams = useMemo(() => { - const newCurrentPageName = form.getFieldValue("pageName"); + const getSplitParams = useCallback((currentPageName) => { + const newCurrentPageName = + form.getFieldValue("pageName") || currentPageName; if (!newCurrentPageName) return []; const CurrentPageNameObj = JSON.parse(newCurrentPageName); const { app_route_path, h5_route_path } = CurrentPageNameObj; @@ -504,7 +576,6 @@ const BannerList = (props) => { const splitParamsStr = newCurrentPageNameStr.split("?")[1]; return splitParamsStr.split("&").map((item) => item.split("=")[0]); } - // const regex = /\[.*?\]/g; if (newCurrentPageNameStr) { // const matches = []; @@ -522,7 +593,52 @@ const BannerList = (props) => { } else { return []; } + }); + const splitParams = useMemo(() => { + const list = getSplitParams(currentPageName); + if (selectedStreamer) { + list.forEach((it) => { + form.setFieldValue(it, selectedStreamer[it]); + }); + } + + return list; }, [currentPageName, pathMethod]); + //搜索空间 + const handleSearchMid = async (mid) => { + // const mid = form.getFieldValue("mid"); + if (!mid) return; + setIsLoading(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; + } + console.log( + "temData.data.list 621957", + detailData.data.list[0].streamer_ext.avatar.image_ids + ); + // setDisplayImageId(detailData.data.list[0].streamer_ext.avatar.image_ids); + const zonesArr = detailData.data.list; + setZones(zonesArr); + } catch (error) { + console.error(error); + } finally { + setIsLoading(false); + } + }; return (
@@ -535,13 +651,15 @@ const BannerList = (props) => {
{contextHolder} - + +
+ { setIds={setDisplayImageId} ids={displayImageId} uploadOne={true} + preventEvent={setButtonAble} /> )}
{ ]} className="mb-6" > - + { link: "", params: "", hyperlinks: "", - mid: "", + mid: null, }); setPathMethod(e); }} @@ -635,6 +754,14 @@ const BannerList = (props) => { value: "outward", label: "外部浏览器跳转", }, + { + value: "webViewHeader", + label: "带头的WebView", + }, + { + value: "webViewWithOutHeader", + label: "不带头的WebView", + }, ]} /> @@ -712,22 +839,80 @@ const BannerList = (props) => { direction="vertical" className="bg-white rounded-xl p-4" > + + {it}：{selectedStreamer?.mid} +
+ {/* {selectedStreamer?.mid} */} + {/* {it}：} - /> + value={selectedStreamer?.mid} + /> */} ))} @@ -773,6 +958,7 @@ const BannerList = (props) => { > { > { - diff --git a/src/pages/HotManage/components/HotList/index.jsx b/src/pages/HotManage/components/HotList/index.jsx index b307699..a0d74d1 100644 --- a/src/pages/HotManage/components/HotList/index.jsx +++ b/src/pages/HotManage/components/HotList/index.jsx @@ -27,6 +27,8 @@ import ImageUploader from "../../../../components/ImageUploader"; import debounce from "lodash/debounce"; import { DeleteFilled } from "@ant-design/icons"; import dayjs from "dayjs"; +import { ConfigProvider } from "antd"; +import zhCN from "antd/es/locale/zh_CN"; const HotList = (props) => { const [messageApi, contextHolder] = message.useMessage(); const { confirm } = Modal; @@ -69,8 +71,8 @@ const HotList = (props) => { {hyperlink.action === "outward" ? "外部链接:" : index - ? "H5:" - : "App:"} + ? "App:" + : "H5:"}

{hyperlink.action === "outward" ? ( @@ -89,6 +91,8 @@ const HotList = (props) => { dataIndex: "priority", key: "priority", width: 90, + sorter: (a, b) => a.priority - b.priority, + sortDirections: ["ascend", "descend"], }, { title: "开始时间", @@ -122,6 +126,27 @@ const HotList = (props) => { key: "status", width: 120, fixed: "right", + filters: [ + { + text: "推送中", + value: 0, + }, + { + text: "已暂停", + value: 1, + }, + { + text: "已失效", + value: 2, + }, + { + text: "未开始", + value: 3, + }, + ], + filterMode: "tree", + onFilter: (value, record) => record.status == value, + render: (item) => { return ( @@ -199,16 +224,6 @@ const HotList = (props) => { ]; //给表单绑定ref const formRef = useRef(null); - //点击通过按钮 - const onClickPass = () => { - form.submit(); - }; - //点击拒绝按钮 - const onClickReject = (record) => { - formRef.current.record = record; - formRef.current.type = 1; - formRef.current.submit(); - }; //提交表单 const handleSubmit = async (value) => { const { @@ -224,36 +239,6 @@ const HotList = (props) => { id, } = value; - // 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, - // }, - // ]; let newHyperlinks = []; if (hyperlinks) { newHyperlinks = hyperlinks; @@ -262,18 +247,29 @@ const HotList = (props) => { newHyperlinks = paramsObj ? [ { - url: paramsObj.h5_route_path + "?" + value.mid, + url: paramsObj.app_route_path.replace( + "MID", + selectedStreamer.mid + ), action, + frontend_route_id: paramsObj.id, + inward_action_type: "app", }, { - url: paramsObj.app_route_path + "?" + value.mid, + url: paramsObj.h5_route_path.replace( + "[mid]", + selectedStreamer.mid + ), action, + inward_action_type: "h5", + frontend_route_id: paramsObj.id, }, ] : [ { url: link, action, + inward_action_type: "outward", }, ]; } @@ -281,13 +277,13 @@ const HotList = (props) => { if (!status && new Date(st).getTime() < new Date().getTime()) { messageApi.open({ type: "warning", - content: "开始时间不能小于当前时间", + content: "推送时间不能早于当前时间", }); return; } else if (!status && new Date(st).getTime() > new Date(et).getTime()) { messageApi.open({ type: "warning", - content: "开始时间不能大于结束时间", + content: "结束时间不能早于开始时间", }); return; } else if ( @@ -351,6 +347,7 @@ const HotList = (props) => { const [pagesOptions, setPagesOptions] = useState([]); const [currentStatus, setCurrentStatus] = useState(null); const [currentPageName, setCurrentPageName] = useState(""); + const [buttonAble, setButtonAble] = useState(false); const [formData] = useState({ mid: null, title: "", @@ -448,7 +445,6 @@ const HotList = (props) => { }; const getData = async (status, isFirst, offset) => { // if (!more) return; - // debugger; setIsLoading(true); try { const base = baseRequest(); @@ -492,15 +488,13 @@ const HotList = (props) => { const { hyperlinks, st, et, mid, status, user_id, id } = data; const newSt = dayjs(st * 1000); const newEt = dayjs(et * 1000); - const currentPageName = hyperlinks[0].url.split("?")[0]; + const currentPageId = hyperlinks?.[0].frontend_route_id; const params = hyperlinks[0].url.split("?")[1]; const action = hyperlinks[0].action; const link = action === "inward" ? "" : hyperlinks[0].url; const isCurrentPagePath = pagesOptions.filter( - (it) => - it.h5_route_path.indexOf(currentPageName) !== -1 || - it.app_route_path.indexOf(currentPageName) !== -1 + (it) => it.id === currentPageId ); const pageName = action === "inward" ? JSON.stringify(isCurrentPagePath[0]) : ""; @@ -516,6 +510,7 @@ const HotList = (props) => { : "未开始" ); setSelectedStreamer(data); + setDisplayImageId(data?.image?.image_ids); await handleSearchMid(user_id); form.setFieldsValue({ ...data, @@ -577,7 +572,7 @@ const HotList = (props) => { "temData.data.list 621957", detailData.data.list[0].streamer_ext.avatar.image_ids ); - setDisplayImageId(detailData.data.list[0].streamer_ext.avatar.image_ids); + // setDisplayImageId(detailData.data.list[0].streamer_ext.avatar.image_ids); const zonesArr = detailData.data.list; setZones(zonesArr); } catch (error) { @@ -605,7 +600,7 @@ const HotList = (props) => { }; //关闭弹窗 const handleCancelModal = () => { - form.resetFields(); + form.setFieldsValue(formData); setPathMethod(""); setSelectedStreamer(null); setIsModalOpen(false); @@ -615,13 +610,30 @@ const HotList = (props) => { }; const currentStreamerImage = useMemo(() => { - console.log("form.validateFields", displayImageId); - if (selectedStreamer && zones && displayImageId.length > 0) { - if (zones[0].streamer_ext.avatar.image_ids[0] === displayImageId[0]) { + console.log("form.validateFields", selectedStreamer); + if (selectedStreamer && zones) { + if ( + zones[0].streamer_ext.avatar.image_ids[0] === displayImageId[0] + // && !displayImageId.length + ) { + setDisplayImageId(zones[0].streamer_ext.avatar.image_ids); + form.setFieldValue("image", zones[0].streamer_ext.avatar); return zones[0]?.streamer_ext.avatar.images[0].urls[0]; + } else if ( + selectedStreamer?.image && + selectedStreamer?.image?.image_ids[0] === displayImageId[0] + ) { + setDisplayImageId(selectedStreamer.image.image_ids); + return selectedStreamer.image.images[0].urls[0]; } else { return null; } + } else if ( + selectedStreamer && + selectedStreamer?.image?.image_ids[0] === displayImageId[0] + ) { + setDisplayImageId(selectedStreamer.image.image_ids); + return selectedStreamer.image.images[0].urls[0]; } else { return null; } @@ -670,10 +682,16 @@ const HotList = (props) => { return []; } }); - const splitParams = useMemo( - () => getSplitParams(currentPageName), - [currentPageName, pathMethod] - ); + const splitParams = useMemo(() => { + const list = getSplitParams(currentPageName); + if (selectedStreamer) { + list.forEach((it) => { + form.setFieldValue(it, selectedStreamer[it]); + }); + } + + return list; + }, [currentPageName, pathMethod]); return (
@@ -694,22 +712,24 @@ const HotList = (props) => {
{contextHolder} -
( -
获得总数：{showData.length}
- )} - onScroll={(e) => { - const { scrollHeight, scrollTop, clientHeight } = e.currentTarget; - if (scrollTop + clientHeight + 5 >= scrollHeight && more) { - getData(hotStatus, false, offset); - } - }} - /> + +
( +
获得总数：{showData.length}
+ )} + onScroll={(e) => { + const { scrollHeight, scrollTop, clientHeight } = e.currentTarget; + if (scrollTop + clientHeight + 5 >= scrollHeight && more) { + getData(hotStatus, false, offset); + } + }} + /> + { const currentIt = zones?.filter((it) => it.mid == v)[0]; if (currentIt) { setSelectedStreamer(currentIt); + setDisplayImageId(currentIt.streamer_ext.avatar.image_ids); form.setFieldsValue({ mid: v, - title: currentIt.streamer_ext.name, - image: currentIt.streamer_ext.avatar, - text: currentIt.profile, + title: + form.getFieldValue("title") || + currentIt.streamer_ext.name, + // image: displayImageId[0] || currentIt.streamer_ext.avatar, + text: form.getFieldValue("text") || currentIt.profile, }); } else { setSelectedStreamer(null); form.setFieldsValue({ mid: null, - title: "", - image: "", - text: "", }); } }} @@ -806,7 +826,7 @@ const HotList = (props) => { className="mb-6" >
- {currentStreamerImage ? ( + {currentStreamerImage && displayImageId.length > 0 ? ( { setIds={setDisplayImageId} ids={displayImageId} uploadOne={true} + preventEvent={setButtonAble} /> )}
setDisplayImageId([])} @@ -841,7 +865,7 @@ const HotList = (props) => { ]} className="mb-6" > - + { ]} className="mb-6" > - + { link: "", params: "", hyperlinks: "", - mid: "", + mid: null, }); setPathMethod(e); }} @@ -896,6 +920,14 @@ const HotList = (props) => { value: "outward", label: "外部浏览器跳转", }, + { + value: "webViewHeader", + label: "带头的WebView", + }, + { + value: "webViewWithOutHeader", + label: "不带头的WebView", + }, ]} /> @@ -969,30 +1001,6 @@ const HotList = (props) => {
?
)} - {/* - {splitParams.map((it) => ( - - {it}：} - /> - - ))} - */} { placeholder="通过ID搜索主播" // optionFilterProp="label" onChange={(v) => { - // const currentIt = zones?.filter( - // (it) => it.mid == v - // )[0]; + const currentIt = zones?.filter( + (it) => it.mid == v + )[0]; // if (currentIt) { // setSelectedStreamer(currentIt); // } else { // setSelectedStreamer(null); // } + if (currentIt) { + setSelectedStreamer({ + ...currentIt, + mid: currentIt.mid, + }); + } }} filterOption={false} onSearch={debounce(handleSearchMid, 1000)} @@ -1025,7 +1039,7 @@ const HotList = (props) => { options={zones?.map((it) => ({ value: it.mid, label: ( -
+

ID：{it?.mid}

昵称：{it?.streamer_ext.name} @@ -1047,16 +1061,17 @@ const HotList = (props) => {

{it}：{selectedStreamer?.mid}
+ {/* {selectedStreamer?.mid} */} {/* { > { > { - diff --git a/src/pages/Notices/index.jsx b/src/pages/Notices/index.jsx index ed601d4..d5f89db 100644 --- a/src/pages/Notices/index.jsx +++ b/src/pages/Notices/index.jsx @@ -24,6 +24,8 @@ import { useMemo } from "react"; import dayjs from "dayjs"; import debounce from "lodash/debounce"; import { DeleteFilled } from "@ant-design/icons"; +import { ConfigProvider } from "antd"; +import zhCN from "antd/es/locale/zh_CN"; const NoticesContent = (props) => { const [messageApi, contextHolder] = message.useMessage(); //控制创建动态modal是否出现 @@ -55,30 +57,30 @@ const NoticesContent = (props) => { value: 0, }, { - text: "付费通知", + text: "审核通知", value: 1, }, { - text: "活动通知", + text: "付费消息", value: 2, }, { - text: "审核通知", + text: "活动消息", value: 3, }, ], filterMode: "tree", - onFilter: (value, record) => record.status == value, + onFilter: (value, record) => record.n_type === value, render: (data) => { return (
{data == 0 ? "系统通知" : data == 1 - ? "付费通知" + ? "审核通知" : data == 2 - ? "活动通知" - : "审核通知"} + ? "付费消息" + : "活动消息"}
); }, @@ -87,12 +89,13 @@ const NoticesContent = (props) => { title: "通知标题", dataIndex: "title", key: "title", + width: 150, }, { title: "推送消息正文", dataIndex: "message", key: "message", - width: 300, + width: 200, }, { title: "推送消息主图", @@ -115,12 +118,13 @@ const NoticesContent = (props) => { }, { title: "链接标语", - width: 90, + width: 120, dataIndex: "link_text", key: "link_text", render: (data) =>
{data || "-"}
, }, { + width: 200, title: "链接", dataIndex: "hyperlinks", key: "hyperlinks", @@ -133,6 +137,10 @@ const NoticesContent = (props) => {

{hyperlink.action === "outward" ? "外部链接:" + : hyperlink.action === "webViewHeader" + ? "带头的WebView" + : hyperlink.action === "webViewWithOutHeader" + ? "不带头的WebView" : index ? "H5:" : "App:"} @@ -151,6 +159,7 @@ const NoticesContent = (props) => { }, }, { + width: 150, title: "推送时间", dataIndex: "push_time", key: "push_time", @@ -165,10 +174,10 @@ const NoticesContent = (props) => { }, }, { - width: 100, + width: 150, title: "推送角色", - dataIndex: "obj_mids", - key: "obj_mids", + dataIndex: "obj_user_ids", + key: "obj_user_ids", render: (data) => (

{data?.length > 0 @@ -201,6 +210,7 @@ const NoticesContent = (props) => { }, }, { + width: 120, title: "推送状态", dataIndex: "status", key: "status", @@ -366,6 +376,7 @@ const NoticesContent = (props) => { obj_type: "0", }); const [currentPageName, setCurrentPageName] = useState(""); + const [buttonAble, setButtonAble] = useState(false); const currentPagesOptions = useMemo(() => { if (!pagesOptions.length) return []; @@ -407,7 +418,7 @@ const NoticesContent = (props) => { "Content-Type": "application/json", }, body: JSON.stringify({ - n_type: 0, + n_types: [0, 1, 2, 3], push_type: 1, status: querryStatus, offset: 0, @@ -445,11 +456,12 @@ const NoticesContent = (props) => { }; //关闭弹窗 const handleCancelModal = () => { - form.resetFields(); + form.setFieldsValue(formData); setPathMethod(""); + setSelectedStreamer(null); setIsModalOpen(false); setZones(null); - getData(0); + setDisplayImageId([]); }; const handleSubmit = async (value) => { // if (!selectedUser) { @@ -469,7 +481,6 @@ const NoticesContent = (props) => { id, thumbnail, } = value; - debugger; const obj_midsArr = obj_user_ids?.split(" ").map((it) => Number(it)); let newHyperlinks = []; if (hyperlinks) { @@ -479,26 +490,34 @@ const NoticesContent = (props) => { newHyperlinks = paramsObj ? [ { - params: paramsObj.h5_route_path + "?" + value.mid, + params: paramsObj.app_route_path.replace("MID", value.mid), action, + frontend_route_id: paramsObj.id, + inward_action_type: "app", }, { - params: paramsObj.app_route_path + "?" + value.mid, + params: paramsObj.h5_route_path.replace("[mid]", value.mid), action, + frontend_route_id: paramsObj.id, + inward_action_type: "h5", }, ] - : [ + : action + ? [ { params: link, action, + inward_action_type: "outward", }, - ]; + ] + : null; } + if (!id) { if (!status && new Date(push_time).getTime() < new Date().getTime()) { messageApi.open({ type: "warning", - content: "开始时间不能小于当前时间", + content: "推送时间不能早于当前时间", }); return; } @@ -665,27 +684,30 @@ const NoticesContent = (props) => {
{contextHolder} -
( -
获得总数：{showData.length}
- )} - onScroll={(e) => { - const { scrollHeight, scrollTop, clientHeight } = e.currentTarget; - console.log(scrollHeight, scrollTop + clientHeight); + +
( +
获得总数：{showData.length}
+ )} + onScroll={(e) => { + const { scrollHeight, scrollTop, clientHeight } = e.currentTarget; + console.log(scrollHeight, scrollTop + clientHeight); + + if (scrollTop + clientHeight + 5 >= scrollHeight) { + getData(offset); + } + }} + /> + - if (scrollTop + clientHeight + 5 >= scrollHeight) { - getData(offset); - } - }} - /> {/* 重复判断isModalOpen是为了重新渲染ImageUploader和VideoUploader组件 */} { ]} className="mb-6" > - + { ]} className="mb-6" > -