diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 35355092..685580bb 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=1762825432985') format('woff2'), - url('iconfont.woff?t=1762825432985') format('woff'), - url('iconfont.ttf?t=1762825432985') format('truetype'); + src: url('iconfont.woff2?t=1764752922359') format('woff2'), + url('iconfont.woff?t=1764752922359') format('woff'), + url('iconfont.ttf?t=1764752922359') format('truetype'); } .iconfont { @@ -13,6 +13,22 @@ -moz-osx-font-smoothing: grayscale; } +.icon-hezuohuoban:before { + content: "\e9bf"; +} + +.icon-xiangmugongxian:before { + content: "\e9c1"; +} + +.icon-sijiaoxing:before { + content: "\e9c0"; +} + +.icon-a-zu15512:before { + content: "\e9be"; +} + .icon-wendangbangong-01:before { content: "\e9bd"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index fff49574..d2343dc4 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file +window._iconfont_svg_string_2340181='',(c=>{var a=(l=(l=document.getElementsByTagName("script"))[l.length-1]).getAttribute("data-injectcss"),l=l.getAttribute("data-disable-injectsvg");if(!l){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(a&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}})(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index cfe1eb79..6d72cb13 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,34 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "46248622", + "name": "合作伙伴", + "font_class": "hezuohuoban", + "unicode": "e9bf", + "unicode_decimal": 59839 + }, + { + "icon_id": "46248621", + "name": "项目贡献", + "font_class": "xiangmugongxian", + "unicode": "e9c1", + "unicode_decimal": 59841 + }, + { + "icon_id": "46245203", + "name": "四角星", + "font_class": "sijiaoxing", + "unicode": "e9c0", + "unicode_decimal": 59840 + }, + { + "icon_id": "46244977", + "name": "组 15512", + "font_class": "a-zu15512", + "unicode": "e9be", + "unicode_decimal": 59838 + }, { "icon_id": "46034062", "name": "文档办公-01", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index 0437f985..dc773c25 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 ac3ebbe9..40aa38a1 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 d02145ae..20a03128 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forge/Main/img/jiantou.svg b/src/forge/Main/img/jiantou.svg new file mode 100644 index 00000000..f2a757a2 --- /dev/null +++ b/src/forge/Main/img/jiantou.svg @@ -0,0 +1,56 @@ + + + icon_hoverarrow_black_48 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/forge/Main/projecthome/Index.jsx b/src/forge/Main/projecthome/Index.jsx index 92cc9e6d..75f2151f 100644 --- a/src/forge/Main/projecthome/Index.jsx +++ b/src/forge/Main/projecthome/Index.jsx @@ -19,9 +19,9 @@ function Index(props) {
- + {/* */} - +
) diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss index 1ed2551c..4173ddf2 100644 --- a/src/forge/Main/projecthome/Index.scss +++ b/src/forge/Main/projecthome/Index.scss @@ -23,4 +23,34 @@ color:#091221; } } + .btn-more { + font-family: alibaba; + color: #091221; + display: inline-block; + position: relative; + padding-right: 20px; // 为箭头留出空间 + + &::after { + content: ""; + position: absolute; + width: 2rem; + height: 2rem; + right: -5px; + top: 50%; + transform: translateY(-50%); + background-image: url('../img/jiantou.svg'); + background-size: 3.8rem 3.8rem; + background-position: right 0 top 0; + background-repeat: no-repeat; + transition: all .3s ease-out; + } + + &:hover { + color: #2752FF; + + &::after { + background-position: right -1.9rem top -1.9rem; + } + } + } } \ No newline at end of file diff --git a/src/forge/Main/projecthome/components/Chain.jsx b/src/forge/Main/projecthome/components/Chain.jsx index dac11bba..3df18d7f 100644 --- a/src/forge/Main/projecthome/components/Chain.jsx +++ b/src/forge/Main/projecthome/components/Chain.jsx @@ -18,9 +18,13 @@ const Item = [ ] function Chain(props) { + const {showLoginDialog, current_user, mygetHelmetapi} = props + const {navbar=[]} = mygetHelmetapi || {} const contentRef = useRef(null); const [isVisible, setIsVisible] = useState(false); + const supplyChainItem = navbar.find(item => item.name.includes('供应链')); + const supplyChainLink = supplyChainItem ? supplyChainItem.link : ''; useEffect(() => { const observer = new IntersectionObserver((entries) => { @@ -64,6 +68,15 @@ function Chain(props) { +
+ {supplyChainLink && { + if(current_user && !current_user.login){ + showLoginDialog(); + }else{ + current_user && window.open(`${supplyChainLink}`) + } + }}>查看更多} +
); } diff --git a/src/forge/Main/projecthome/components/Forum.jsx b/src/forge/Main/projecthome/components/Forum.jsx index b74c748b..c6811a92 100644 --- a/src/forge/Main/projecthome/components/Forum.jsx +++ b/src/forge/Main/projecthome/components/Forum.jsx @@ -19,6 +19,10 @@ const Item2 = [ ] function forum(props) { + const {showLoginDialog, current_user, mygetHelmetapi} = props + const {navbar=[]} = mygetHelmetapi || {} + const forumItem = navbar.find(item => item.name.includes('论坛交流')); + const forumLink = forumItem ? forumItem.link : ''; return (
@@ -48,6 +52,9 @@ function forum(props) { }) }
+
+ {forumLink && 查看更多} +
); } diff --git a/src/forge/Main/projecthome/components/index.scss b/src/forge/Main/projecthome/components/index.scss index b6c5b655..b6c53c59 100644 --- a/src/forge/Main/projecthome/components/index.scss +++ b/src/forge/Main/projecthome/components/index.scss @@ -624,7 +624,7 @@ width: 1600px; } .forum-content2 { - margin-bottom: 122px; + margin-bottom: 30px; width: 1600px; height: 160px; background-color: #ffffff;