beautify ui: /user/member; divider in ticketdetail
parent
239d4f0c7c
commit
4f914a7563
|
|
@ -19,7 +19,7 @@ export default class NoteList extends Component<NoteListProps, {}> {
|
||||||
<AtDivider
|
<AtDivider
|
||||||
fontColor='#CCC'
|
fontColor='#CCC'
|
||||||
content={pt.get().ticketDetail.divider}
|
content={pt.get().ticketDetail.divider}
|
||||||
height='80rpx'
|
height={20}
|
||||||
/>
|
/>
|
||||||
{this.props.noteList.map((note, idx) => (
|
{this.props.noteList.map((note, idx) => (
|
||||||
<View key={idx}>
|
<View key={idx}>
|
||||||
|
|
|
||||||
|
|
@ -260,7 +260,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||||
</View>
|
</View>
|
||||||
<View
|
<View
|
||||||
className='at-row'
|
className='at-row'
|
||||||
style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
|
style={{ paddingTop: '20rpx', paddingBottom: '40rpx', width: '100%' }}
|
||||||
>
|
>
|
||||||
<View
|
<View
|
||||||
className='at-col'
|
className='at-col'
|
||||||
|
|
@ -293,7 +293,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||||
) : (
|
) : (
|
||||||
<View
|
<View
|
||||||
className='at-row'
|
className='at-row'
|
||||||
style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
|
style={{ paddingTop: '20rpx', paddingBottom: '40rpx', width: '100%' }}
|
||||||
>
|
>
|
||||||
<View
|
<View
|
||||||
className='at-col'
|
className='at-col'
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import Taro from '@tarojs/taro';
|
||||||
import pt from '@/plain-text';
|
import pt from '@/plain-text';
|
||||||
import { memberLogin, memberLogout } from '@/service/memberLogin';
|
import { memberLogin, memberLogout } from '@/service/memberLogin';
|
||||||
import wechatUser from '@/wechat';
|
import wechatUser from '@/wechat';
|
||||||
|
import { View } from '@tarojs/components';
|
||||||
import './member.scss';
|
import './member.scss';
|
||||||
|
|
||||||
const logInterval = 5000;
|
const logInterval = 5000;
|
||||||
|
|
@ -70,6 +71,7 @@ export default class UserMemberPage extends Component {
|
||||||
|
|
||||||
render(): ReactNode {
|
render(): ReactNode {
|
||||||
return !wechatUser.getAccess() ? (
|
return !wechatUser.getAccess() ? (
|
||||||
|
<View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
|
||||||
<AtForm onSubmit={this.onSubmit.bind(this)}>
|
<AtForm onSubmit={this.onSubmit.bind(this)}>
|
||||||
<AtMessage />
|
<AtMessage />
|
||||||
<AtInput
|
<AtInput
|
||||||
|
|
@ -101,10 +103,13 @@ export default class UserMemberPage extends Component {
|
||||||
{pt.get().button.buttonText.login}
|
{pt.get().button.buttonText.login}
|
||||||
</AtButton>
|
</AtButton>
|
||||||
</AtForm>
|
</AtForm>
|
||||||
|
</View>
|
||||||
) : (
|
) : (
|
||||||
|
<View style={{ marginTop: '30rpx', width: '94%', marginLeft: '3%' }}>
|
||||||
<AtButton type='primary' onClick={this.onLogout.bind(this)}>
|
<AtButton type='primary' onClick={this.onLogout.bind(this)}>
|
||||||
{pt.get().button.buttonText.logout}
|
{pt.get().button.buttonText.logout}
|
||||||
</AtButton>
|
</AtButton>
|
||||||
|
</View>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import type CustomTabBar from '@/custom-tab-bar';
|
||||||
import PageFooter from '@/components/PageFooter/PageFooter';
|
import PageFooter from '@/components/PageFooter/PageFooter';
|
||||||
import aboutIcon from '@/assets/icons/AboutPage/about.svg';
|
import aboutIcon from '@/assets/icons/AboutPage/about.svg';
|
||||||
import pt, { Lang } from '@/plain-text';
|
import pt, { Lang } from '@/plain-text';
|
||||||
import wechatUser from '@/wechat';
|
|
||||||
import logo from '@/assets/images/UserPage/logo.png';
|
import logo from '@/assets/images/UserPage/logo.png';
|
||||||
import { setLocaleData } from '@/service/localeData';
|
import { setLocaleData } from '@/service/localeData';
|
||||||
import './user.scss';
|
import './user.scss';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue