diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 8d12689e..6a775266 100644 --- a/public/css/iconfont.css +++ b/public/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2340181 */ - src: url('iconfont.woff2?t=1620957611209') format('woff2'), - url('iconfont.woff?t=1620957611209') format('woff'), - url('iconfont.ttf?t=1620957611209') format('truetype'); + src: url('iconfont.woff2?t=1620981873232') format('woff2'), + url('iconfont.woff?t=1620981873232') format('woff'), + url('iconfont.ttf?t=1620981873232') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-arrowRight:before { + content: "\e863"; +} + .icon-jiantouloukong-zuo:before { content: "\e861"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 3be5869f..0b6bccc9 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -!function(c){var l,a,h,i,o,z,t='',p=(p=document.getElementsByTagName("script"))[p.length-1].getAttribute("data-injectcss");if(p&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function s(){o||(o=!0,h())}l=function(){var c,l,a;(a=document.createElement("div")).innerHTML=t,t=null,(l=a.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",c=l,(a=document.body).firstChild?(l=a.firstChild).parentNode.insertBefore(c,l):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,i=c.document,o=!1,(z=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(z,50)}s()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,s())})}(window); \ No newline at end of file +!function(c){var l,a,h,i,o,z,t='',p=(p=document.getElementsByTagName("script"))[p.length-1].getAttribute("data-injectcss");if(p&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function s(){o||(o=!0,h())}l=function(){var c,l,a;(a=document.createElement("div")).innerHTML=t,t=null,(l=a.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",c=l,(a=document.body).firstChild?(l=a.firstChild).parentNode.insertBefore(c,l):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(a=function(){document.removeEventListener("DOMContentLoaded",a,!1),l()},document.addEventListener("DOMContentLoaded",a,!1)):document.attachEvent&&(h=l,i=c.document,o=!1,(z=function(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(z,50)}s()})(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,s())})}(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index 85296fe3..71486b21 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "14835599", + "name": "右箭头", + "font_class": "arrowRight", + "unicode": "e863", + "unicode_decimal": 59491 + }, { "icon_id": "21151489", "name": "箭头镂空-左", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index c90e8299..fec1a595 100644 Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff index be3decff..1cf26b15 100644 Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2 index d8ca033f..4040fd6a 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/mulan/About/About.jsx b/src/mulan/About/About.jsx index dda8da15..73a1cf3d 100644 --- a/src/mulan/About/About.jsx +++ b/src/mulan/About/About.jsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import axios from 'axios'; import { Banner } from '../../forge/Component/layout'; +import { Skeleton } from 'antd'; function About(props){ @@ -22,7 +23,7 @@ function About(props){
关于我们
- {about && about.content} + {about ? about.content : }
) diff --git a/src/mulan/About/Index.scss b/src/mulan/About/Index.scss index 7f5c134e..51fe25ef 100644 --- a/src/mulan/About/Index.scss +++ b/src/mulan/About/Index.scss @@ -16,4 +16,39 @@ text-align: justify; padding:40px; } +} +.descTOC{ + padding:20px; + .descUl{ + text-indent: 0px; + margin-left: 20px; + padding-left: 0px; + li{ + list-style-type: disc; + margin-left:20px; + } + } + .descPerson{ + display: flex; + flex-wrap: wrap; + padding:10px 0px; + li{ + width: 33%; + display: flex; + align-items: center; + flex-direction: column; + justify-content: center; + padding:20px 0.16%; + img{ + margin-bottom: 15px; + height: 100px; + width: 100px; + border-radius: 50%; + cursor: default; + } + span.school{ + color: #888; + } + } + } } \ No newline at end of file diff --git a/src/mulan/About/TOC.jsx b/src/mulan/About/TOC.jsx index edfb0f5d..92d99f92 100644 --- a/src/mulan/About/TOC.jsx +++ b/src/mulan/About/TOC.jsx @@ -1,15 +1,67 @@ import React, { useEffect, useState } from 'react'; import axios from 'axios'; import { Banner } from '../../forge/Component/layout'; - +import { Skeleton } from 'antd'; +import RenderHtml from '../../components/render-html'; function TOC(props){ const [ data , setData ] = useState(undefined); + useEffect(()=>{ + getAbout(); + },[]) + + function getAbout(){ + const url = `/helps/toc.json`; + axios.get(url).then(result=>{ + if(result && result.data){ + setData(result.data.data); + } + }).catch(error=>{}) + } return(
木兰开源社区技术委员会 + { + data ? + + //
+ //
    主要为木兰开源社区旗下的开源项目提供技术指导，具体职责如下： + //
  • 对孵化项目进行批准及毕业审核；
    • + //
  • 促进项目“产学研用”之间的生态联系；
    • + //
  • 为项目提供国际化的视野与技术指导。
    • + //
+ //
    + //
  • + // + // 梅院士 + // 北京大学院士 + //
    • + //
  • + // + // 梅院士 + // 北京大学院士 + //
    • + //
  • + // + // 梅院士 + // 北京大学院士 + //
    • + //
  • + // + // 梅院士 + // 北京大学院士 + //
    • + //
  • + // + // 梅院士 + // 北京大学院士 + //
    • + //
+ //
+ : + }
) } diff --git a/src/mulan/Index.jsx b/src/mulan/Index.jsx index 880cf3b0..9cc0791b 100644 --- a/src/mulan/Index.jsx +++ b/src/mulan/Index.jsx @@ -19,6 +19,7 @@ function Index(props){ const [ recommand ,setRecommand ] =useState(undefined); const [ news ,setNews ] =useState(undefined); const [ activity ,setActivity ] =useState(undefined); + const [ newActivity ,setNewActivity ] =useState(undefined); const [ cooperatersMenus ,setCooperatersMenus ] =useState(undefined); const [ cooperatersMenusValue ,setCooperatersMenusValue ] =useState(undefined); const [ cooperaters ,setCooperaters ] =useState(undefined); @@ -31,6 +32,7 @@ function Index(props){ getActivity(); getCooperatersMenu(); getLectures(); + getNewActivity(); },[]) // 专家寄语 function getLectures(){ @@ -65,18 +67,29 @@ function Index(props){ function getNews(){ const url = `/topics.json`; axios.get(url,{ - params:{type:"activity"} + params:{topic_type:"activity"} }).then(result=>{ if(result && result.data){ setNews(result.data.data); } }).catch(error=>{}) } + // 最新动态 + function getNewActivity(){ + const url = `/topics.json`; + axios.get(url,{ + params:{topic_type:"moment"} + }).then(result=>{ + if(result && result.data){ + setNewActivity(result.data.data); + } + }).catch(error=>{}) + } // 开源资讯 function getActivity(){ const url = `/topics.json`; axios.get(url,{ - params:{type:"news"} + params:{topic_type:"news"} }).then(result=>{ if(result && result.data){ setActivity(result.data.data); @@ -212,6 +225,32 @@ function Index(props){ {/* 查看更多 */} + { + newActivity && newActivity.length > 0 && +
+
最新动态
+ +
+ } +
开源资讯
diff --git a/src/mulan/Index.scss b/src/mulan/Index.scss index e702e47a..4628e2ca 100644 --- a/src/mulan/Index.scss +++ b/src/mulan/Index.scss @@ -130,6 +130,57 @@ width: 1200px; margin:0px auto!important; } + +.newActivity{ + width: 1240px; + margin:40px auto; + display: flex; + align-items: center; + justify-content: center; + li{ + width: 280px; + margin:0px 30px; + background: #FFFFFF; + box-shadow: 0px 0px 8px 0px #F1F1F1; + &:hover{ + box-shadow: 0px 0px 40px 0px rgba(24, 144, 255, 0.3); + } + & >a img{ + max-height: 150px; + width: 100%; + } + .infobox{ + padding:20px; + .time{ + color:#666666; + height: 18px; + line-height: 18px; + display: block; + margin-bottom: 15px; + } + .name{ + color: #333; + font-size: 16px; + height: 20px; + line-height: 20px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .desc{ + line-height: 20px; + color: #666; + height: 100px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 5; + margin-bottom: 15px; + } + } + } +} .homeFooterUl{ display: flex; align-items: center;