-
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
共创·共享·开放·共生,携手共创软件工厂新生态
{
contentList.map((item, index) => {
@@ -122,13 +126,15 @@ function Index(props) {
{project.name.split('/')[1]}
- {
+ {/* {
project.topics && project.topics.split(',').splice(0, 3).map((topic, index) => {
return (
{topic}
)
})
- }
+ } */}
+

+
捐赠者 { project.name.split('/')[0] }
{project.description}
@@ -167,12 +173,9 @@ function Index(props) {
{project.name.split('/')[1]}
- {
- project.description &&
- {project.description}
-
- }
-
+
+ {!project.description ? '暂无简介' : project.description}
+
{
project.topics && project.topics.split(',').splice(0, 3).map((topic, index) => {
diff --git a/src/factory/resource/softwareProject/index.scss b/src/factory/resource/softwareProject/index.scss
index c23c11a88..b70f766c7 100644
--- a/src/factory/resource/softwareProject/index.scss
+++ b/src/factory/resource/softwareProject/index.scss
@@ -18,6 +18,23 @@
border-radius: 16px;
cursor: pointer;
+ &::after {
+ position: absolute;
+ content: "精选";
+ top: 0;
+ right: 0;
+ width: 61px;
+ height: 31px;
+ background: linear-gradient(95.44deg, #ff7842 -3.46%, #ff431b 98.61%);
+ border-radius: 0px 16px 0px 16px;
+ text-align: center;
+ line-height: 31px;
+ font-family: alibaba;
+ font-weight: 500;
+ color: #ffffff;
+ font-size: 14px;
+ }
+
.item-bg {
width: 516px;
height: 230px;
@@ -47,6 +64,7 @@
display: flex;
flex-direction: column;
flex-grow: 1;
+ position: relative;
h5 {
line-height: 30px;
@@ -76,6 +94,32 @@
.item-bottom-tags {
display: flex;
justify-content: space-between;
+ align-items: center;
+
+
+ height: 32px;
+ background: rgba(255, 255, 255, 0.171);
+ border-radius: 4px;
+ padding: 5px 9px;
+ line-height: 22px;
+ font-family: alibabareg;
+ color: #ffffff;
+ font-size: 14px;
+
+ img {
+ width: 15px;
+ margin-right: 5px;
+ height: 15px;
+ }
+
+ div {
+ opacity: 0.5;
+ width: 6px;
+ height: 6px;
+ background: #ffffff;
+ border-radius: 50%;
+ margin: 0 6px;
+ }
.item-tag {
display: inline-block;
@@ -90,10 +134,11 @@
.item-bottom-data {
opacity: 0.85;
margin-left: auto;
+
span {
line-height: 18px;
font-family: alibabareg;
- color:#ffffff;
+ color: #ffffff;
font-size: 13px;
position: relative;
}
@@ -172,25 +217,6 @@
overflow: hidden;
}
- .item-tags {
- margin-top: 22px;
- display: flex;
- justify-content: flex-start;
-
- .item-tag {
- display: inline-block;
- padding: 0 8px;
- margin-right: 8px;
- height: 32px;
- background: rgba(22, 76, 228, 0.05);
- border-radius: 4px;
- line-height: 32px;
- font-family: alibabareg;
- color: #091221;
- font-size: 14px;
- }
- }
-
.item-data {
margin-top: auto;
@@ -268,6 +294,21 @@
flex-direction: column;
cursor: pointer;
+ &:nth-child(3),
+ &:nth-child(4) {
+ .item-tags {
+ border: none;
+ background: rgba(255, 255, 255, 0.84);
+
+ div {
+ opacity: 0.13;
+ width: 6px;
+ height: 6px;
+ background: #5d6a80;
+ }
+ }
+ }
+
div:nth-child(1) {
height: 100%;
display: flex;
@@ -283,6 +324,48 @@
z-index: -1;
}
+ .item-tags {
+ // position: absolute;
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 20px;
+ // top: 150px;
+ // line-height: 21px;
+ // font-family: alibabareg;
+ // color: #091221;
+ // font-size: 15px;
+ // display: -webkit-box;
+ // -webkit-line-clamp: 1;
+ // -webkit-box-orient: vertical;
+ // overflow: hidden;
+ width: fit-content;
+ background: rgba(179, 190, 252, 0.18);
+ border: 1px solid;
+ border-color: #ffffff;
+ border-radius: 4px;
+ height: 32px;
+ padding: 5px 9px;
+ line-height: 22px;
+ font-family: alibabareg;
+ color: #091221;
+ font-size: 13px;
+
+ img {
+ width: 15px;
+ margin-right: 5px;
+ height: 15px;
+ }
+
+ div {
+ width: 6px;
+ height: 6px;
+ background: #ffffff;
+ border-radius: 50%;
+ margin: 0 6px;
+ }
+ }
+
&:nth-child(2n+1) {
margin-right: 32px;
}
@@ -369,6 +452,21 @@
.item-tags {
margin-top: auto;
+ display: flex;
+ justify-content: flex-start;
+
+ .item-tag {
+ display: inline-block;
+ padding: 0 8px;
+ margin-right: 8px;
+ height: 32px;
+ background: rgba(22, 76, 228, 0.05);
+ border-radius: 4px;
+ line-height: 32px;
+ font-family: alibabareg;
+ color: #091221;
+ font-size: 14px;
+ }
}
}
diff --git a/src/images/factory/lessons/header-bg.png b/src/images/factory/lessons/header-bg.png
index 7fb352a01..d77f09360 100644
Binary files a/src/images/factory/lessons/header-bg.png and b/src/images/factory/lessons/header-bg.png differ
diff --git a/src/images/factory/resource/user1.png b/src/images/factory/resource/user1.png
new file mode 100644
index 000000000..eba5a7c08
Binary files /dev/null and b/src/images/factory/resource/user1.png differ
diff --git a/src/images/factory/resource/user2.png b/src/images/factory/resource/user2.png
new file mode 100644
index 000000000..330c54c6a
Binary files /dev/null and b/src/images/factory/resource/user2.png differ