Compare commits

..

No commits in common. "83d2e8419e6c7ee0a0d7b5c0693923ae1368ab5c" and "f0fe2f6abfc5cc1742ac23bcd01b8ff2f1170c5e" have entirely different histories.

4 changed files with 7 additions and 65 deletions

View File

@ -1,3 +0,0 @@
export default {
component: true,
};

View File

@ -1,12 +0,0 @@
import { View } from '@tarojs/components';
import { AtDivider } from 'taro-ui';
export default () => {
const blankHeight = 120;
return (
<View>
<AtDivider content='EVA Notify' fontColor='#dddddd' lineColor='#dddddd' />
<View style={{ height: blankHeight }}></View>
</View>
);
};

View File

@ -1,9 +1,8 @@
import { View, Text } from '@tarojs/components'; import { View, Text } from '@tarojs/components';
import { Component, ReactNode } from 'react'; import { Component, ReactNode } from 'react';
import Taro from '@tarojs/taro'; import Taro from '@tarojs/taro';
import { AtCard, AtTimeline, AtAccordion } from 'taro-ui'; import { AtCard, AtTimeline } from 'taro-ui';
import type CustomTabBar from '@/custom-tab-bar'; import type CustomTabBar from '../../custom-tab-bar';
import PageFooter from '@/components/PageFooter/PageFooter';
import './index.scss'; import './index.scss';
interface CardContent { interface CardContent {
@ -23,34 +22,6 @@ function mainPageCard(c: CardContent): JSX.Element {
); );
} }
class ExpandItem extends Component {
state = {
open: false,
};
props = {
title: '',
content: <View></View>,
};
handleClick(value: boolean) {
this.setState({ open: value });
}
render(): ReactNode {
return (
<View>
<AtAccordion
open={this.state.open}
onClick={this.handleClick.bind(this)}
title={this.props.title}
>
{this.props.content}
</AtAccordion>
</View>
);
}
}
class DutyInfo extends Component { class DutyInfo extends Component {
render(): ReactNode { render(): ReactNode {
return ( return (
@ -82,14 +53,7 @@ class TipsInfo extends Component {
render(): ReactNode { render(): ReactNode {
return ( return (
<View> <View>
<AtTimeline <Text></Text>
items={[
{ title: '戴尔、Surface、外星人、苹果电脑不能拆机哦~' },
{ title: '数据无价,请随时做好数据备份哦~' },
{ title: '204也是实验室请遵守实验室纪律请勿饮食~' },
{ title: '我们是志愿服务,不收任何礼物哦~' },
]}
></AtTimeline>
</View> </View>
); );
} }
@ -105,12 +69,12 @@ export default class Index extends Component {
}, },
stepInfoCard: { stepInfoCard: {
title: '维修步骤', title: '维修步骤',
note: 'Tips 请在20:30以前取走自己的物品哦', note: 'Tips',
extra: '额外信息', extra: '额外信息',
content: <StepInfo />, content: <StepInfo />,
}, },
tipsInfoCard: { tipsInfoCard: {
title: '注意事项', title: '提醒事项',
note: 'Tips', note: 'Tips',
extra: '额外信息', extra: '额外信息',
content: <TipsInfo />, content: <TipsInfo />,
@ -134,16 +98,9 @@ export default class Index extends Component {
</View> </View>
<View style={{ marginTop: 30 }}> <View style={{ marginTop: 30 }}>
{mainPageCard(this.state.dutyInfoCard)} {mainPageCard(this.state.dutyInfoCard)}
<ExpandItem {mainPageCard(this.state.stepInfoCard)}
title='查看维修步骤' {mainPageCard(this.state.tipsInfoCard)}
content={mainPageCard(this.state.stepInfoCard)}
/>
<ExpandItem
title='查看注意事项'
content={mainPageCard(this.state.tipsInfoCard)}
/>
</View> </View>
<PageFooter />
</View> </View>
); );
} }