diff --git a/config/config.ts b/config/config.ts index 9bb7a5527b89504fb9da9743ff45ed13a92023bb..028f87243bd368e6151347eb54ee2e217c65f5ec 100755 --- a/config/config.ts +++ b/config/config.ts @@ -108,4 +108,5 @@ export default defineConfig({ requestRecord: {}, define: env[REACT_APP_ENV as keyof typeof env], title: '精密测é‡è™šæ‹Ÿä»¿çœŸå®žè®å¹³å°', + esbuildMinifyIIFE: true }); diff --git a/src/components/IconFont/index.jsx b/src/components/IconFont/index.jsx index 7afb8fb4258d1919e5e827b2d8f9ebf751f63602..4cc9b1d826b4fb4b08d9d912920bc02b20658db3 100755 --- a/src/components/IconFont/index.jsx +++ b/src/components/IconFont/index.jsx @@ -4,7 +4,7 @@ import { createFromIconfontCN } from '@ant-design/icons'; import font from './font/iconfont' const IconFont = createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/c/font_4010447_t59htoi0vc8.js', + scriptUrl: '//at.alicdn.com/t/c/font_4010447_d0ualj4tmq6.js', }); export default IconFont; diff --git a/src/components/ProductCard/stucard.jsx b/src/components/ProductCard/stucard.jsx index a35e034426c16e9554e210d3987bd166ca1f7aba..05104eb510a8f6a965c90e6babc3ffa84933bb65 100644 --- a/src/components/ProductCard/stucard.jsx +++ b/src/components/ProductCard/stucard.jsx @@ -16,11 +16,9 @@ import IconFont from "@/components/IconFont"; import Label from "@/components/label"; import difftime from "@/utils/difftime"; import AccessTimeFilledIcon from "@mui/icons-material/AccessTimeFilled"; -import CheckIcon from "@mui/icons-material/Check"; +import { history } from "@umijs/max"; import dayjs from "dayjs"; import { useState } from "react"; -import { history } from "@umijs/max"; - // ---------------------------------------------------------------------- @@ -151,7 +149,7 @@ export default function ShopProductCard({ paddingLeft: 1, }} > - 日期: {startTime ?? "-"} 至 {deadline} + {startTime ?? "-"}~{deadline} </Typography> </Stack> </Stack> @@ -188,36 +186,42 @@ export default function ShopProductCard({ </Stack> </Stack> - <Stack direction={"row"} spacing={0}> - <Tooltip placement="bottom-start" title={"å‘布"}> + <Stack + direction={"row"} + spacing={0} + flex={1} + justifyContent={"flex-end"} + > + <Tooltip placement="bottom-start" title={"开始å¦ä¹ "}> <IconButton onClick={() => { history.push("/work/domybustrain/" + product.id); }} > <IconFont - type="icon-fabu" - style={{ fontSize: 20, color: colors.blue[600] }} + type="icon-w_xuexi" + style={{ fontSize: 26, color: colors.blue[600] }} ></IconFont> </IconButton> </Tooltip> - <Tooltip - placement="bottom-start" - title={"æˆç»©"} - > + <Tooltip placement="bottom-start" title={"æˆç»©"}> <IconButton disabled={shut === "1"} + sx={{ flexShrink: 0 }} onClick={() => { history.push("/work/myrebustrain/" + product.id); }} > - <CheckIcon - style={{ - fontSize: 20, - color: shut === "1" ? colors.grey[500] : colors.green[500], - }} - ></CheckIcon> + <div style={{ width: 26, height: 26 }} className="center"> + <IconFont + type="icon-chengjidan-copy" + style={{ + fontSize: 20, + color: "#000", + }} + ></IconFont> + </div> </IconButton> </Tooltip> </Stack> diff --git a/src/components/ProductCard/sxcard.jsx b/src/components/ProductCard/sxcard.jsx index d5476dec6e3051cad67aa05e4daefd3b4489195b..9677cc394b2d49afcee279ff67c6db3f9303875b 100644 --- a/src/components/ProductCard/sxcard.jsx +++ b/src/components/ProductCard/sxcard.jsx @@ -270,7 +270,7 @@ export default function ShopProductCard({ paddingLeft: 1, }} > - 日期: {startTime ?? "-"} 至 {deadline} + {startTime ?? "-"}~{deadline} </Typography> </Stack> </Stack> diff --git a/src/pages/myrebustrain/index.jsx b/src/pages/myrebustrain/index.jsx index eea932598e035543bb547b3549f61be264ff1536..cf7bbbb891dd5e8ff86a8f9adf78b436fdf28338 100644 --- a/src/pages/myrebustrain/index.jsx +++ b/src/pages/myrebustrain/index.jsx @@ -1,6 +1,7 @@ import AutoTable from "@/components/AutoTable"; -import { useParams } from "@umijs/max"; +import PremButton from "@/components/PremButton"; import { Box, Container, Stack, Typography } from "@mui/material"; +import { useParams } from "@umijs/max"; import { useMemo, useRef } from "react"; import "./index.less"; @@ -47,8 +48,24 @@ function Record() { return ( <Container maxWidth={false}> - <Stack direction={"row"} mb={2}> + <Stack + direction={"row"} + justifyContent={"space-between"} + alignItems={"center"} + mb={2} + > <Typography variant="h5">æˆç»©å•</Typography> + <PremButton + btn={{ + variant: "outlined", + onClick: (e) => { + e.stopPropagation(); + history.back(); + }, + }} + > + 返回 + </PremButton> </Stack> <Box boxShadow={"0 0 18px #f0f0f0"} borderRadius={2}>