Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit b4298ae

Browse files
authored
style(report): redesign sub panel (#1121)
* style(report): redesign sub panel * chore: small fix * chore(share): logo update & facebook url fix
1 parent ef6335d commit b4298ae

File tree

30 files changed

+127
-65
lines changed

30 files changed

+127
-65
lines changed

public/icons/static/social/facebook-share.png

100644100755
-3.63 KB
Loading
11.6 KB
Loading
1.03 KB
Loading
-2.98 KB
Loading
-4 KB
Loading

src/components/Buttons/styles/yes_or_no_buttons.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ export const Wrapper = styled.div<TWrapper>`
1010
align === 'center' ? 'center' : 'flex-end'};
1111
`
1212
export const CancelBtn = styled.div`
13+
opacity: 0.8;
1314
color: ${theme('button.primary')};
1415
font-size: 14px;
16+
17+
&:hover {
18+
opacity: 1;
19+
cursor: pointer;
20+
}
21+
22+
transition: opacity 0.2s;
1523
`

src/containers/tool/AbuseReport/Footer.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { FC } from 'react'
33
import { YesOrNoButtons } from '@/components/Buttons'
44

55
import { Wrapper } from './styles/footer'
6+
import { goBack } from './logic'
67

78
type TProps = {
89
view: 'main' | 'detail'
@@ -14,7 +15,11 @@ const Footer: FC<TProps> = ({ view }) => {
1415
return (
1516
<Wrapper>
1617
{/* <Note>举报后社区志愿者会在第一时间【处理】。</Note> */}
17-
<YesOrNoButtons confirmText="举报" />
18+
<YesOrNoButtons
19+
cancelText="上一步"
20+
confirmText="举报"
21+
onCancel={goBack}
22+
/>
1823
</Wrapper>
1924
)
2025
}

src/containers/tool/AbuseReport/Header.tsx

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import { FC } from 'react'
1+
import { FC, memo } from 'react'
22

33
import { REPORT_TYPE } from '@/constant'
44
import { ICON } from '@/config'
5+
6+
import type { TREPORT_ITEM } from './spec'
57
import { Wrapper, ReportIcon, Text, ContentTitle } from './styles/header'
68

79
const getCustomTitle = (type: string): string => {
@@ -23,16 +25,22 @@ const getCustomTitle = (type: string): string => {
2325

2426
type TProps = {
2527
type: string
28+
view: 'main' | 'detail'
29+
activeItem: TREPORT_ITEM
2630
}
2731

28-
const Header: FC<TProps> = ({ type }) => {
32+
const Header: FC<TProps> = ({ type, view, activeItem }) => {
2933
return (
30-
<Wrapper>
34+
<Wrapper showShadow={view === 'detail'}>
3135
<ReportIcon src={`${ICON}/article/report-solid.svg`} />
32-
<Text>举报{getCustomTitle(type)}</Text>
36+
{view === 'detail' ? (
37+
<Text>{activeItem.title}</Text>
38+
) : (
39+
<Text>举报{getCustomTitle(type)}</Text>
40+
)}
3341
<ContentTitle>这是一首简单的小情歌</ContentTitle>
3442
</Wrapper>
3543
)
3644
}
3745

38-
export default Header
46+
export default memo(Header)

src/containers/tool/AbuseReport/ReportContent/Detail.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ import { FC } from 'react'
22

33
import Input from '@/components/Input'
44
import { Br } from '@/components/Common'
5-
import { ArrowButton } from '@/components/Buttons'
65

76
import type { TREPORT_ITEM } from '../spec'
87
import { Wrapper, DetailDesc } from '../styles/report_content/detail'
9-
import { goBack } from '../logic'
108

119
type TProps = {
1210
activeItem: TREPORT_ITEM
@@ -15,15 +13,6 @@ type TProps = {
1513
const Detail: FC<TProps> = ({ activeItem }) => {
1614
return (
1715
<Wrapper>
18-
<ArrowButton
19-
size="small"
20-
direction="left"
21-
arrowStyle="simple"
22-
onClick={() => goBack()}
23-
>
24-
{activeItem.title}
25-
</ArrowButton>
26-
<Br bottom={10} />
2716
<DetailDesc>{activeItem.detail}</DetailDesc>
2817
<Br bottom={25} />
2918
<Input

src/containers/tool/AbuseReport/ReportContent/Main.tsx

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
import { FC, Fragment } from 'react'
1+
import { FC } from 'react'
22

33
import { SpaceGrow } from '@/components/Common'
44
import Checker from '@/components/Checker'
55

66
import type { TREPORT_ITEM } from '../spec'
77

8-
import { Option, SelectWrapper, Title } from '../styles/report_content/main'
8+
import {
9+
Wrapper,
10+
OptionsWrapper,
11+
Option,
12+
SelectWrapper,
13+
Title,
14+
Panel,
15+
} from '../styles/report_content/main'
916
import { selectItem } from '../logic'
1017

1118
type TProps = {
@@ -15,18 +22,21 @@ type TProps = {
1522

1623
const Main: FC<TProps> = ({ items, activeItem }) => {
1724
return (
18-
<Fragment>
19-
{items &&
20-
items.map((item) => (
21-
<Option key={item.raw}>
22-
<SelectWrapper onClick={() => selectItem(item.raw)}>
23-
<Checker checked={item.raw === activeItem.raw} />
24-
<Title active={item.raw === activeItem.raw}>{item.title}</Title>
25-
</SelectWrapper>
26-
<SpaceGrow />
27-
</Option>
28-
))}
29-
</Fragment>
25+
<Wrapper>
26+
<OptionsWrapper>
27+
{items &&
28+
items.map((item) => (
29+
<Option key={item.raw}>
30+
<SelectWrapper onClick={() => selectItem(item.raw)}>
31+
<Checker checked={item.raw === activeItem.raw} />
32+
<Title active={item.raw === activeItem.raw}>{item.title}</Title>
33+
</SelectWrapper>
34+
<SpaceGrow />
35+
</Option>
36+
))}
37+
</OptionsWrapper>
38+
<Panel>感谢你用实际行动为社区净化作出贡献。</Panel>
39+
</Wrapper>
3040
)
3141
}
3242

0 commit comments

Comments
 (0)