From 133d60375a20914ca539f8a4364b64ae22ea8498 Mon Sep 17 00:00:00 2001 From: Dawn_Ocean <1785590531@qq.com> Date: Thu, 7 Mar 2024 23:50:32 +0800 Subject: [PATCH] remove settings page --- src/app.config.ts | 1 - src/pages/user/settings/setting.config.ts | 4 -- src/pages/user/settings/settings.scss | 0 src/pages/user/settings/settings.tsx | 61 ----------------------- src/pages/user/user.tsx | 53 ++++++++++++++------ src/plain-text/SettingsPage.ts | 5 -- src/plain-text/index.ts | 8 --- 7 files changed, 37 insertions(+), 95 deletions(-) delete mode 100644 src/pages/user/settings/setting.config.ts delete mode 100644 src/pages/user/settings/settings.scss delete mode 100644 src/pages/user/settings/settings.tsx delete mode 100644 src/plain-text/SettingsPage.ts diff --git a/src/app.config.ts b/src/app.config.ts index 8d19225..07ac54b 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -5,7 +5,6 @@ export default defineAppConfig({ 'pages/user/user', 'pages/user/myTicket/myTicket', 'pages/user/inform/inform', - 'pages/user/settings/settings', 'pages/user/about/about', 'pages/user/report/report', ], diff --git a/src/pages/user/settings/setting.config.ts b/src/pages/user/settings/setting.config.ts deleted file mode 100644 index 5194b19..0000000 --- a/src/pages/user/settings/setting.config.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default definePageConfig({ - navigationBarTitleText: '设置', - usingComponents: {}, -}); diff --git a/src/pages/user/settings/settings.scss b/src/pages/user/settings/settings.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/user/settings/settings.tsx b/src/pages/user/settings/settings.tsx deleted file mode 100644 index 043b1e7..0000000 --- a/src/pages/user/settings/settings.tsx +++ /dev/null @@ -1,61 +0,0 @@ -import { AtList, AtListItem } from 'taro-ui'; -import { Component, ReactNode } from 'react'; -import Taro from '@tarojs/taro'; -import { View, Picker } from '@tarojs/components'; -import pt, { Lang } from '@/plain-text'; -import './settings.scss'; - -export default class SettingsPage extends Component { - state = { - selector: ['简体中文', 'English'], - selectorChecked: { - zh_CN: '简体中文', - en_US: 'English', - }[pt.getCurLang()], - }; - - showLangDict: Record = { - 简体中文: 'zh_CN', - English: 'en_US', - }; - - onSelect = (e: { detail: { value: string | number } }) => { - this.setState({ - selectorChecked: this.state.selector[e.detail.value], - }); - pt.setLang(this.showLangDict[this.state.selector[e.detail.value]]); - Taro.reLaunch({ - url: '/pages/index/index', - }); - }; - - handleQuit() { - console.log('Quit'); - } - - handleAbout() { - Taro.navigateTo({ - url: '/pages/user/settings/about/about', - }); - } - render(): ReactNode { - return ( - - - - - - - - - - ); - } -} diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 4c2d304..fde977e 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -1,14 +1,22 @@ import { AtList, AtListItem } from 'taro-ui'; import { Component, ReactNode } from 'react'; -import { View } from '@tarojs/components'; +import { View, Picker } from '@tarojs/components'; import Taro from '@tarojs/taro'; import type CustomTabBar from '@/custom-tab-bar'; import PageFooter from '@/components/PageFooter/PageFooter'; import aboutIcon from '@/assets/icons/AboutPage/about.svg'; -import pt from '@/plain-text'; +import pt, { Lang } from '@/plain-text'; import './user.scss'; export default class UserPage extends Component { + state = { + selector: ['简体中文', 'English'], + selectorChecked: { + zh_CN: '简体中文', + en_US: 'English', + }[pt.getCurLang()], + }; + // 以下是TabBar相关 pageCtx = Taro.getCurrentInstance().page; componentDidShow() { @@ -17,6 +25,21 @@ export default class UserPage extends Component { } // 以上是TabBar相关 + showLangDict: Record = { + 简体中文: 'zh_CN', + English: 'en_US', + }; + + onSelect = (e: { detail: { value: string | number } }) => { + this.setState({ + selectorChecked: this.state.selector[e.detail.value], + }); + pt.setLang(this.showLangDict[this.state.selector[e.detail.value]]); + Taro.reLaunch({ + url: '/pages/user/user', + }); + }; + myTicketPage() { Taro.navigateTo({ url: '/pages/user/myTicket/myTicket', @@ -29,12 +52,6 @@ export default class UserPage extends Component { }); } - settingsPage() { - Taro.navigateTo({ - url: '/pages/user/settings/settings', - }); - } - reportPage() { Taro.navigateTo({ url: '/pages/user/report/report', @@ -65,14 +82,6 @@ export default class UserPage extends Component { iconInfo={{ color: '#78A4FA', value: 'user' }} onClick={this.informPage} /> - + + + + + diff --git a/src/plain-text/SettingsPage.ts b/src/plain-text/SettingsPage.ts deleted file mode 100644 index c6fd2df..0000000 --- a/src/plain-text/SettingsPage.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface SettingsPageText {} - -export const settingsPageZhCn: SettingsPageText = {}; - -export const settingsPageEnUs: SettingsPageText = {}; diff --git a/src/plain-text/index.ts b/src/plain-text/index.ts index 3ce7508..c11bc1f 100644 --- a/src/plain-text/index.ts +++ b/src/plain-text/index.ts @@ -2,11 +2,6 @@ import { PageFooterText, pageFooterZhCn, pageFooterEnUs } from './PageFooter'; import { MainPageText, mainPageZhCn, mainPageEnUs } from './MainPage'; import { UserPageText, userPageZhCn, userPageEnUs } from './UserPage'; import { TabBarText, tabBarEnUs, tabBarZhCn } from './TabBar'; -import { - SettingsPageText, - settingsPageEnUs, - settingsPageZhCn, -} from './SettingsPage'; import { ReportPageText, reportPageEnUs, reportPageZhCn } from './ReportPage'; import { InformPageText, informPageZhCn, informtPageEnUs } from './InformPage'; import { AboutPageText, aboutPageEnUs, aboutPageZhCn } from './AboutPage'; @@ -16,7 +11,6 @@ interface TextRecord { mainPage: MainPageText; userPage: UserPageText; tabBar: TabBarText; - settingsPage: SettingsPageText; reportPage: ReportPageText; informPage: InformPageText; aboutPage: AboutPageText; @@ -27,7 +21,6 @@ const textZhCn: TextRecord = { mainPage: mainPageZhCn, userPage: userPageZhCn, tabBar: tabBarZhCn, - settingsPage: settingsPageZhCn, reportPage: reportPageZhCn, informPage: informPageZhCn, aboutPage: aboutPageZhCn, @@ -38,7 +31,6 @@ const textEnUs: TextRecord = { mainPage: mainPageEnUs, userPage: userPageEnUs, tabBar: tabBarEnUs, - settingsPage: settingsPageEnUs, reportPage: reportPageEnUs, informPage: informtPageEnUs, aboutPage: aboutPageEnUs,