diff --git a/src/assets/topic/topic_activity_default.jpg b/src/assets/topic/topic_activity_default.jpg
new file mode 100644
index 0000000..50a80fb
Binary files /dev/null and b/src/assets/topic/topic_activity_default.jpg differ
diff --git a/src/assets/topic/topic_activity_default2.jpg b/src/assets/topic/topic_activity_default2.jpg
new file mode 100644
index 0000000..fac92f5
Binary files /dev/null and b/src/assets/topic/topic_activity_default2.jpg differ
diff --git a/src/assets/topic/topic_banner_default.jpg b/src/assets/topic/topic_banner_default.jpg
new file mode 100644
index 0000000..3161a23
Binary files /dev/null and b/src/assets/topic/topic_banner_default.jpg differ
diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx
index 7e0399d..52dee15 100644
--- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx
+++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx
@@ -1,10 +1,10 @@
import React, { useEffect, useState } from 'react';
import '../Style/ld_style.less';
import { Input, List, Pagination } from 'antd';
-import list_pic from '@/assets/topic/listNewsPic01.jpg'
+import topic_activity_default2 from '@/assets/topic/topic_activity_default2.jpg'
import time_icon from '@/assets/topic/timeIcon.png'
import { getGracefulList } from './service';
-import { getImageUrl } from '../utils';
+import { formatTime, getImageUrl } from '../utils';
import { history } from 'umi';
const { Search } = Input;
@@ -41,7 +41,7 @@ const PersonInfor: React.FC<{}> = () => {
const getGracefulData = () => {
getGracefulList().then(async res => {
if (res?.code == 200) {
- const data = await getImageUrl(res?.data, 'image');
+ const data = await getImageUrl(res?.data, 'image', topic_activity_default2);
setGracefulList(data);
}
})
@@ -75,7 +75,7 @@ const PersonInfor: React.FC<{}> = () => {
活动风采
= () => {
{
- console.log(page);
- },
- pageSize: 2,
+ size: 'small',
+ showTotal: (total) => `共 ${total} 条`,
+ pageSize: 10,
}}
dataSource={gracefulList}
renderItem={item => (
@@ -98,13 +97,12 @@ const PersonInfor: React.FC<{}> = () => {
clickTitle(item)}>{item.title}
{item.content}
-
{item.sendTime}
+
{item.createTime}
)}
/>
-
)
}
diff --git a/src/pages/PartyMemberTopic/Home/index.less b/src/pages/PartyMemberTopic/Home/index.less
index e84114d..4b8f5bd 100644
--- a/src/pages/PartyMemberTopic/Home/index.less
+++ b/src/pages/PartyMemberTopic/Home/index.less
@@ -35,11 +35,11 @@
align-items: flex-end;
.carousel-textbg {
- background: rgba(0, 0, 0, 0.6);
display: flex;
justify-content: center;
width: 100%;
- padding: 12px 0px 32px;
+ padding: 50px 0;
+ background: linear-gradient(to top, rgba(0, 0, 0, 1), rgba(0, 0, 0, 0)), no-repeat center;
.carousel-text {
color: #fff;
@@ -48,12 +48,18 @@
.carousel-text-content {
font-weight: bold;
font-size: 32px;
- line-height: 36px;
+ line-height: 40px;
}
.carousel-text-click {
font-size: 14px;
margin-left: 10px;
+ cursor: pointer;
+ }
+
+ .carousel-text-click:hover {
+ color: #fff;
+ text-decoration: underline;
}
}
}
@@ -66,6 +72,7 @@
.left-activity {
height: 103px;
+ width: 1139px;
background-image: url("~@/assets/topic/topic_activity_gradient.jpg");
display: flex;
justify-content: left;
@@ -127,7 +134,7 @@
}
.left-card-other:hover {
- color: #369;
+ color: #a81c0c;
text-decoration: underline;
}
@@ -155,6 +162,7 @@
justify-content: center;
align-items: flex-end;
padding-bottom: 10px;
+ cursor: pointer;
.left-graceful-textbg {
height: 36px;
@@ -171,6 +179,11 @@
}
}
}
+
+ .left-graceful-bg:hover {
+ -webkit-filter: brightness(108%);
+ filter: brightness(108%);
+ }
}
.left-project {
@@ -195,7 +208,7 @@
}
.left-project-content-item-title:hover {
- color: #369;
+ color: #a81c0c;
text-decoration: underline;
}
@@ -266,7 +279,7 @@
letter-spacing: 1px;
.right-display-content-percentage {
- margin-left: 18px;
+ margin-left: 12px;
.right-display-content-percentage-increase {
color: #28e099;
@@ -367,7 +380,7 @@
}
.left-card-other:hover {
- color: #369;
+ color: #a81c0c;
text-decoration: underline;
}
@@ -399,11 +412,24 @@
.bottom-card-title {
font-size: 21px;
font-weight: bold;
-
- .bottom-card-title-type {
- color: #df3b37;
- }
+ width: 189px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
+
+ .bottom-card-title .bottom-card-title-type {
+ color: #df3b37;
+ }
+ }
+
+ .bottom-card-flex img {
+ cursor: pointer;
+ }
+
+ .bottom-card-flex img:hover {
+ -webkit-filter: brightness(108%);
+ filter: brightness(108%);
}
.bottom-card-content {
@@ -429,6 +455,12 @@
font-family: '黑体';
font-size: 18px;
color: #a2a2a2;
+ cursor: pointer;
+ }
+
+ .bottom-other-text:hover {
+ color: #a81c0c;
+ text-decoration: underline;
}
.bottom-other-icon {
diff --git a/src/pages/PartyMemberTopic/Home/index.tsx b/src/pages/PartyMemberTopic/Home/index.tsx
index 9715abe..a2f4014 100644
--- a/src/pages/PartyMemberTopic/Home/index.tsx
+++ b/src/pages/PartyMemberTopic/Home/index.tsx
@@ -1,6 +1,6 @@
import React, { useEffect, useRef, useState } from 'react';
import './index.less';
-import { Button, Carousel, Col, Divider, Input, List, message, Modal, Radio, RadioChangeEvent, Row, Spin } from 'antd';
+import { Button, Carousel, Col, Divider, Input, List, message, Modal, Radio, RadioChangeEvent, Row, Spin, Tooltip } from 'antd';
import * as echarts from 'echarts';
import Marquee from 'react-fast-marquee';
import topic_header from '@/assets/topic/topic_header.jpg'
@@ -17,6 +17,8 @@ import topic_totalnumber from '@/assets/topic/topic_totalnumber.png'
import topic_commodity from '@/assets/topic/topic_commodity.png'
import topic_protocol from '@/assets/topic/topic_protocol.png'
import topic_header_img from '@/assets/topic/topic_header_img.png'
+import topic_banner_default from '@/assets/topic/topic_banner_default.jpg'
+import topic_activity_default from '@/assets/topic/topic_activity_default.jpg'
import { getHomeActivity, getHomeBanner, getHomeContact, getHomeGraceful, getHomeProject, getHomeRight, submitAdvice } from './service';
import { formatTime, getImageUrl } from '../utils';
@@ -28,10 +30,10 @@ const LeftCardTop = (props: any) => {
{props.title}
- window.open(props.url)}>
+ {props.url &&
window.open(props.url)}>
更多

-
+
}
>
@@ -92,7 +94,7 @@ const RightGraphContent = (props: any) => {
data: props.data,
label: {
formatter: props.type != null ? `{b}\n\n{c}${props.type} {d}%` : '{b}',
- fontSize: 12,
+ fontSize: 14,
color: '#fff',
position: 'inner',
},
@@ -120,8 +122,11 @@ const BottomCardContent = (props: any) => {
- {props.data.contactName}
- ({props.data.contactName})
+
+ {props.data.contactName}
+ ({props.data.remark})
+
+

props.onClick()} />
@@ -208,9 +213,11 @@ const CommentModal = (props: any) => {