diff --git a/projects/translate-h5/src/assets/translate/archives-add.png b/projects/translate-h5/src/assets/translate/archives-add.png new file mode 100644 index 0000000..94aa3ab Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-add.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-avatar.png b/projects/translate-h5/src/assets/translate/archives-avatar.png new file mode 100644 index 0000000..719e775 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-avatar.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-bottom.png b/projects/translate-h5/src/assets/translate/archives-bottom.png new file mode 100644 index 0000000..4ddddf8 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-bottom.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-card.png b/projects/translate-h5/src/assets/translate/archives-card.png new file mode 100644 index 0000000..468861a Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-card.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-data.png b/projects/translate-h5/src/assets/translate/archives-data.png new file mode 100644 index 0000000..18bb4ce Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-data.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-edit.png b/projects/translate-h5/src/assets/translate/archives-edit.png new file mode 100644 index 0000000..cba6506 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-edit.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-equipment.png b/projects/translate-h5/src/assets/translate/archives-equipment.png new file mode 100644 index 0000000..2372ba6 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-equipment.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-function.png b/projects/translate-h5/src/assets/translate/archives-function.png new file mode 100644 index 0000000..b3a5bec Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-function.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-picture.png b/projects/translate-h5/src/assets/translate/archives-picture.png new file mode 100644 index 0000000..1e41aef Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-picture.png differ diff --git a/projects/translate-h5/src/assets/translate/archives-sw.png b/projects/translate-h5/src/assets/translate/archives-sw.png new file mode 100644 index 0000000..5ea2f74 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/archives-sw.png differ diff --git a/projects/translate-h5/src/assets/translate/mood-abstract.png b/projects/translate-h5/src/assets/translate/mood-abstract.png new file mode 100644 index 0000000..9f00a92 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/mood-abstract.png differ diff --git a/projects/translate-h5/src/assets/translate/mood-chart.png b/projects/translate-h5/src/assets/translate/mood-chart.png new file mode 100644 index 0000000..d626662 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/mood-chart.png differ diff --git a/projects/translate-h5/src/assets/translate/mood-filter.png b/projects/translate-h5/src/assets/translate/mood-filter.png new file mode 100644 index 0000000..bd1e40f Binary files /dev/null and b/projects/translate-h5/src/assets/translate/mood-filter.png differ diff --git a/projects/translate-h5/src/assets/translate/mood-popup.png b/projects/translate-h5/src/assets/translate/mood-popup.png new file mode 100644 index 0000000..e9bbd2c Binary files /dev/null and b/projects/translate-h5/src/assets/translate/mood-popup.png differ diff --git a/projects/translate-h5/src/assets/translate/mood.png b/projects/translate-h5/src/assets/translate/mood.png new file mode 100644 index 0000000..457cfe7 Binary files /dev/null and b/projects/translate-h5/src/assets/translate/mood.png differ diff --git a/projects/translate-h5/src/layout/main/mainLayout.tsx b/projects/translate-h5/src/layout/main/mainLayout.tsx index 8402bc3..bf68a7e 100644 --- a/projects/translate-h5/src/layout/main/mainLayout.tsx +++ b/projects/translate-h5/src/layout/main/mainLayout.tsx @@ -1,17 +1,24 @@ import React from "react"; import { NavBar, SafeArea, Toast } from "antd-mobile"; import { useNavigate, useLocation } from "react-router-dom"; -import { User, CattleZodiac } from "@icon-park/react"; +import { User, CattleZodiac, Right } from "@icon-park/react"; import "./index.less"; interface MainLayoutProps { children: React.ReactNode; isShowNavBar?: boolean; title?: string; + navBarRight?: React.ReactNode; onLink?: () => void; } -const MainLayout: React.FC = ({ isShowNavBar, children, onLink, title }) => { +const MainLayout: React.FC = ({ + isShowNavBar, + children, + onLink, + title, + navBarRight, +}) => { const navigate = useNavigate(); // const location = useLocation(); @@ -40,6 +47,10 @@ const MainLayout: React.FC = ({ isShowNavBar, children, onLink, // ]; const goBack = () => { + // 打印路由栈 + + + // debugger; if (onLink) { onLink?.(); } else { @@ -49,7 +60,13 @@ const MainLayout: React.FC = ({ isShowNavBar, children, onLink, return (
- {isShowNavBar ? {title} : ""} + {isShowNavBar ? ( + + {title} + + ) : ( + "" + )}
{children}
diff --git a/projects/translate-h5/src/route/routes.tsx b/projects/translate-h5/src/route/routes.tsx index 68e169e..467cb90 100644 --- a/projects/translate-h5/src/route/routes.tsx +++ b/projects/translate-h5/src/route/routes.tsx @@ -16,6 +16,7 @@ const Page404 = lazy(() => import("@/view/error/page404")); const TranslateDetail = lazy(() => import("@/view/home/detail")); const TranslateMood = lazy(() => import("@/view/home/mood")); const TranslateArchives = lazy(() => import("@/view/home/archives")); +const TranslateArchivesAdd = lazy(() => import("@/view/home/archives/add")); export const routes: AppRoute[] = [ { path: "/", @@ -50,5 +51,13 @@ export const routes: AppRoute[] = [ title: "宠物档案", }, }, + { + path: "/translate/archives/add", + element: , + auth: false, + meta: { + title: "新建档案", + }, + }, { path: "*", element: , auth: false }, ]; diff --git a/projects/translate-h5/src/view/home/archives/add.tsx b/projects/translate-h5/src/view/home/archives/add.tsx new file mode 100644 index 0000000..813388e --- /dev/null +++ b/projects/translate-h5/src/view/home/archives/add.tsx @@ -0,0 +1,23 @@ +import MainLayout from "@/layout/main/mainLayout"; +import styles from "./index.module.less"; +import archivesAvatarPng from "@/assets/translate/archives-avatar.png"; +import archivesAddPng from "@/assets/translate/archives-add.png"; +import archivesEditPng from "@/assets/translate/archives-edit.png"; +import { useState } from "react"; +import { Image } from "antd-mobile"; + +function Add() { + const [flag, setFlag] = useState<"add" | "edit">("add"); + return ( + +
+
+ +
+ {flag === "add" ? : } +
+
+ ); +} + +export default Add; diff --git a/projects/translate-h5/src/view/home/archives/index.module.less b/projects/translate-h5/src/view/home/archives/index.module.less index 2ec7bad..673f11e 100644 --- a/projects/translate-h5/src/view/home/archives/index.module.less +++ b/projects/translate-h5/src/view/home/archives/index.module.less @@ -1,3 +1,27 @@ .archives { + background-color: #f5f5f5; padding: 12px; + box-sizing: border-box; + min-height: 100%; + .img { + margin-bottom: 16px; + } + .placeholder-bottom { + height: 100px; + width: 100%; + } +} + +.bottom { + position: fixed; + bottom: 0; + opacity: 0.98; +} + +.archivesAvatar { + width: 100%; + height: 128px; + display: flex; + align-items: center; + justify-content: center; } diff --git a/projects/translate-h5/src/view/home/archives/index.tsx b/projects/translate-h5/src/view/home/archives/index.tsx index ff72727..7d33acf 100644 --- a/projects/translate-h5/src/view/home/archives/index.tsx +++ b/projects/translate-h5/src/view/home/archives/index.tsx @@ -1,11 +1,67 @@ // 档案 import MainLayout from "@/layout/main/mainLayout"; import styles from "./index.module.less"; +import archivesPicturePng from "@/assets/translate/archives-picture.png"; +import archivesDataPng from "@/assets/translate/archives-data.png"; +import archivesEquipmentPng from "@/assets/translate/archives-equipment.png"; +import archivesSwPng from "@/assets/translate/archives-sw.png"; +import archivesFunctionPng from "@/assets/translate/archives-function.png"; +import archivesBottomPng from "@/assets/translate/archives-bottom.png"; +import archivesCardPng from "@/assets/translate/archives-card.png"; +import { useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { Image, Space } from "antd-mobile"; +import { ListView, More, AddOne, AlignHorizontalCenterTwo } from "@icon-park/react"; function Index() { + const [listShow, setListShow] = useState(false); + + const navigate = useNavigate(); + + const onLink = (link: string) => { + // safeNavigate(link); + navigate(link); + }; + + const right = ( +
+ + {listShow ? ( + setListShow(false)} fill="#333" /> + ) : ( + setListShow(true)} fill="#333" /> + )} + + onLink("/translate/archives/add")} fill="#333" /> + + +
+ ); + return ( - -
档案
+ + {listShow ? ( +
+ + + + +
+ ) : ( + <> +
+ +
+
+ + + + + +
+
+ + )}
); } diff --git a/projects/translate-h5/src/view/home/mood/index.module.less b/projects/translate-h5/src/view/home/mood/index.module.less index 4e4f5c5..d8255fd 100644 --- a/projects/translate-h5/src/view/home/mood/index.module.less +++ b/projects/translate-h5/src/view/home/mood/index.module.less @@ -1,3 +1,23 @@ .mood { - padding: 12px; + .mood-title { + padding: 18px; + display: flex; + justify-content: space-between; + align-items: center; + .mood-abstract-button { + color: #1677ff; + display: flex; + align-items: center; + } + } + .mood-filter { + position: relative; + } + .mood-mask-1 { + position: absolute; + height: 54%; + width: 30%; + top: 10%; + left: 6%; + } } diff --git a/projects/translate-h5/src/view/home/mood/index.tsx b/projects/translate-h5/src/view/home/mood/index.tsx index 462c3cc..ac9631a 100644 --- a/projects/translate-h5/src/view/home/mood/index.tsx +++ b/projects/translate-h5/src/view/home/mood/index.tsx @@ -1,9 +1,58 @@ import MainLayout from "@/layout/main/mainLayout"; import styles from "./index.module.less"; +import moodFilterPng from "@/assets/translate/mood-filter.png"; +import moodChartPng from "@/assets/translate/mood-chart.png"; +import moodAbstractPng from "@/assets/translate/mood-abstract.png"; +import moodPopupPng from "@/assets/translate/mood-popup.png"; +import { Image, Space } from "antd-mobile"; +import { Switch, Filter, More } from "@icon-park/react"; +import { useState } from "react"; +import { XPopup } from "@workspace/shared"; + const Moods = () => { + const [visible, setVisible] = useState(false); + + const right = ( +
+ + + + +
+ ); + return ( - -
心情
+ +
+
+
setVisible(true)} className={styles["mood-mask-1"]}>
+ +
+ +
+

情绪摘要

+
+ + 饼状视图 +
+
+ +
+
+ { + setVisible(false); + }} + > + +
); };