From 20e64cd56c7da4e8c7bddf552d371c890188a36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Thu, 23 Mar 2023 10:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E5=88=97=E8=A1=A8=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.less | 4 ++ src/pages/member/index.tsx | 10 +-- src/pages/system/index.tsx | 137 ++++++++++++++++++++++--------------- 3 files changed, 91 insertions(+), 60 deletions(-) diff --git a/src/index.less b/src/index.less index 51836c1..fa8330d 100644 --- a/src/index.less +++ b/src/index.less @@ -81,6 +81,10 @@ code { margin-left: 15px; } +.ml-24{ + margin-left: 24px; +} + .ml-42 { margin-left: 42px; } diff --git a/src/pages/member/index.tsx b/src/pages/member/index.tsx index cc37b85..55486ad 100644 --- a/src/pages/member/index.tsx +++ b/src/pages/member/index.tsx @@ -46,7 +46,7 @@ export const MemberPage: React.FC = () => { const [createVisible, setCreateVisible] = useState(false); const [updateVisible, setUpdateVisible] = useState(false); const [mid, setMid] = useState(0); - const [course_dep_ids, setCourseDepIds] = useState({}); + const [user_dep_ids, setUserDepIds] = useState({}); const [departments, setDepartments] = useState({}); const columns: ColumnsType = [ @@ -71,11 +71,11 @@ export const MemberPage: React.FC = () => { dataIndex: "id", render: (id: number) => (
- {course_dep_ids[id] && - course_dep_ids[id].map((item: any, index: number) => { + {user_dep_ids[id] && + user_dep_ids[id].map((item: any, index: number) => { return ( - {index === course_dep_ids[id].length - 1 + {index === user_dep_ids[id].length - 1 ? departments[item] : departments[item] + "、"} @@ -143,6 +143,8 @@ export const MemberPage: React.FC = () => { }) .then((res: any) => { setList(res.data.data); + setDepartments(res.data.departments); + setUserDepIds(res.data.user_dep_ids); setTotal(res.data.total); setLoading(false); }); diff --git a/src/pages/system/index.tsx b/src/pages/system/index.tsx index 8281953..f7bf066 100644 --- a/src/pages/system/index.tsx +++ b/src/pages/system/index.tsx @@ -1,9 +1,10 @@ import React, { useState, useEffect } from "react"; -import { Row, Col, Form, Input, Image, Button, message } from "antd"; -import styles from "./update.module.less"; +import { Row, Col, Form, Input, Image, Button, Tabs, message } from "antd"; +import styles from "./index.module.less"; import { appConfig } from "../../api/index"; import { useParams, useNavigate } from "react-router-dom"; import { UploadImageButton } from "../../compenents"; +import type { TabsProps } from "antd"; export const SystemIndexPage: React.FC = () => { const params = useParams(); @@ -11,6 +12,7 @@ export const SystemIndexPage: React.FC = () => { const [form] = Form.useForm(); const [loading, setLoading] = useState(false); const [logo, setLogo] = useState(""); + const [tabKey, setTabKey] = useState(1); useEffect(() => { getDetail(); @@ -64,63 +66,86 @@ export const SystemIndexPage: React.FC = () => { console.log("Failed:", errorInfo); }; + const items: TabsProps["items"] = [ + { + key: "1", + label: `网站设置`, + children: ( +
+
+ +
+ {logo && ( + + )} +
+ { + setLogo(url); + form.setFieldsValue({ "system.logo": url }); + }} + > +
+
+ (推荐尺寸:240x80px,支持JPG、PNG) +
+
+
+ + + + + + + + + + + + + + + +
+
+ ), + }, + { + key: "2", + label: `播放设置`, + children:
, + }, + ]; + + const onChange = (key: string) => { + setTabKey(Number(key)); + }; + return ( <> - -
-
- - - - -
-
- { - setLogo(url); - form.setFieldsValue({ "system.logo": url }); - }} - > -
- {logo && ( - - )} -
-
- - - - - - - - - - - - -
-
- +
);