From bea23f47050a21b9ed57884ff7d452caba344210 Mon Sep 17 00:00:00 2001 From: Dawn_Ocean <1785590531@qq.com> Date: Thu, 7 Mar 2024 21:47:16 +0800 Subject: [PATCH] move about page to user page --- .prettierignore | 1 + package.json | 3 ++- src/app.config.ts | 2 +- src/assets/icons/AboutPage/about.svg | 1 + .../user/{settings => }/about/about.config.ts | 0 .../user/{settings => }/about/about.scss | 0 src/pages/user/{settings => }/about/about.tsx | 2 +- src/pages/user/settings/settings.tsx | 9 +------ src/pages/user/user.tsx | 27 ++++++++++++++----- src/plain-text/AboutPage.ts | 5 ++++ src/plain-text/SettingsPage.ts | 15 +++-------- src/plain-text/UserPage.ts | 12 +++++++++ src/plain-text/index.ts | 4 +++ 13 files changed, 52 insertions(+), 29 deletions(-) create mode 100644 src/assets/icons/AboutPage/about.svg rename src/pages/user/{settings => }/about/about.config.ts (100%) rename src/pages/user/{settings => }/about/about.scss (100%) rename src/pages/user/{settings => }/about/about.tsx (100%) create mode 100644 src/plain-text/AboutPage.ts diff --git a/.prettierignore b/.prettierignore index 0526e64..d24147b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +.eslintignore **/.gitignore dist/ deploy_versions/ diff --git a/package.json b/package.json index 24f27af..8868d10 100644 --- a/package.json +++ b/package.json @@ -97,6 +97,7 @@ "webpack": "5.78.0" }, "lint-staged": { - "*": "prettier --write" + "*.ts": "prettier --write", + "*.tsx": "prettier --write" } } diff --git a/src/app.config.ts b/src/app.config.ts index b11e639..8d19225 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -6,7 +6,7 @@ export default defineAppConfig({ 'pages/user/myTicket/myTicket', 'pages/user/inform/inform', 'pages/user/settings/settings', - 'pages/user/settings/about/about', + 'pages/user/about/about', 'pages/user/report/report', ], window: { diff --git a/src/assets/icons/AboutPage/about.svg b/src/assets/icons/AboutPage/about.svg new file mode 100644 index 0000000..4076e2a --- /dev/null +++ b/src/assets/icons/AboutPage/about.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/pages/user/settings/about/about.config.ts b/src/pages/user/about/about.config.ts similarity index 100% rename from src/pages/user/settings/about/about.config.ts rename to src/pages/user/about/about.config.ts diff --git a/src/pages/user/settings/about/about.scss b/src/pages/user/about/about.scss similarity index 100% rename from src/pages/user/settings/about/about.scss rename to src/pages/user/about/about.scss diff --git a/src/pages/user/settings/about/about.tsx b/src/pages/user/about/about.tsx similarity index 100% rename from src/pages/user/settings/about/about.tsx rename to src/pages/user/about/about.tsx index 8da0f05..c9fb205 100644 --- a/src/pages/user/settings/about/about.tsx +++ b/src/pages/user/about/about.tsx @@ -1,6 +1,6 @@ import { Component, ReactNode } from 'react'; -import './about.scss'; import { View } from '@tarojs/components'; +import './about.scss'; export default class SettingsPage extends Component { render(): ReactNode { diff --git a/src/pages/user/settings/settings.tsx b/src/pages/user/settings/settings.tsx index ea447d4..043b1e7 100644 --- a/src/pages/user/settings/settings.tsx +++ b/src/pages/user/settings/settings.tsx @@ -1,4 +1,4 @@ -import { AtButton, AtList, AtListItem } from 'taro-ui'; +import { AtList, AtListItem } from 'taro-ui'; import { Component, ReactNode } from 'react'; import Taro from '@tarojs/taro'; import { View, Picker } from '@tarojs/components'; @@ -55,13 +55,6 @@ export default class SettingsPage extends Component { - - {pt.get().settingsPage.aboutText} - - - - {pt.get().settingsPage.quitText} - ); } diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index a1649d4..4c2d304 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -1,9 +1,10 @@ -import { View } from '@tarojs/components'; +import { AtList, AtListItem } from 'taro-ui'; import { Component, ReactNode } from 'react'; +import { View } from '@tarojs/components'; import Taro from '@tarojs/taro'; import type CustomTabBar from '@/custom-tab-bar'; -import { AtList, AtListItem } from 'taro-ui'; import PageFooter from '@/components/PageFooter/PageFooter'; +import aboutIcon from '@/assets/icons/AboutPage/about.svg'; import pt from '@/plain-text'; import './user.scss'; @@ -40,6 +41,12 @@ export default class UserPage extends Component { }); } + aboutPage() { + Taro.navigateTo({ + url: '/pages/user/about/about', + }); + } + render(): ReactNode { return ( @@ -48,14 +55,14 @@ export default class UserPage extends Component { title={pt.get().userPage.ticketColumn.title} note={pt.get().userPage.ticketColumn.note} arrow='right' - iconInfo={{ size: 25, color: '#E69966', value: 'clock' }} + iconInfo={{ color: '#E69966', value: 'clock' }} onClick={this.myTicketPage} /> + diff --git a/src/plain-text/AboutPage.ts b/src/plain-text/AboutPage.ts new file mode 100644 index 0000000..2fa0651 --- /dev/null +++ b/src/plain-text/AboutPage.ts @@ -0,0 +1,5 @@ +export interface AboutPageText {} + +export const aboutPageZhCn: AboutPageText = {}; + +export const aboutPageEnUs: AboutPageText = {}; diff --git a/src/plain-text/SettingsPage.ts b/src/plain-text/SettingsPage.ts index a689e88..c6fd2df 100644 --- a/src/plain-text/SettingsPage.ts +++ b/src/plain-text/SettingsPage.ts @@ -1,14 +1,5 @@ -export interface SettingsPageText { - aboutText: string; - quitText: string; -} +export interface SettingsPageText {} -export const settingsPageZhCn: SettingsPageText = { - aboutText: '关于 EVA Notify', - quitText: '退出账号', -}; +export const settingsPageZhCn: SettingsPageText = {}; -export const settingsPageEnUs: SettingsPageText = { - aboutText: 'About EVA Notify', - quitText: 'Log Out', -}; +export const settingsPageEnUs: SettingsPageText = {}; diff --git a/src/plain-text/UserPage.ts b/src/plain-text/UserPage.ts index 922c7fc..f90aecb 100644 --- a/src/plain-text/UserPage.ts +++ b/src/plain-text/UserPage.ts @@ -17,6 +17,10 @@ export interface UserPageText { title: string; note: string; }; + aboutColumn: { + title: string; + note: string; + }; } export const userPageZhCn: UserPageText = { @@ -38,6 +42,10 @@ export const userPageZhCn: UserPageText = { title: '意见反馈', note: '有什么想说的都可以告诉亦可哦！', }, + aboutColumn: { + title: '关于我们', + note: '查看开发者信息', + }, }; export const userPageEnUs: UserPageText = { @@ -59,4 +67,8 @@ export const userPageEnUs: UserPageText = { title: '意见反馈', note: '有什么想说的都可以告诉亦可哦！', }, + aboutColumn: { + title: '关于我们', + note: '查看开发者信息', + }, }; diff --git a/src/plain-text/index.ts b/src/plain-text/index.ts index fb0d3b3..3ce7508 100644 --- a/src/plain-text/index.ts +++ b/src/plain-text/index.ts @@ -9,6 +9,7 @@ import { } from './SettingsPage'; import { ReportPageText, reportPageEnUs, reportPageZhCn } from './ReportPage'; import { InformPageText, informPageZhCn, informtPageEnUs } from './InformPage'; +import { AboutPageText, aboutPageEnUs, aboutPageZhCn } from './AboutPage'; interface TextRecord { pageFooter: PageFooterText; @@ -18,6 +19,7 @@ interface TextRecord { settingsPage: SettingsPageText; reportPage: ReportPageText; informPage: InformPageText; + aboutPage: AboutPageText; } const textZhCn: TextRecord = { @@ -28,6 +30,7 @@ const textZhCn: TextRecord = { settingsPage: settingsPageZhCn, reportPage: reportPageZhCn, informPage: informPageZhCn, + aboutPage: aboutPageZhCn, }; const textEnUs: TextRecord = { @@ -38,6 +41,7 @@ const textEnUs: TextRecord = { settingsPage: settingsPageEnUs, reportPage: reportPageEnUs, informPage: informtPageEnUs, + aboutPage: aboutPageEnUs, }; // type Lang = 'zh_CN' | 'en_US' | ...;