Compare commits

..

No commits in common. "fd6a60d1d31900baca23cceb32ec9f988f416bba" and "dd770b8ece7050f0a4d2de625670e165b2a7acaf" have entirely different histories.

6 changed files with 8 additions and 66 deletions

View File

@ -7,7 +7,6 @@ export default defineAppConfig({
'pages/user/inform/inform', 'pages/user/inform/inform',
'pages/user/about/about', 'pages/user/about/about',
'pages/user/report/report', 'pages/user/report/report',
'pages/user/member/member',
], ],
window: { window: {
backgroundTextStyle: 'light', backgroundTextStyle: 'light',

View File

@ -1,3 +0,0 @@
export default definePageConfig({
usingComponents: {},
});

View File

@ -1,9 +0,0 @@
import { Component, ReactNode } from 'react';
import { View } from '@tarojs/components';
import './about.scss';
export default class SettingsPage extends Component {
render(): ReactNode {
return <View></View>;
}
}

View File

@ -1,4 +1,4 @@
import { AtList, AtListItem, AtToast } from 'taro-ui'; import { AtList, AtListItem } from 'taro-ui';
import { Component, ReactNode } from 'react'; import { Component, ReactNode } from 'react';
import { View, Picker, Image, Text } from '@tarojs/components'; import { View, Picker, Image, Text } from '@tarojs/components';
import { getUrl } from '@/service'; import { getUrl } from '@/service';
@ -11,7 +11,6 @@ import logo from '@/assets/images/UserPage/logo.png';
import './user.scss'; import './user.scss';
const listLangInterval = 20; const listLangInterval = 20;
const memberClickTimes = 7;
export default class UserPage extends Component { export default class UserPage extends Component {
state = { state = {
@ -20,12 +19,6 @@ export default class UserPage extends Component {
zh_CN: '简体中文', zh_CN: '简体中文',
en_US: 'English', en_US: 'English',
}[pt.getCurLang()], }[pt.getCurLang()],
clicks: memberClickTimes,
isToastOpen: false,
toastText:
pt.get().userPage.memberEntry.front +
memberClickTimes.toString() +
pt.get().userPage.memberEntry.behind,
}; };
// 以下是TabBar相关 // 以下是TabBar相关
@ -36,30 +29,6 @@ export default class UserPage extends Component {
} }
// 以上是TabBar相关 // 以上是TabBar相关
onTapImage = () => {
this.setState({
clicks: this.state.clicks - 1,
});
if (this.state.clicks < 3) {
this.setState({
toastText:
pt.get().userPage.memberEntry.front +
(this.state.clicks + 1).toString() + // React State's feature
pt.get().userPage.memberEntry.behind,
isToastOpen: true,
});
if (this.state.clicks == 0) {
this.setState({
isToastOpen: false,
clicks: memberClickTimes,
});
Taro.navigateTo({
url: '/pages/user/member/member',
});
}
}
};
showLangDict: Record<string, Lang> = { showLangDict: Record<string, Lang> = {
: 'zh_CN', : 'zh_CN',
English: 'en_US', English: 'en_US',
@ -117,16 +86,8 @@ export default class UserPage extends Component {
className='at-row at-row__justify--center at-row__align--end' className='at-row at-row__justify--center at-row__align--end'
style='height:110px;' style='height:110px;'
> >
<Image <Image style='width: 100px;height: 100px;' src={logo} />
onTap={this.onTapImage}
style='width: 100px;height: 100px;'
src={logo}
/>
</View> </View>
<AtToast
isOpened={this.state.isToastOpen}
text={this.state.toastText}
></AtToast>
<View <View
className='at-row at-row__justify--center at-row__align--center' className='at-row at-row__justify--center at-row__align--center'
style='height:60px;color:#696969;' style='height:60px;color:#696969;'

View File

@ -1,8 +1,6 @@
export interface UserPageText { export interface UserPageText {
memberEntry: { mainTitleLine: string;
front: string; subTitleLine: string;
behind: string;
};
ticketColumn: { ticketColumn: {
title: string; title: string;
note: string; note: string;
@ -26,10 +24,8 @@ export interface UserPageText {
} }
export const userPageZhCn: UserPageText = { export const userPageZhCn: UserPageText = {
memberEntry: { mainTitleLine: '您好这里是E志者协会',
front: '再点击 ', subTitleLine: '维修请至【东三-204】实验室',
behind: ' 次以进入协会成员登录页面',
},
ticketColumn: { ticketColumn: {
title: '我的工单', title: '我的工单',
note: '在这里查看历史工单!', note: '在这里查看历史工单!',
@ -53,10 +49,8 @@ export const userPageZhCn: UserPageText = {
}; };
export const userPageEnUs: UserPageText = { export const userPageEnUs: UserPageText = {
memberEntry: { mainTitleLine: '您好这里是E志者协会',
front: '再点击 ', subTitleLine: '维修请至【东三-204】实验室',
behind: ' 次以进入协会成员登录页面',
},
ticketColumn: { ticketColumn: {
title: '我的工单', title: '我的工单',
note: '在这里查看历史工单!', note: '在这里查看历史工单!',