Commit 3c4aef06 authored by wuhao's avatar wuhao 🎯

asder

parent bc3f7250
Pipeline #3737 passed with stages
in 3 minutes and 13 seconds
......@@ -150,7 +150,7 @@ export default function ShopProductCard({
<div></div>
{type !== 3 && (
<Tooltip placement="bottom-start" title={shut ? "确认关闭" : "关闭"}>
<Tooltip placement="bottom-start" title={shut ? "确认结束" : "结束"}>
{shut ? (
<IconButton
disabled={shut === "1"}
......
......@@ -410,7 +410,7 @@ export default function ShopProductCard({
{type === 3 && (
<Tooltip
placement="bottom-start"
title={shut ? "确认关闭" : "关闭"}
title={shut ? "确认结束" : "结束"}
>
{shut ? (
<IconButton
......
......@@ -5,6 +5,9 @@ import Slide from "@mui/material/Slide";
import Snackbar from "@mui/material/Snackbar";
import * as Sentry from "@sentry/react";
import { Outlet, useModel } from "@umijs/max";
import { ConfigProvider } from "antd";
import locale from "antd/locale/zh_CN";
import "dayjs/locale/zh-cn";
import React from "react";
import ThemeProvider from "./theme";
......@@ -73,26 +76,28 @@ function App() {
} = useModel("@@initialState");
return (
<ThemeProvider>
<CssBaseline />
<Snackbar
open={message?.open}
TransitionComponent={(props) => <Slide {...props} direction="left" />}
{...message?.snackbar}
onClose={handleClose}
>
<Alert
severity={message?.type}
<ConfigProvider locale={locale}>
<ThemeProvider>
<CssBaseline />
<Snackbar
open={message?.open}
TransitionComponent={(props) => <Slide {...props} direction="left" />}
{...message?.snackbar}
onClose={handleClose}
{...message.alert}
sx={{ color: "#f9f9f9" }}
>
{message?.title ? <AlertTitle>{message?.title}</AlertTitle> : null}
{message?.content}
</Alert>
</Snackbar>
<Outlet />
</ThemeProvider>
<Alert
severity={message?.type}
onClose={handleClose}
{...message.alert}
sx={{ color: "#f9f9f9" }}
>
{message?.title ? <AlertTitle>{message?.title}</AlertTitle> : null}
{message?.content}
</Alert>
</Snackbar>
<Outlet />
</ThemeProvider>
</ConfigProvider>
);
}
......
......@@ -419,7 +419,7 @@ function Lessons() {
color={"default"}
/>
}
label="已关闭"
label="已结束"
value={5}
/>
</FormGroup>
......
......@@ -14,6 +14,8 @@ import { Empty, Input, message } from "antd";
import { useMemo, useState } from "react";
import "./index.less";
function Lessons() {
const [dialogprops, setdialogprops] = useState({
open: false,
......@@ -124,6 +126,15 @@ function Lessons() {
span: 24,
},
},
{
title: "课程时间",
dataIndex: "courseTime",
key: "courseTimeList",
valueType: "dateRange",
colProps: {
span: 24,
},
},
],
[]
);
......@@ -306,7 +317,7 @@ function Lessons() {
color={"default"}
/>
}
label="已关闭"
label="已结束"
value={3}
/>
</FormGroup>
......@@ -323,7 +334,6 @@ function Lessons() {
}}
></Input>
<PremButton
btn={{
variant: "contained",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment