diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 2f4d3b81..1c5f7663 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=1641524827252') format('woff2'), - url('iconfont.woff?t=1641524827252') format('woff'), - url('iconfont.ttf?t=1641524827252') format('truetype'); + src: url('iconfont.woff2?t=1642391410353') format('woff2'), + url('iconfont.woff?t=1642391410353') format('woff'), + url('iconfont.ttf?t=1642391410353') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-a-2:before { + content: "\e90f"; +} + +.icon-a-3:before { + content: "\e910"; +} + +.icon-icon1:before { + content: "\e911"; +} + .icon-ioon:before { content: "\e90e"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index 0fc1191c..1c1155b8 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -!function(a){var c,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(a,c){c.parentNode.insertBefore(a,c)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=z,z=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?p(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=c,i=a.document,o=!1,m(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,v())})}(window); \ No newline at end of file +!function(a){var c,l,h,i,o,z='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),p=function(a,c){c.parentNode.insertBefore(a,c)};if(t&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function v(){o||(o=!0,h())}function m(){try{i.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}c=function(){var a,c;(c=document.createElement("div")).innerHTML=z,z=null,(a=c.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",c=a,(a=document.body).firstChild?p(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(h=c,i=a.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 dfda7758..6b490b07 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,27 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "27200759", + "name": "2", + "font_class": "a-2", + "unicode": "e90f", + "unicode_decimal": 59663 + }, + { + "icon_id": "27200760", + "name": "3", + "font_class": "a-3", + "unicode": "e910", + "unicode_decimal": 59664 + }, + { + "icon_id": "27200761", + "name": "icon", + "font_class": "icon1", + "unicode": "e911", + "unicode_decimal": 59665 + }, { "icon_id": "27041503", "name": "ioon", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index 851a48ab..8a07e680 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 00f3b702..103bf096 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 eb68a204..1a18c743 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/military/expert/expertUser/index.jsx b/src/military/expert/expertUser/index.jsx index 1d5080ea..ed1e33e9 100644 --- a/src/military/expert/expertUser/index.jsx +++ b/src/military/expert/expertUser/index.jsx @@ -35,7 +35,7 @@ const ExpertUser = (propsF) => {
登记专家资料 - 我的评审任务 + {propsF.current_user.isExpert && 我的评审任务}
{ diff --git a/src/military/expert/expertUser/register/index.jsx b/src/military/expert/expertUser/register/index.jsx index 1a5eb180..558bf9b9 100644 --- a/src/military/expert/expertUser/register/index.jsx +++ b/src/military/expert/expertUser/register/index.jsx @@ -94,7 +94,10 @@ export default Form.create()(({ match, history, showNotification, form, current_ setHonorList(lastRegister.honorsAttachments); setHonorIds(lastRegister.honors); } - } else { + } else if(res && res.message=="未登录"){ + // history.push('/403'); + } + else { setForbidden(false); } }); diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx index 20351d8c..c8b11dfa 100644 --- a/src/military/task/components/itemListPaper/index.jsx +++ b/src/military/task/components/itemListPaper/index.jsx @@ -158,7 +158,7 @@ export default Form.create()((props) => { {timeAgo(item.createdAt)} {item.status === 2 ? 胜出 : {item.checkStatus !== 1 ? paperCheckStatus[item.checkStatus] : applyStatusAllNameArr[item.status]}} - {[5,6,7,8].includes(detailStatus) && item &&评审得分：{item.reviewFinalGrades}} + {[5,6,7,8].includes(detailStatus) && item.reviewFinalGrades!==null &&评审得分：{item.reviewFinalGrades}}
  • {((item.needComplain && detailStatus === 3) || (detailStatus === 5 && item.publicTaskComplain && item.checkStatus === 1 && item.status !== 2)) && (current_user.login === item.user.login) &&