diff --git a/public/css/iconfont.css b/public/css/iconfont.css
index 37a53c1c..3fd8ac41 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=1634881729644') format('woff2'),
- url('iconfont.woff?t=1634881729644') format('woff'),
- url('iconfont.ttf?t=1634881729644') format('truetype');
+ src: url('iconfont.woff2?t=1637029990193') format('woff2'),
+ url('iconfont.woff?t=1637029990193') format('woff'),
+ url('iconfont.ttf?t=1637029990193') format('truetype');
}
.iconfont {
@@ -13,6 +13,62 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-dingbu:before {
+ content: "\e8ee";
+}
+
+.icon-bangzhu1:before {
+ content: "\e8ef";
+}
+
+.icon-yijianfankui2:before {
+ content: "\e8f0";
+}
+
+.icon-fenxiang:before {
+ content: "\e8f1";
+}
+
+.icon-dizhi:before {
+ content: "\e8eb";
+}
+
+.icon-youxiang1:before {
+ content: "\e8ec";
+}
+
+.icon-dianhuaicon:before {
+ content: "\e8ed";
+}
+
+.icon-tianjiaicon:before {
+ content: "\e8e8";
+}
+
+.icon-lingshengicon:before {
+ content: "\e8ea";
+}
+
+.icon-gengduoicon:before {
+ content: "\e8e5";
+}
+
+.icon-shijianicon:before {
+ content: "\e8e7";
+}
+
+.icon-mimaicon:before {
+ content: "\e8e1";
+}
+
+.icon-gouicon:before {
+ content: "\e8e2";
+}
+
+.icon-zhankaiicon:before {
+ content: "\e8e3";
+}
+
.icon-wenjian7:before {
content: "\e8e0";
}
diff --git a/public/css/iconfont.js b/public/css/iconfont.js
index 0e23ffb8..c3ffbd0b 100644
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
@@ -1 +1 @@
-!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};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()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,i=c.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window);
\ No newline at end of file
+!function(c){var a,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(c,a){a.parentNode.insertBefore(c,a)};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()}a=function(){var c,a;(a=document.createElement("div")).innerHTML=z,z=null,(c=a.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",a=c,(c=document.body).firstChild?p(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),a()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=a,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 5acfb6e9..dce0defb 100644
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@@ -5,6 +5,104 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "25701947",
+ "name": "顶部",
+ "font_class": "dingbu",
+ "unicode": "e8ee",
+ "unicode_decimal": 59630
+ },
+ {
+ "icon_id": "25701948",
+ "name": "帮助",
+ "font_class": "bangzhu1",
+ "unicode": "e8ef",
+ "unicode_decimal": 59631
+ },
+ {
+ "icon_id": "25701949",
+ "name": "意见反馈",
+ "font_class": "yijianfankui2",
+ "unicode": "e8f0",
+ "unicode_decimal": 59632
+ },
+ {
+ "icon_id": "25701950",
+ "name": "分享",
+ "font_class": "fenxiang",
+ "unicode": "e8f1",
+ "unicode_decimal": 59633
+ },
+ {
+ "icon_id": "25580217",
+ "name": "地址",
+ "font_class": "dizhi",
+ "unicode": "e8eb",
+ "unicode_decimal": 59627
+ },
+ {
+ "icon_id": "25580218",
+ "name": "邮箱",
+ "font_class": "youxiang1",
+ "unicode": "e8ec",
+ "unicode_decimal": 59628
+ },
+ {
+ "icon_id": "25580219",
+ "name": "电话icon",
+ "font_class": "dianhuaicon",
+ "unicode": "e8ed",
+ "unicode_decimal": 59629
+ },
+ {
+ "icon_id": "25284174",
+ "name": "添加icon",
+ "font_class": "tianjiaicon",
+ "unicode": "e8e8",
+ "unicode_decimal": 59624
+ },
+ {
+ "icon_id": "25284175",
+ "name": "铃声icon",
+ "font_class": "lingshengicon",
+ "unicode": "e8ea",
+ "unicode_decimal": 59626
+ },
+ {
+ "icon_id": "25204490",
+ "name": "更多icon",
+ "font_class": "gengduoicon",
+ "unicode": "e8e5",
+ "unicode_decimal": 59621
+ },
+ {
+ "icon_id": "25204491",
+ "name": "时间icon",
+ "font_class": "shijianicon",
+ "unicode": "e8e7",
+ "unicode_decimal": 59623
+ },
+ {
+ "icon_id": "25188228",
+ "name": "密码icon",
+ "font_class": "mimaicon",
+ "unicode": "e8e1",
+ "unicode_decimal": 59617
+ },
+ {
+ "icon_id": "25188229",
+ "name": "钩icon",
+ "font_class": "gouicon",
+ "unicode": "e8e2",
+ "unicode_decimal": 59618
+ },
+ {
+ "icon_id": "25188230",
+ "name": "展开icon",
+ "font_class": "zhankaiicon",
+ "unicode": "e8e3",
+ "unicode_decimal": 59619
+ },
{
"icon_id": "24656750",
"name": "文件",
diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf
index 23055ead..19e9de07 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 5767eca9..52ea0542 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 1d83b46b..4de95633 100644
Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 6f515950..70c30f5a 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -313,17 +313,17 @@ li.ant-menu-item{
}
}
.-task-sidebar>div {
- height: 40px;
- line-height: 40px;
+ height: 48px;
+ line-height: 48px;
box-sizing: border-box;
- width: 40px;
+ width: 48px;
color: #999;
font-size: 20px;
text-align: center;
margin-bottom: 20px;
border-radius: 50%;
background: #FFFFFF;
- box-shadow: 0px 0px 10px 1px #F1F1F1;
+ box-shadow: 0px 0px 12px 5px rgba(208, 208, 208, 0.2);
}
.-task-sidebar>div i {
@@ -334,36 +334,40 @@ li.ant-menu-item{
color: #fff !important;
}
.-task-sidebar>div:hover{
- background: #1890FF;
+ background: #466AFF;
box-shadow: 0px 0px 10px 2px #B6D0FC;
}
.helpBox{
width: 260px;
z-index: 103;
&.shareContent{
- width: 200px;
+ width: 160px;
+ }
+ .ant-popover-title{
+ font-size: 16px;
}
.ant-popover-inner-content{
padding:0px;
}
p.titlecontent{
- font-size: 18px;
+ font-size: 16px;
color: #333;
line-height: 20px;
padding:15px 20px;
}
.faqUl{
- padding:0px 20px 10px;
+ padding:10px 15px;
max-height: 230px;
overflow-y: auto;
+ font-size: 13px;
li{
background: #F5F5F5;
border-radius: 20px;
- padding:0px 20px;
+ padding:0px 15px;
color: #333;
- height: 34px;
- line-height: 34px;
- margin-bottom: 10px!important;
+ height: 30px;
+ line-height: 30px;
+ margin-bottom: 3px !important;
a{
display: block;
overflow: hidden;
@@ -379,19 +383,18 @@ li.ant-menu-item{
}
}
.shareUl{
- padding:10px 0px;
display: flex;
align-items: center;
- .titlecontent{
- margin-right: 20px;
- }
li > i{
font-size: 32px!important;
}
}
}
-
-
+// tooltip样式
+.tooltipBox .ant-tooltip-inner{
+ padding: 8px 12px;
+ font-size: 15px;
+}
.-task-desc {
background: #494949;
diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js
index 3d6b8acf..f4d9979f 100644
--- a/src/forge/Component/SiderBar.js
+++ b/src/forge/Component/SiderBar.js
@@ -23,9 +23,13 @@ $(window).scroll(function () {
function SiderBar() {
const [ data , setData ] = useState([]);
const [ visible , setVisible ] = useState(false);
+ const [ login , setLogin ]= useState(false);
useEffect(()=>{
getFAQ();
+ getCurrentUser();
+ //页面加载完成之后隐藏回到顶点
+ $(".-task-sidebar .gotop").hide();
},[])
function getFAQ(){
@@ -36,9 +40,19 @@ function SiderBar() {
}
}).catch(error=>{})
}
+
+ //获取当前登录账号信息->用于建议反馈
+ function getCurrentUser(){
+ let url = `/users/get_user_info.json`;
+ axios.get(url).then((response) => {
+ if (response && response.data && response.data.login) {
+ setLogin(true);
+ }
+ }).catch(error=>{})
+ }
+
function content(list){
return
-
帮助
{
list && list.map((i,k)=>{
@@ -59,31 +73,55 @@ function SiderBar() {
-
setVisible(false)}/>
+ {/* 平台反馈 */}
+
+
+
+
+
+
+ {/* 帮助 */}
{
data && data.length > 0 && (data[0] && data[0].question) ?
-
+
-
+
:""
}
+
+ {/* 分享 */}
{/*
*/}
+ setVisible(false)}/>
-
+
-
+
打开微信“扫一扫”,点击右上角菜单，即可将网页分享至朋友圈
+ 打开微信“扫一扫”，点击右上角菜单，即可将网页分享至朋友圈
)
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.scss b/src/forge/SecuritySetting/notice/myNotice/Index.scss
index 8eab84c0..c7e011a3 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.scss
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.scss
@@ -40,24 +40,22 @@
border-bottom: 0px solid #e8e8e8;
}
- button{
- padding:0 5px;
- }
+ .but25{height: 32px; }
}
-button {
- color: #333333;
- background: #FAFBFC;
- border: 1px solid #D0D0D0;
- border-radius: 4px;
- height: 32px;
-}
-button:hover {
- background: #F3F4F6;
-}
-button:active {
- background: #EBECF0;
-}
+// button {
+// color: #333333;
+// background: #FAFBFC;
+// border: 1px solid #D0D0D0;
+// border-radius: 4px;
+// height: 32px;
+// }
+// button:hover {
+// background: #F3F4F6;
+// }
+// button:active {
+// background: #EBECF0;
+// }
.deleteBut{
color: #DF0002;
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 5d976b7d..a7873ecc 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -151,7 +151,6 @@ export function TPMIndexHOC(WrappedComponent) {
}
fetchUsers = () => {
- console.log(this.props.match)
if (this.props.match.path === "/") {
this.setState({
publicNav:true