@@ -121,9 +157,35 @@ const HotList = (props) => {
+
+
+
@@ -149,38 +211,117 @@ 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 = paramsObj
- ? [
- {
- url: paramsObj.h5_route_path + "?" + params,
- action,
- },
- {
- url: paramsObj.app_route_path + "?" + params,
- action,
- },
- ]
- : [
- {
- url: link,
- action,
- },
- ];
+ const {
+ action,
+ status,
+ image,
+ pageName,
+ hyperlinks,
+ st,
+ et,
+ link,
+ ueser_id,
+ 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;
+ } else {
+ const paramsObj = pageName ? JSON.parse(pageName) : null;
+ newHyperlinks = paramsObj
+ ? [
+ {
+ url: paramsObj.h5_route_path + "?" + value.mid,
+ action,
+ },
+ {
+ url: paramsObj.app_route_path + "?" + value.mid,
+ action,
+ },
+ ]
+ : [
+ {
+ url: link,
+ action,
+ },
+ ];
+ }
+ 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 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({
- ...value,
- st: new Date(st).getTime(),
- et: new Date(et).getTime(),
- hyperlinks,
- user_id: "",
+ ...dataObj,
...base,
});
const response = await fetch(
- `/op/activity_hot/${id ? "update" : "create"}`,
+ `/op/activity_hot/${id !== null ? "update" : "create"}`,
{
method: "POST",
headers: {
@@ -208,7 +349,8 @@ const HotList = (props) => {
const [more, setMore] = useState(1);
const [displayImageId, setDisplayImageId] = useState([]);
const [pagesOptions, setPagesOptions] = useState([]);
- const [currentStatus, setCurrentStatus] = useState("新建推送");
+ const [currentStatus, setCurrentStatus] = useState(null);
+ const [currentPageName, setCurrentPageName] = useState("");
const [formData] = useState({
mid: null,
title: "",
@@ -243,12 +385,14 @@ const HotList = (props) => {
};
const currentPagesOptions = useMemo(() => {
if (!pagesOptions.length) return [];
- const pages = pagesOptions.map((it) => {
- return {
- label: it.desc,
- value: JSON.stringify(it),
- };
- });
+ 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) => {
@@ -278,7 +422,6 @@ const HotList = (props) => {
value: 2,
},
];
- //创建页面路由
const getPages = async () => {
try {
const base = baseRequest();
@@ -316,7 +459,7 @@ const HotList = (props) => {
},
body: JSON.stringify({
offset,
- limit: 200,
+ limit: 2000,
status,
...base,
}),
@@ -335,6 +478,7 @@ const HotList = (props) => {
setData((old) =>
isFirst ? temData.data.list : [...old, ...temData.data.list]
);
+
setOffset(temData.data.offset);
setMore(temData.data.more);
} catch (error) {
@@ -346,8 +490,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;
@@ -360,6 +504,7 @@ const HotList = (props) => {
);
const pageName =
action === "inward" ? JSON.stringify(isCurrentPagePath[0]) : "";
+ setCurrentPageName(pageName);
setPathMethod(action);
setCurrentStatus(
!status
@@ -370,7 +515,7 @@ const HotList = (props) => {
? "已失效"
: "未开始"
);
- setSelectedStreamer(true);
+ setSelectedStreamer(data);
await handleSearchMid(user_id);
form.setFieldsValue({
...data,
@@ -386,8 +531,25 @@ const HotList = (props) => {
id,
});
};
- const handleStopAndStart = (data) => {
- handleSubmit({ ...data, status: 2 });
+ const handlePauseOrStopAndStart = (data, status) => {
+ const { st, et, hyperlinks } = data;
+ const isCurrentPagePath = pagesOptions.filter(
+ (it) =>
+ it.h5_route_path.indexOf(currentPageName) !== -1 ||
+ it.app_route_path.indexOf(currentPageName) !== -1
+ );
+ const action = hyperlinks[0].action;
+ const pageName =
+ action === "inward"
+ ? JSON.stringify(isCurrentPagePath[0])
+ : hyperlinks[0].url;
+ handleSubmit({
+ ...data,
+ pageName,
+ st: st * 1000,
+ et: et * 1000,
+ status,
+ });
};
//搜索空间
const handleSearchMid = async (mid) => {
@@ -411,6 +573,11 @@ const HotList = (props) => {
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) {
@@ -444,16 +611,69 @@ const HotList = (props) => {
setIsModalOpen(false);
setZones(null);
setDisplayImageId([]);
+ setCurrentStatus(null);
};
const currentStreamerImage = useMemo(() => {
- console.log("form.validateFields", selectedStreamer);
- if (selectedStreamer && zones && displayImageId) {
- return zones[0]?.streamer_ext.avatar.images[0].urls[0];
+ console.log("form.validateFields", displayImageId);
+ if (selectedStreamer && zones && displayImageId.length > 0) {
+ if (zones[0].streamer_ext.avatar.image_ids[0] === displayImageId[0]) {
+ return zones[0]?.streamer_ext.avatar.images[0].urls[0];
+ } else {
+ return null;
+ }
} else {
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 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;
+ 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 [];
+ }
+ });
+ const splitParams = useMemo(
+ () => getSplitParams(currentPageName),
+ [currentPageName, pathMethod]
+ );
return (
@@ -473,21 +693,31 @@ const HotList = (props) => {
新建推送+
+ {contextHolder}
(
+ 获得总数：{showData.length}
+ )}
+ onScroll={(e) => {
+ const { scrollHeight, scrollTop, clientHeight } = e.currentTarget;
+ if (scrollTop + clientHeight + 5 >= scrollHeight && more) {
+ getData(hotStatus, false, offset);
+ }
+ }}
/>
-
+
推送状态：
{currentStatus}
@@ -512,6 +742,7 @@ const HotList = (props) => {
// style={{
// width: 240,
// }}
+ disabled={currentStatus}
className="w-full"
showSearch
allowClear
@@ -523,9 +754,9 @@ const HotList = (props) => {
setSelectedStreamer(currentIt);
form.setFieldsValue({
mid: v,
- title: currentIt.profile,
+ title: currentIt.streamer_ext.name,
image: currentIt.streamer_ext.avatar,
- text: currentIt.streamer_ext.name,
+ text: currentIt.profile,
});
} else {
setSelectedStreamer(null);
@@ -544,7 +775,9 @@ const HotList = (props) => {
value: it.mid,
label: (
-
ID：{it?.mid}
+
+ ID：{it?.streamer_ext?.user_id}
+
昵称：{it?.streamer_ext.name}
@@ -572,23 +805,30 @@ const HotList = (props) => {
]}
className="mb-6"
>
- {currentStreamerImage ? (
-
+
+ {currentStreamerImage ? (
-
setDisplayImageId(null)}
- >
-
-
+ ) : (
+
+ )}
+
setDisplayImageId([])}
+ >
+
- ) : (
-
- )}
+
@@ -764,13 +1109,15 @@ const HotList = (props) => {
>
{
// console.log("Time: ", new Date());
- setMiniDate(value);
+ setMiniDate(value ? value : dayjs(new Date()));
console.log("Selected Time: ", value);
console.log("Formatted Selected Time: ", dateString);
}}
@@ -790,7 +1137,8 @@ const HotList = (props) => {
className="mb-6"
>
{
+ const [messageApi, contextHolder] = message.useMessage();
//控制创建动态modal是否出现
const [isModalOpen, setIsModalOpen] = useState(false);
const [isPagesModalOpen, setIsPagesModalOpen] = useState(false);
@@ -34,9 +36,11 @@ 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 [displayImageId, setDisplayImageId] = useState([]);
//表头
const columns = [
{
@@ -111,6 +115,7 @@ const NoticesContent = (props) => {
},
{
title: "链接标语",
+ width: 90,
dataIndex: "link_text",
key: "link_text",
render: (data) => {data || "-"}
,
@@ -149,8 +154,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 : record.ct * 1000).format(
+ "YYYY-MM-DD HH:mm:ss"
+ )}
+
+ );
},
},
{
@@ -159,9 +170,13 @@ const NoticesContent = (props) => {
dataIndex: "obj_mids",
key: "obj_mids",
render: (data) => (
-
+
{data?.length > 0
- ? data.map((it) => {it})
+ ? data.map((it) => (
+
+ {it}
+
+ ))
: "-"}
),
@@ -177,9 +192,9 @@ const NoticesContent = (props) => {
{data == 0
? "所有主播"
: data == 1
- ? "所有个人"
+ ? "所有普通用户"
: data == 2
- ? "所有主播和个人"
+ ? "全部"
: "自定义角色"}
@@ -583,12 +664,27 @@ const NoticesContent = (props) => {
新建推送+
+ {contextHolder}
(
+ 获得总数：{showData.length}
+ )}
+ onScroll={(e) => {
+ const { scrollHeight, scrollTop, clientHeight } = e.currentTarget;
+ console.log(scrollHeight, scrollTop + clientHeight);
+
+ if (scrollTop + clientHeight + 5 >= scrollHeight) {
+ getData(offset);
+ }
+ }}
/>
{/* 重复判断isModalOpen是为了重新渲染ImageUploader和VideoUploader组件 */}
{
footer={null}
open={isModalOpen}
onCancel={handleCancelModal}
+ onChange={setFormData}
>