add support for rendering ui on various devices
This commit is contained in:
@@ -229,11 +229,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
<View>
|
||||
<View
|
||||
className='at-row'
|
||||
style={{ paddingTop: 10, paddingBottom: 10, width: '100%' }}
|
||||
style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
|
||||
>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
|
||||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isPickLoading}
|
||||
@@ -246,7 +246,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
</View>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
|
||||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isOreoLoading}
|
||||
@@ -260,11 +260,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
</View>
|
||||
<View
|
||||
className='at-row'
|
||||
style={{ paddingTop: 10, paddingBottom: 10, width: '100%' }}
|
||||
style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
|
||||
>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
|
||||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isStatusLoading}
|
||||
@@ -277,7 +277,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
</View>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
|
||||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
disabled={this.state.isCommentDisable}
|
||||
@@ -293,11 +293,11 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
) : (
|
||||
<View
|
||||
className='at-row'
|
||||
style={{ paddingTop: 10, paddingBottom: 10, width: '100%' }}
|
||||
style={{ paddingTop: '20rpx', paddingBottom: '20rpx', width: '100%' }}
|
||||
>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginLeft: 10, paddingRight: 5, width: '50%' }}
|
||||
style={{ marginLeft: '20rpx', paddingRight: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
loading={this.state.isRetrieveLoading}
|
||||
@@ -310,7 +310,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
</View>
|
||||
<View
|
||||
className='at-col'
|
||||
style={{ marginRight: 10, paddingLeft: 5, width: '50%' }}
|
||||
style={{ marginRight: '20rpx', paddingLeft: '10rpx', width: '50%' }}
|
||||
>
|
||||
<AtButton
|
||||
disabled={this.state.isCommentDisable}
|
||||
@@ -374,7 +374,7 @@ export default class TicketDetail extends Component<{}, TicketDetailState> {
|
||||
value={this.state.comment}
|
||||
onChange={this.handleCommentChange.bind(this)}
|
||||
maxLength={200}
|
||||
height={200}
|
||||
height='400rpx'
|
||||
placeholder={pt.get().ticketDetail.comment.placeholder}
|
||||
/>
|
||||
<AtButton formType='submit' type='primary'>
|
||||
|
||||
@@ -36,19 +36,19 @@ class Card extends Component {
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
marginBottom: 20,
|
||||
marginBottom: '40rpx',
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
src={iconsrc}
|
||||
style={{
|
||||
width: 24,
|
||||
height: 24,
|
||||
width: '48rpx',
|
||||
height: '48rpx',
|
||||
}}
|
||||
/>
|
||||
<View
|
||||
style={{
|
||||
marginLeft: 10,
|
||||
marginLeft: '20rpx',
|
||||
fontSize: '60rpx',
|
||||
fontWeight: 'bold',
|
||||
}}
|
||||
|
||||
@@ -10,7 +10,7 @@ export default class TitleCard extends React.Component {
|
||||
<View className='at-row at-row__align--center'>
|
||||
<View className='at-col at-col-1 at-col--auto'>
|
||||
<Image
|
||||
style='width: 50px; height: 50px; margin-left: 15px;'
|
||||
style='width: 100rpx; height: 100rpx; margin-left: 30rpx;'
|
||||
src={logo}
|
||||
mode='aspectFit'
|
||||
/>
|
||||
|
||||
@@ -20,7 +20,7 @@ class CardContent {
|
||||
|
||||
function mainPageCard(c: CardContent): JSX.Element {
|
||||
return (
|
||||
<View style={{ marginTop: 10, marginBottom: 20 }}>
|
||||
<View style={{ marginTop: '20rpx', marginBottom: '40rpx' }}>
|
||||
<AtCard note={c.note} extra={c.extra} title={c.title}>
|
||||
{c.content()}
|
||||
</AtCard>
|
||||
@@ -106,7 +106,7 @@ export default class MainPage extends Component<{}, MainPageState> {
|
||||
<View>
|
||||
<TitleCard />
|
||||
<View style={{ width: '94%', marginLeft: '3%' }}>
|
||||
<View style={{ marginTop: 30 }}>
|
||||
<View style={{ marginTop: '60rpx' }}>
|
||||
{mainPageCard(this.state.dutyInfoCard)}
|
||||
{mainPageCard(this.state.tipsInfoCard)}
|
||||
<ExpandItem
|
||||
|
||||
@@ -36,20 +36,20 @@ class Card extends Component {
|
||||
style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
marginBottom: 20,
|
||||
marginBottom: '40rpx',
|
||||
}}
|
||||
>
|
||||
<Image
|
||||
src={iconsrc}
|
||||
style={{
|
||||
width: 24,
|
||||
height: 24,
|
||||
width: '48rpx',
|
||||
height: '48rpx',
|
||||
}}
|
||||
/>
|
||||
<View
|
||||
style={{
|
||||
marginLeft: 10,
|
||||
fontSize: 30,
|
||||
marginLeft: '20rpx',
|
||||
fontSize: '60rpx',
|
||||
fontWeight: 'bold',
|
||||
}}
|
||||
>
|
||||
|
||||
@@ -10,7 +10,7 @@ export default class MemberTitleCard extends React.Component {
|
||||
<View className='at-row at-row__align--center'>
|
||||
<View className='at-col at-col-1 at-col--auto'>
|
||||
<Image
|
||||
style='width: 50px; height: 50px; margin-left: 15px;'
|
||||
style='width: 100rpx; height: 100rpx; margin-left: 30rpx;'
|
||||
src={logo}
|
||||
mode='aspectFit'
|
||||
/>
|
||||
|
||||
@@ -24,7 +24,7 @@ class CardContent {
|
||||
|
||||
function memberPageCard(c: CardContent): JSX.Element {
|
||||
return (
|
||||
<View style={{ marginTop: 10 }}>
|
||||
<View style={{ marginTop: '20rpx' }}>
|
||||
<AtCard note={c.note} extra={c.extra} title={c.title}>
|
||||
{c.content()}
|
||||
</AtCard>
|
||||
@@ -124,7 +124,7 @@ export default class MemberPage extends Component<{}, MemberPageState> {
|
||||
return (
|
||||
<View>
|
||||
<MemberTitleCard />
|
||||
<View style={{ marginTop: 30 }}>
|
||||
<View style={{ marginTop: '60rpx' }}>
|
||||
{memberPageCard(this.state.dutyInfoCard)}
|
||||
{memberPageCard(this.state.tipsInfoCard)}
|
||||
<ExpandItem
|
||||
|
||||
@@ -188,11 +188,13 @@ export default class RepairPage extends Component<{}, RepairPageState> {
|
||||
this.state.currentTicketsIdName.map((pair, idx) => (
|
||||
<AtCard
|
||||
key={idx}
|
||||
title={pair.get(pair.keys().next().value)} //pair.keys().next().value == id
|
||||
title={pair.values().next().value} //pair.keys().next().value == ticket['device'] + ' ' + ticket['deviceModel']
|
||||
extra={pt.get().repairPage.currentTicket.extra}
|
||||
onClick={() => {
|
||||
Taro.navigateTo({
|
||||
url: '/pages/TicketDetail/TicketDetail?id=' + pair.keys()[0],
|
||||
url:
|
||||
'/pages/TicketDetail/TicketDetail?id=' +
|
||||
pair.keys().next().value,
|
||||
});
|
||||
}}
|
||||
note={
|
||||
@@ -202,7 +204,7 @@ export default class RepairPage extends Component<{}, RepairPageState> {
|
||||
}
|
||||
>
|
||||
<DetailFramework
|
||||
id={pair.keys()[0]}
|
||||
id={pair.keys().next().value} //pair.keys().next().value == id
|
||||
isInfoShow={isInfoShow}
|
||||
middleButton={middleButton}
|
||||
/>
|
||||
@@ -216,8 +218,8 @@ export default class RepairPage extends Component<{}, RepairPageState> {
|
||||
<AtMessage />
|
||||
<View
|
||||
style={{
|
||||
marginTop: 10,
|
||||
marginBottom: 20,
|
||||
marginTop: '20rpx',
|
||||
marginBottom: '40rpx',
|
||||
}}
|
||||
>
|
||||
{ticketsRenderer}
|
||||
|
||||
@@ -16,7 +16,7 @@ interface MyTicketState {
|
||||
|
||||
export default class MyTicketPage extends Component<{}, MyTicketState> {
|
||||
state = {
|
||||
fixList: [new TicketListItem(0, '', '', 1, moment(), false)],
|
||||
fixList: [new TicketListItem(0, '', '', 1, moment())],
|
||||
rs: new RequestState(),
|
||||
};
|
||||
|
||||
|
||||
+17
-9
@@ -11,7 +11,6 @@ import logo from '@/assets/images/UserPage/logo.png';
|
||||
import { setLocaleData } from '@/service/localeData';
|
||||
import './user.scss';
|
||||
|
||||
const listLangInterval = 20;
|
||||
const memberClickTimes = 7;
|
||||
|
||||
export default class UserPage extends Component {
|
||||
@@ -104,11 +103,11 @@ export default class UserPage extends Component {
|
||||
<View>
|
||||
<View
|
||||
className='at-row at-row__justify--center at-row__align--end'
|
||||
style='height:110px;'
|
||||
style='height:220rpx;'
|
||||
>
|
||||
<Image
|
||||
onTap={this.onTapImage}
|
||||
style='width: 100px;height: 100px;'
|
||||
style='width: 200rpx;height: 200rpx;'
|
||||
src={logo}
|
||||
mode='aspectFit'
|
||||
/>
|
||||
@@ -119,23 +118,29 @@ export default class UserPage extends Component {
|
||||
></AtToast>
|
||||
<View
|
||||
className='at-row at-row__justify--center at-row__align--center'
|
||||
style='height:60px;color:#696969;'
|
||||
style='height:120rpx;color:#696969;'
|
||||
>
|
||||
<Text> EVA Notify v1.0.0</Text>
|
||||
<Text style={{ fontSize: '32rpx' }}> EVA Notify v1.0.0</Text>
|
||||
</View>
|
||||
<AtList>
|
||||
<AtListItem
|
||||
title={pt.get().userPage.ticketColumn.title}
|
||||
note={pt.get().userPage.ticketColumn.note}
|
||||
arrow='right'
|
||||
iconInfo={{ 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={{ color: '#78A4FA', value: 'user' }}
|
||||
iconInfo={{
|
||||
color: '#78A4FA',
|
||||
value: 'user',
|
||||
}}
|
||||
onClick={this.informPage}
|
||||
/>
|
||||
<AtListItem
|
||||
@@ -143,7 +148,10 @@ export default class UserPage extends Component {
|
||||
note={pt.get().userPage.reportColumn.note}
|
||||
extraText=''
|
||||
arrow='right'
|
||||
iconInfo={{ color: '#9ACD32', value: 'message' }}
|
||||
iconInfo={{
|
||||
color: '#9ACD32',
|
||||
value: 'message',
|
||||
}}
|
||||
onClick={this.reportPage}
|
||||
/>
|
||||
<AtListItem
|
||||
@@ -154,7 +162,7 @@ export default class UserPage extends Component {
|
||||
thumb={aboutIcon}
|
||||
onClick={this.aboutPage}
|
||||
/>
|
||||
<View style={{ height: listLangInterval }}></View>
|
||||
<View style={{ height: '40rpx' }}></View>
|
||||
<Picker
|
||||
mode='selector'
|
||||
range={this.state.selector}
|
||||
|
||||
Reference in New Issue
Block a user