From a2f288073e6c5cca37099ba9f43384cfd5acb0ba Mon Sep 17 00:00:00 2001 From: wang_yp <357754663@qq.com> Date: Mon, 24 Mar 2025 18:13:33 +0800 Subject: [PATCH] fix(staff) --- public/index.html | 2 +- src/components/ali_upload.tsx | 37 ++---- src/components/form/interface.ts | 24 +++- src/components/form/select.tsx | 18 +-- src/components/form/simple_form.tsx | 14 +-- src/components/layout/layout.tsx | 8 +- src/components/layout/layout_config.tsx | 7 +- src/pages/city/food/config.tsx | 69 +++++++++++ src/pages/city/food/index.tsx | 79 +++++++++++++ src/pages/city/history/config.tsx | 69 +++++++++++ src/pages/city/history/index.tsx | 78 +++++++++++++ src/pages/city/hum_intro/config.tsx | 69 +++++++++++ src/pages/city/hum_intro/index.tsx | 79 +++++++++++++ src/pages/city/index.tsx | 75 +----------- src/pages/city/list.tsx | 75 ++++++++++++ src/pages/sku/sku/config.tsx | 42 ++----- src/pages/sku/sku/index.tsx | 50 ++------ src/pages/sku/sku/sku_add.tsx | 147 ++++++++++++++++++++++++ src/pages/sku/sku/sku_add_config.tsx | 62 ++++++++++ src/router/index.tsx | 10 +- src/router/routers/city_router.tsx | 38 ++++++ src/router/routers/sku_router.tsx | 7 ++ src/service/config.ts | 22 +++- src/store/city.ts | 28 ++++- src/store/index.ts | 7 +- src/store/sku.ts | 21 +++- src/util/config.ts | 2 +- 27 files changed, 926 insertions(+), 213 deletions(-) create mode 100644 src/pages/city/food/config.tsx create mode 100644 src/pages/city/food/index.tsx create mode 100644 src/pages/city/history/config.tsx create mode 100644 src/pages/city/history/index.tsx create mode 100644 src/pages/city/hum_intro/config.tsx create mode 100644 src/pages/city/hum_intro/index.tsx create mode 100644 src/pages/city/list.tsx create mode 100644 src/pages/sku/sku/sku_add.tsx create mode 100644 src/pages/sku/sku/sku_add_config.tsx create mode 100644 src/router/routers/city_router.tsx diff --git a/public/index.html b/public/index.html index 4d32d88..92db9f6 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ - 黄水武装 + 农浓深情 diff --git a/src/components/ali_upload.tsx b/src/components/ali_upload.tsx index cea1125..ab8d5fb 100644 --- a/src/components/ali_upload.tsx +++ b/src/components/ali_upload.tsx @@ -2,22 +2,7 @@ import Modal from "antd/lib/modal"; import { PlusOutlined } from "@ant-design/icons"; import Upload, { RcFile, UploadFile, UploadProps } from "antd/lib/upload"; import { useEffect, useState } from "react"; -import Config from "@/util/config"; - -interface UploadFileProps { - imgList: Array; - onChnage: Function; - maxCount?: number; -} - -interface UploadFileEx extends UploadFile { - systemImageId?: number; - bannerName?: string; - file_name?: string; - file_url?: string; - redictUrl?: string; - id?: number; -} +import { UploadFileProps } from "./form/interface"; const getBase64 = (file: RcFile): Promise => new Promise((resolve, reject) => { @@ -45,16 +30,17 @@ const AliUpload = (props: UploadFileProps) => { }; useEffect(() => { - setFileList(props.imgList); - }, [props.imgList]); + setFileList(props.value ?? []); + }, [props.value]); const handleChange: UploadProps["onChange"] = ({ fileList: newFileList }) => { newFileList.forEach((i) => { - i.url = `${Config.baseUrl}/uploads/` + i.name; - i.fileName = i.name; + if (i.status === "done") { + i.url = i.response.data.record.url; + i.fileName = i.response.data.record.file_name; + } }); - setFileList(newFileList); - props.onChnage(newFileList); + props.onChange!(newFileList); }; const uploadButton = (
@@ -64,16 +50,17 @@ const AliUpload = (props: UploadFileProps) => { ); return ( -
+
- {files.length >= (props.maxCount??4) ? null : uploadButton} + {files.length >= (props.maxCount ?? 4) ? null : uploadButton} checkboxData?: Array, radioData?: Array, - rules: Array + rules: Array, + selectModel?: "multiple" | "tags" | undefined, } export interface SimpleFormData { @@ -54,4 +56,20 @@ export interface rules { export interface selectItem { name: string, id: number, -} \ No newline at end of file +} + +export interface UploadFileProps { + value?: Array; + onChange?: (value: Array) => void; + maxCount?: number; + id?: string; + } + + export interface UploadFileEx extends UploadFile { + systemImageId?: number; + bannerName?: string; + file_name?: string; + file_url?: string; + redictUrl?: string; + id?: number; + } \ No newline at end of file diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx index 5dac9ce..057bbdb 100644 --- a/src/components/form/select.tsx +++ b/src/components/form/select.tsx @@ -3,24 +3,24 @@ import { FormDatas } from "./interface"; import { useEffect, useState } from "react"; import { base } from "@/service/base"; const { Option } = Select; -export const FormSelect = (v: FormDatas) => { +export const FormSelect = (props: FormDatas) => { const [list, setList] = useState([]); useEffect(() => { - if (v.selectList && v.selectList.length > 0) { - setList(v.selectList); + if (props.selectList && props.selectList.length > 0) { + setList(props.selectList); } else { - base.get(`${v.selectUrl}/?size=50&offset=1`, "").then((res) => { + base.get(`${props.selectUrl}`, {size:50,offset:1}).then((res) => { setList(res.data.record ?? []); }); } - }, [v.selectUrl, v.selectList]); + }, [props.selectUrl, props.selectList]); return ( - - {list?.map((v: any) => { return ( - ); })} diff --git a/src/components/form/simple_form.tsx b/src/components/form/simple_form.tsx index facea0e..913ddc8 100644 --- a/src/components/form/simple_form.tsx +++ b/src/components/form/simple_form.tsx @@ -101,23 +101,11 @@ const SimpleForm = (props: SimpleFormData) => { { - if (Array.isArray(e)) { - return e; - } - return e && e.fileList; - }} > - { - form.setFieldValue(v.name, res); - }} - /> + ); case FormType.textarea: diff --git a/src/components/layout/layout.tsx b/src/components/layout/layout.tsx index 581cb8e..4648dbb 100644 --- a/src/components/layout/layout.tsx +++ b/src/components/layout/layout.tsx @@ -31,13 +31,14 @@ const LayOut = (props: Store) => { alignItems: "center", justifyContent: "space-between", }; - const logoStyle = { width: 60, color: "white" }; + const logoStyle = { width: 140, color: "white",display:"flex" }; const contentstyle = { padding: 12, margin: 0, minHeight: 280, background: colorBgContainer, borderRadius: borderRadiusLG, + }; const breadItem = [ { title: "首页" }, @@ -55,7 +56,8 @@ const LayOut = (props: Store) => {
- {/* */} + + 侬浓深情
} /> @@ -83,7 +85,7 @@ const LayOut = (props: Store) => { - +