diff --git a/src/pages/course/compenents/create.tsx b/src/pages/course/compenents/create.tsx index 359bc03..2c4b399 100644 --- a/src/pages/course/compenents/create.tsx +++ b/src/pages/course/compenents/create.tsx @@ -12,10 +12,10 @@ import { TreeSelect, } from "antd"; import styles from "./create.module.less"; +import { useSelector } from "react-redux"; import { course, department } from "../../../api/index"; import { UploadImageButton, SelectResource } from "../../../compenents"; import { ExclamationCircleFilled } from "@ant-design/icons"; -import { getHost } from "../../../utils/index"; import { TreeHours } from "./hours"; const { confirm } = Modal; @@ -40,9 +40,12 @@ export const CourseCreate: React.FC = ({ onCancel, }) => { const [form] = Form.useForm(); - const defaultThumb1 = getHost() + "thumb/thumb1.png"; - const defaultThumb2 = getHost() + "thumb/thumb2.png"; - const defaultThumb3 = getHost() + "thumb/thumb3.png"; + const courseDefaultThumbs = useSelector( + (state: any) => state.systemConfig.value.courseDefaultThumbs + ); + const defaultThumb1 = courseDefaultThumbs[0]; + const defaultThumb2 = courseDefaultThumbs[1]; + const defaultThumb3 = courseDefaultThumbs[2]; const [loading, setLoading] = useState(true); const [departments, setDepartments] = useState([]); const [categories, setCategories] = useState([]); diff --git a/src/pages/course/compenents/update.tsx b/src/pages/course/compenents/update.tsx index 43c90d5..e8530b2 100644 --- a/src/pages/course/compenents/update.tsx +++ b/src/pages/course/compenents/update.tsx @@ -12,9 +12,9 @@ import { Image, } from "antd"; import styles from "./update.module.less"; +import { useSelector } from "react-redux"; import { course, department } from "../../../api/index"; import { UploadImageButton } from "../../../compenents"; -import { getHost } from "../../../utils/index"; const { confirm } = Modal; @@ -36,9 +36,12 @@ export const CourseUpdate: React.FC = ({ onCancel, }) => { const [form] = Form.useForm(); - const defaultThumb1 = getHost() + "thumb/thumb1.png"; - const defaultThumb2 = getHost() + "thumb/thumb2.png"; - const defaultThumb3 = getHost() + "thumb/thumb3.png"; + const courseDefaultThumbs = useSelector( + (state: any) => state.systemConfig.value.courseDefaultThumbs + ); + const defaultThumb1 = courseDefaultThumbs[0]; + const defaultThumb2 = courseDefaultThumbs[1]; + const defaultThumb3 = courseDefaultThumbs[2]; const [loading, setLoading] = useState(true); const [departments, setDepartments] = useState([]); const [categories, setCategories] = useState([]); diff --git a/src/pages/member/compenents/create.tsx b/src/pages/member/compenents/create.tsx index 9dac651..2dc214d 100644 --- a/src/pages/member/compenents/create.tsx +++ b/src/pages/member/compenents/create.tsx @@ -1,9 +1,10 @@ import React, { useState, useEffect } from "react"; import { Modal, Form, TreeSelect, Input, message } from "antd"; import styles from "./create.module.less"; +import { useSelector } from "react-redux"; import { user, department } from "../../../api/index"; import { UploadImageButton } from "../../../compenents"; -import { ValidataCredentials, getHost } from "../../../utils/index"; +import { ValidataCredentials } from "../../../utils/index"; interface PropInterface { open: boolean; @@ -20,7 +21,10 @@ export const MemberCreate: React.FC = ({ open, onCancel }) => { const [form] = Form.useForm(); const [loading, setLoading] = useState(true); const [departments, setDepartments] = useState([]); - const [avatar, setAvatar] = useState(getHost() + "avatar/avatar.png"); + const memberDefaultAvatar = useSelector( + (state: any) => state.systemConfig.value.memberDefaultAvatar + ); + const [avatar, setAvatar] = useState(memberDefaultAvatar); useEffect(() => { if (open) { @@ -33,11 +37,11 @@ export const MemberCreate: React.FC = ({ open, onCancel }) => { email: "", name: "", password: "", - avatar: getHost() + "avatar/avatar.png", + avatar: memberDefaultAvatar, idCard: "", dep_ids: [], }); - setAvatar(getHost() + "avatar/avatar.png"); + setAvatar(memberDefaultAvatar); }, [form, open]); const getParams = () => { diff --git a/src/pages/member/compenents/update.tsx b/src/pages/member/compenents/update.tsx index f29fd89..477f77f 100644 --- a/src/pages/member/compenents/update.tsx +++ b/src/pages/member/compenents/update.tsx @@ -1,9 +1,10 @@ import React, { useState, useEffect } from "react"; import { Modal, Form, TreeSelect, Input, message } from "antd"; -import styles from "./create.module.less"; +import styles from "./update.module.less"; +import { useSelector } from "react-redux"; import { user, department } from "../../../api/index"; import { UploadImageButton } from "../../../compenents"; -import { ValidataCredentials, getHost } from "../../../utils/index"; +import { ValidataCredentials } from "../../../utils/index"; interface PropInterface { id: number; @@ -25,7 +26,10 @@ export const MemberUpdate: React.FC = ({ const [form] = Form.useForm(); const [loading, setLoading] = useState(true); const [departments, setDepartments] = useState([]); - const [avatar, setAvatar] = useState(getHost() + "avatar/avatar.png"); + const memberDefaultAvatar = useSelector( + (state: any) => state.systemConfig.value.memberDefaultAvatar + ); + const [avatar, setAvatar] = useState(memberDefaultAvatar); useEffect(() => { if (id == 0) {