move about page to user page

This commit is contained in:
Dawn_Ocean
2024-03-07 21:47:16 +08:00
parent 229dffa9a1
commit bea23f4705
13 changed files with 52 additions and 29 deletions
@@ -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 {
+1 -8
View File
@@ -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 {
</AtList>
</Picker>
</View>
<AtButton type='secondary' onClick={this.handleAbout.bind(this)}>
{pt.get().settingsPage.aboutText}
</AtButton>
<AtButton type='primary' onClick={this.handleQuit.bind(this)}>
{pt.get().settingsPage.quitText}
</AtButton>
</View>
);
}
+21 -6
View File
@@ -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 (
<View>
@@ -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}
/>
<AtListItem
title={pt.get().userPage.infoColumn.title}
note={pt.get().userPage.infoColumn.note}
arrow='right'
iconInfo={{ size: 25, color: '#78A4FA', value: 'user' }}
iconInfo={{ color: '#78A4FA', value: 'user' }}
onClick={this.informPage}
/>
<AtListItem
@@ -63,7 +70,7 @@ export default class UserPage extends Component {
note={pt.get().userPage.settingsColumn.note}
extraText=''
arrow='right'
iconInfo={{ size: 25, color: '#808080', value: 'filter' }}
iconInfo={{ color: '#808080', value: 'filter' }}
onClick={this.settingsPage}
/>
<AtListItem
@@ -71,9 +78,17 @@ export default class UserPage extends Component {
note={pt.get().userPage.reportColumn.note}
extraText=''
arrow='right'
iconInfo={{ size: 25, color: '#9ACD32', value: 'message' }}
iconInfo={{ color: '#9ACD32', value: 'message' }}
onClick={this.reportPage}
/>
<AtListItem
title={pt.get().userPage.aboutColumn.title}
note={pt.get().userPage.aboutColumn.note}
extraText=''
arrow='right'
thumb={aboutIcon}
onClick={this.aboutPage}
/>
</AtList>
<PageFooter />
</View>