diff --git a/public/css/iconfont.css b/public/css/iconfont.css
index a15df586f..faec9e742 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=1628841816999') format('woff2'),
- url('iconfont.woff?t=1628841816999') format('woff'),
- url('iconfont.ttf?t=1628841816999') format('truetype');
+ src: url('iconfont.woff2?t=1630894072659') format('woff2'),
+ url('iconfont.woff?t=1630894072659') format('woff'),
+ url('iconfont.ttf?t=1630894072659') format('truetype');
}
.iconfont {
@@ -13,6 +13,146 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-gerenziliao1:before {
+ content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+ content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+ content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+ content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+ content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+ content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+ content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+ content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+ content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+ content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+ content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+ content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+ content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+ content: "\e8cd";
+}
+
+.icon-gerenziliao:before {
+ content: "\e8c4";
+}
+
+.icon-xinshouzhiyin:before {
+ content: "\e8e4";
+}
+
+.icon-xinjianxiangmu:before {
+ content: "\e8e6";
+}
+
+.icon-jiaruketang1:before {
+ content: "\e8e9";
+}
+
+.icon-xiangmugonggao:before {
+ content: "\e8c2";
+}
+
+.icon-chengguo:before {
+ content: "\e8c3";
+}
+
+.icon-chengjiaogonggao:before {
+ content: "\e8c0";
+}
+
+.icon-jishuzichan:before {
+ content: "\e8c1";
+}
+
+.icon-feibiaogonggao:before {
+ content: "\e8bc";
+}
+
+.icon-zhongbiaogonggao:before {
+ content: "\e8bd";
+}
+
+.icon-gengzhenggonggao:before {
+ content: "\e8be";
+}
+
+.icon-zhaobiaogonggao:before {
+ content: "\e8bf";
+}
+
+.icon-wenjian6:before {
+ content: "\e8ba";
+}
+
+.icon-wenjianjia4:before {
+ content: "\e8bb";
+}
+
+.icon-quxiaoguanzhu:before {
+ content: "\e89a";
+}
+
+.icon-dianzan_icon:before {
+ content: "\e8a2";
+}
+
+.icon-wenjian5:before {
+ content: "\e896";
+}
+
+.icon-wenjianjia3:before {
+ content: "\e8a9";
+}
+
+.icon-fuzhiicon:before {
+ content: "\e886";
+}
+
+.icon-zhuye-fill:before {
+ content: "\e876";
+}
+
+.icon-daimakuicon:before {
+ content: "\e884";
+}
+
.icon-xinjian2:before {
content: "\e8b0";
}
@@ -29,22 +169,6 @@
content: "\e8a6";
}
-.icon-dianzan_icon:before {
- content: "\e8ba";
-}
-
-.icon-quxiaoguanzhu:before {
- content: "\e8bb";
-}
-
-.icon-daimakuicon:before {
- content: "\e8a9";
-}
-
-.icon-zhuyeicon:before {
- content: "\e884";
-}
-
.icon-biaoqianicon:before {
content: "\e882";
}
@@ -53,14 +177,6 @@
content: "\e883";
}
-.icon-cangkushezhiicon:before {
- content: "\e885";
-}
-
-.icon-fuzhiicon:before {
- content: "\e886";
-}
-
.icon-lianjieicon:before {
content: "\e887";
}
@@ -69,18 +185,6 @@
content: "\e888";
}
-.icon-lichengbeiicon:before {
- content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
- content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
- content: "\e88b";
-}
-
.icon-morendianzan_icon:before {
content: "\e88e";
}
@@ -93,10 +197,6 @@
content: "\e899";
}
-.icon-wenjian5:before {
- content: "\e89a";
-}
-
.icon-tijiaoicon:before {
content: "\e89e";
}
@@ -105,10 +205,6 @@
content: "\e89f";
}
-.icon-wenjianjia3:before {
- content: "\e8a2";
-}
-
.icon-xialaanniu1:before {
content: "\e8a4";
}
@@ -193,10 +289,6 @@
content: "\e898";
}
-.icon-weixuanzhongqingqiuicon:before {
- content: "\e89b";
-}
-
.icon-xiezuozheguanliicon:before {
content: "\e8a1";
}
@@ -241,10 +333,6 @@
content: "\e875";
}
-.icon-fuzhi_icon:before {
- content: "\e876";
-}
-
.icon-shanchuicon:before {
content: "\e877";
}
diff --git a/public/css/iconfont.js b/public/css/iconfont.js
index 94af421b3..2aaace214 100644
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
@@ -1 +1 @@
-!function(c){var l,a,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}l=function(){var c,l;(l=document.createElement("div")).innerHTML=z,z=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",l=c,(c=document.body).firstChild?p(l,c.firstChild):c.appendChild(l))},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,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
+!function(c){var l,a,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}v()}l=function(){var c,l;(l=document.createElement("div")).innerHTML=z,z=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",l=c,(c=document.body).firstChild?p(l,c.firstChild):c.appendChild(l))},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,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
\ No newline at end of file
diff --git a/public/css/iconfont.json b/public/css/iconfont.json
index 7f25b322f..e78a264c5 100644
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@@ -5,6 +5,251 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "24059956",
+ "name": "个人资料",
+ "font_class": "gerenziliao1",
+ "unicode": "e8c7",
+ "unicode_decimal": 59591
+ },
+ {
+ "icon_id": "24059409",
+ "name": "里程碑icon",
+ "font_class": "lichengbeiicon",
+ "unicode": "e885",
+ "unicode_decimal": 59525
+ },
+ {
+ "icon_id": "24059410",
+ "name": "仓库设置icon",
+ "font_class": "cangkushezhiicon",
+ "unicode": "e889",
+ "unicode_decimal": 59529
+ },
+ {
+ "icon_id": "24059411",
+ "name": "动态icon",
+ "font_class": "dongtaiicon",
+ "unicode": "e88a",
+ "unicode_decimal": 59530
+ },
+ {
+ "icon_id": "24059412",
+ "name": "工作流icon",
+ "font_class": "gongzuoliuicon",
+ "unicode": "e88b",
+ "unicode_decimal": 59531
+ },
+ {
+ "icon_id": "24059413",
+ "name": "易修icon",
+ "font_class": "yixiuicon1",
+ "unicode": "e89b",
+ "unicode_decimal": 59547
+ },
+ {
+ "icon_id": "24059414",
+ "name": "wiki icon",
+ "font_class": "a-wikiicon1",
+ "unicode": "e8c6",
+ "unicode_decimal": 59590
+ },
+ {
+ "icon_id": "24047186",
+ "name": "代码库icon",
+ "font_class": "daimakuicon1",
+ "unicode": "e8c5",
+ "unicode_decimal": 59589
+ },
+ {
+ "icon_id": "24047189",
+ "name": "我的通知",
+ "font_class": "wodetongzhi",
+ "unicode": "e8c8",
+ "unicode_decimal": 59592
+ },
+ {
+ "icon_id": "24047190",
+ "name": "通知管理",
+ "font_class": "tongzhiguanli",
+ "unicode": "e8c9",
+ "unicode_decimal": 59593
+ },
+ {
+ "icon_id": "24047191",
+ "name": "选中",
+ "font_class": "xuanzhong3",
+ "unicode": "e8ca",
+ "unicode_decimal": 59594
+ },
+ {
+ "icon_id": "24047192",
+ "name": "系统通知icon",
+ "font_class": "xitongtongzhiicon",
+ "unicode": "e8cb",
+ "unicode_decimal": 59595
+ },
+ {
+ "icon_id": "24047193",
+ "name": "消息",
+ "font_class": "xiaoxi2",
+ "unicode": "e8cc",
+ "unicode_decimal": 59596
+ },
+ {
+ "icon_id": "24047194",
+ "name": "ssh密钥",
+ "font_class": "sshmiyue",
+ "unicode": "e8cd",
+ "unicode_decimal": 59597
+ },
+ {
+ "icon_id": "24014152",
+ "name": "个人资料",
+ "font_class": "gerenziliao",
+ "unicode": "e8c4",
+ "unicode_decimal": 59588
+ },
+ {
+ "icon_id": "23655968",
+ "name": "新手指引",
+ "font_class": "xinshouzhiyin",
+ "unicode": "e8e4",
+ "unicode_decimal": 59620
+ },
+ {
+ "icon_id": "23655969",
+ "name": "新建项目",
+ "font_class": "xinjianxiangmu",
+ "unicode": "e8e6",
+ "unicode_decimal": 59622
+ },
+ {
+ "icon_id": "23658111",
+ "name": "加入课堂",
+ "font_class": "jiaruketang1",
+ "unicode": "e8e9",
+ "unicode_decimal": 59625
+ },
+ {
+ "icon_id": "23791639",
+ "name": "项目公告",
+ "font_class": "xiangmugonggao",
+ "unicode": "e8c2",
+ "unicode_decimal": 59586
+ },
+ {
+ "icon_id": "23791640",
+ "name": "成果",
+ "font_class": "chengguo",
+ "unicode": "e8c3",
+ "unicode_decimal": 59587
+ },
+ {
+ "icon_id": "23791410",
+ "name": "成交公告",
+ "font_class": "chengjiaogonggao",
+ "unicode": "e8c0",
+ "unicode_decimal": 59584
+ },
+ {
+ "icon_id": "23791411",
+ "name": "技术资产",
+ "font_class": "jishuzichan",
+ "unicode": "e8c1",
+ "unicode_decimal": 59585
+ },
+ {
+ "icon_id": "23790928",
+ "name": "废标公告",
+ "font_class": "feibiaogonggao",
+ "unicode": "e8bc",
+ "unicode_decimal": 59580
+ },
+ {
+ "icon_id": "23790929",
+ "name": "中标公告",
+ "font_class": "zhongbiaogonggao",
+ "unicode": "e8bd",
+ "unicode_decimal": 59581
+ },
+ {
+ "icon_id": "23790930",
+ "name": "更正公告",
+ "font_class": "gengzhenggonggao",
+ "unicode": "e8be",
+ "unicode_decimal": 59582
+ },
+ {
+ "icon_id": "23790931",
+ "name": "招标公告",
+ "font_class": "zhaobiaogonggao",
+ "unicode": "e8bf",
+ "unicode_decimal": 59583
+ },
+ {
+ "icon_id": "23732532",
+ "name": "文件",
+ "font_class": "wenjian6",
+ "unicode": "e8ba",
+ "unicode_decimal": 59578
+ },
+ {
+ "icon_id": "23732533",
+ "name": "文件夹",
+ "font_class": "wenjianjia4",
+ "unicode": "e8bb",
+ "unicode_decimal": 59579
+ },
+ {
+ "icon_id": "23642443",
+ "name": "取消关注",
+ "font_class": "quxiaoguanzhu",
+ "unicode": "e89a",
+ "unicode_decimal": 59546
+ },
+ {
+ "icon_id": "23642444",
+ "name": "点赞_icon",
+ "font_class": "dianzan_icon",
+ "unicode": "e8a2",
+ "unicode_decimal": 59554
+ },
+ {
+ "icon_id": "23639530",
+ "name": "文件",
+ "font_class": "wenjian5",
+ "unicode": "e896",
+ "unicode_decimal": 59542
+ },
+ {
+ "icon_id": "23639533",
+ "name": "文件夹",
+ "font_class": "wenjianjia3",
+ "unicode": "e8a9",
+ "unicode_decimal": 59561
+ },
+ {
+ "icon_id": "23639440",
+ "name": "复制icon",
+ "font_class": "fuzhiicon",
+ "unicode": "e886",
+ "unicode_decimal": 59526
+ },
+ {
+ "icon_id": "23639422",
+ "name": "主页-fill",
+ "font_class": "zhuye-fill",
+ "unicode": "e876",
+ "unicode_decimal": 59510
+ },
+ {
+ "icon_id": "23639423",
+ "name": "代码库icon",
+ "font_class": "daimakuicon",
+ "unicode": "e884",
+ "unicode_decimal": 59524
+ },
{
"icon_id": "23572260",
"name": "新建",
@@ -33,34 +278,6 @@
"unicode": "e8a6",
"unicode_decimal": 59558
},
- {
- "icon_id": "23492900",
- "name": "点赞_icon",
- "font_class": "dianzan_icon",
- "unicode": "e8ba",
- "unicode_decimal": 59578
- },
- {
- "icon_id": "23492901",
- "name": "取消关注",
- "font_class": "quxiaoguanzhu",
- "unicode": "e8bb",
- "unicode_decimal": 59579
- },
- {
- "icon_id": "23473151",
- "name": "代码库icon",
- "font_class": "daimakuicon",
- "unicode": "e8a9",
- "unicode_decimal": 59561
- },
- {
- "icon_id": "23473104",
- "name": "主页icon",
- "font_class": "zhuyeicon",
- "unicode": "e884",
- "unicode_decimal": 59524
- },
{
"icon_id": "23472253",
"name": "标签icon",
@@ -75,20 +292,6 @@
"unicode": "e883",
"unicode_decimal": 59523
},
- {
- "icon_id": "23472256",
- "name": "仓库设置icon",
- "font_class": "cangkushezhiicon",
- "unicode": "e885",
- "unicode_decimal": 59525
- },
- {
- "icon_id": "23472257",
- "name": "复制icon",
- "font_class": "fuzhiicon",
- "unicode": "e886",
- "unicode_decimal": 59526
- },
{
"icon_id": "23472258",
"name": "链接icon",
@@ -103,27 +306,6 @@
"unicode": "e888",
"unicode_decimal": 59528
},
- {
- "icon_id": "23472260",
- "name": "里程碑icon",
- "font_class": "lichengbeiicon",
- "unicode": "e889",
- "unicode_decimal": 59529
- },
- {
- "icon_id": "23472261",
- "name": "工作流icon",
- "font_class": "gongzuoliuicon",
- "unicode": "e88a",
- "unicode_decimal": 59530
- },
- {
- "icon_id": "23472262",
- "name": "动态icon",
- "font_class": "dongtaiicon",
- "unicode": "e88b",
- "unicode_decimal": 59531
- },
{
"icon_id": "23472263",
"name": "默认点赞_icon",
@@ -145,13 +327,6 @@
"unicode": "e899",
"unicode_decimal": 59545
},
- {
- "icon_id": "23472268",
- "name": "文件",
- "font_class": "wenjian5",
- "unicode": "e89a",
- "unicode_decimal": 59546
- },
{
"icon_id": "23472269",
"name": "提交icon",
@@ -166,13 +341,6 @@
"unicode": "e89f",
"unicode_decimal": 59551
},
- {
- "icon_id": "23472271",
- "name": "文件夹",
- "font_class": "wenjianjia3",
- "unicode": "e8a2",
- "unicode_decimal": 59554
- },
{
"icon_id": "23472272",
"name": "下拉按钮",
@@ -320,13 +488,6 @@
"unicode": "e898",
"unicode_decimal": 59544
},
- {
- "icon_id": "23144155",
- "name": "未选中请求icon",
- "font_class": "weixuanzhongqingqiuicon",
- "unicode": "e89b",
- "unicode_decimal": 59547
- },
{
"icon_id": "23144158",
"name": "协作者管理icon",
@@ -404,13 +565,6 @@
"unicode": "e875",
"unicode_decimal": 59509
},
- {
- "icon_id": "23046262",
- "name": "复制_icon",
- "font_class": "fuzhi_icon",
- "unicode": "e876",
- "unicode_decimal": 59510
- },
{
"icon_id": "23046268",
"name": "删除icon",
diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf
index 484348baf..540ea67c8 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 bfdd0b9cb..9cfd717c5 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 386dde005..61674c67c 100644
Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 7364ebd38..262de738e 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
import AccountProfile from "../../modules/user/AccountProfile";
import { getImageUrl } from 'educoder'
import axios from 'axios';
-import { Input , notification , Dropdown , Menu } from 'antd';
+import { Input , notification , Dropdown , Menu,Badge, Button } from 'antd';
import { Link } from 'react-router-dom';
import LoginDialog from '../../modules/login/LoginDialog';
@@ -240,6 +240,26 @@ class NewHeader extends Component {
)
}
+
+ messageList=()=>{
+ return(
+
+
+
+ aaa
+
+
+
{current_user && current_user.username}