Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
shenshaokai
jinfa-platform
Commits
6b1044b8
Commit
6b1044b8
authored
Jan 04, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev
parents
9b5133ae
85178a42
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
3 deletions
+26
-3
index.less
src/pages/home/components/AdvertisementSpace/index.less
+2
-0
index.less
src/pages/home/components/RecentVisit/index.less
+4
-0
index.tsx
src/pages/home/components/RecentVisit/index.tsx
+5
-2
index.less
src/pages/home/components/UserCenter/index.less
+12
-0
index.tsx
src/pages/home/components/UserCenter/index.tsx
+3
-1
No files found.
src/pages/home/components/AdvertisementSpace/index.less
View file @
6b1044b8
...
@@ -40,6 +40,8 @@
...
@@ -40,6 +40,8 @@
// }
// }
.advertisementSpace {
.advertisementSpace {
margin-bottom: 16px;
margin-bottom: 16px;
border-radius: 8px;
overflow: hidden;
height: 217px;
height: 217px;
.img {
.img {
width: 100%;
width: 100%;
...
...
src/pages/home/components/RecentVisit/index.less
View file @
6b1044b8
...
@@ -29,6 +29,10 @@
...
@@ -29,6 +29,10 @@
align-items: center;
align-items: center;
a {
a {
color: #303133;
color: #303133;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
}
}
}
}
}
...
...
src/pages/home/components/RecentVisit/index.tsx
View file @
6b1044b8
import
React
from
'react'
;
import
React
from
'react'
;
import
styles
from
'./index.less'
;
import
styles
from
'./index.less'
;
import
menu_zh
from
'@/locales/zh-CN/menu'
;
import
menu_zh
from
'@/locales/zh-CN/menu'
;
import
{
Tooltip
}
from
'antd'
;
import
{
Link
}
from
'umi'
;
import
{
Link
}
from
'umi'
;
interface
Iprops
{}
interface
Iprops
{}
...
@@ -15,11 +16,13 @@ const RecentVisit: React.FC<Iprops> = () => {
...
@@ -15,11 +16,13 @@ const RecentVisit: React.FC<Iprops> = () => {
{
{
Object
.
keys
(
recentVisit
).
map
((
item
)
=>
{
Object
.
keys
(
recentVisit
).
map
((
item
)
=>
{
return
(
return
(
<
div
key=
{
item
}
className=
{
styles
.
item
}
>
<
Tooltip
key=
{
item
}
placement=
"top"
title=
{
menu_zh
[
item
]
}
>
<
Link
key=
{
item
}
to=
{
recentVisit
[
item
]
}
>
<
div
className=
{
styles
.
item
}
>
<
Link
key=
{
item
}
to=
{
recentVisit
[
item
]
}
>
{
menu_zh
[
item
]
}
{
menu_zh
[
item
]
}
</
Link
>
</
Link
>
</
div
>
</
div
>
</
Tooltip
>
)
)
})
})
...
...
src/pages/home/components/UserCenter/index.less
View file @
6b1044b8
...
@@ -100,6 +100,14 @@
...
@@ -100,6 +100,14 @@
justify-content: space-between;
justify-content: space-between;
flex: 1;
flex: 1;
.user {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
flex: 1;
}
// .userStatus {
// .userStatus {
// display: flex;
// display: flex;
// flex-direction: row;
// flex-direction: row;
...
@@ -128,6 +136,7 @@
...
@@ -128,6 +136,7 @@
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
align-items: center;
align-items: center;
flex: 1;
.link {
.link {
width: 88px;
width: 88px;
...
@@ -141,12 +150,14 @@
...
@@ -141,12 +150,14 @@
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
align-items: center;
align-items: center;
flex: 1;
.level {
.level {
display: flex;
display: flex;
flex-direction: row;
flex-direction: row;
justify-content: center;
justify-content: center;
width: 140px;
width: 140px;
margin-right: auto;
.levelImg {
.levelImg {
height: 16px;
height: 16px;
}
}
...
@@ -155,6 +166,7 @@
...
@@ -155,6 +166,7 @@
.score {
.score {
width: 140px;
width: 140px;
text-align: center;
text-align: center;
margin-right: auto;
}
}
}
}
}
}
...
...
src/pages/home/components/UserCenter/index.tsx
View file @
6b1044b8
...
@@ -114,6 +114,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
...
@@ -114,6 +114,7 @@ const UserCenter: React.FC<Iprops> = (props) => {
</
div
>
</
div
>
</
Spin
>
</
Spin
>
<
div
className=
{
styles
.
infos
}
>
<
div
className=
{
styles
.
infos
}
>
<
div
className=
{
styles
.
user
}
>
<
div
className=
{
styles
.
userStatus
}
>
<
div
className=
{
styles
.
userStatus
}
>
<
span
className=
{
styles
.
company
}
>
{
userAuth
.
company
}
</
span
>
<
span
className=
{
styles
.
company
}
>
{
userAuth
.
company
}
</
span
>
<
div
className=
{
styles
.
status
}
>
<
div
className=
{
styles
.
status
}
>
...
@@ -133,8 +134,9 @@ const UserCenter: React.FC<Iprops> = (props) => {
...
@@ -133,8 +134,9 @@ const UserCenter: React.FC<Iprops> = (props) => {
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
<
div
className=
{
styles
.
otherValues
}
>
<
Link
to=
{
EDIT_USER_URL
}
className=
{
styles
.
link
}
>
修改会员信息
</
Link
>
<
Link
to=
{
EDIT_USER_URL
}
className=
{
styles
.
link
}
>
修改会员信息
</
Link
>
</
div
>
<
div
className=
{
styles
.
otherValues
}
>
<
div
className=
{
styles
.
divider
}
>
<
div
className=
{
styles
.
divider
}
>
<
div
className=
{
styles
.
level
}
>
<
div
className=
{
styles
.
level
}
>
会员等级:
<
img
src=
{
LEVEL_IMAGE
[
userAuth
.
level
]
}
className=
{
styles
.
levelImg
}
/>
会员等级:
<
img
src=
{
LEVEL_IMAGE
[
userAuth
.
level
]
}
className=
{
styles
.
levelImg
}
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment