diff --git a/public/css/iconfont.css b/public/css/iconfont.css index a349ccdf..d159ba5b 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=1778741577467') format('woff2'), - url('iconfont.woff?t=1778741577467') format('woff'), - url('iconfont.ttf?t=1778741577467') format('truetype'); + src: url('iconfont.woff2?t=1784688510240') format('woff2'), + url('iconfont.woff?t=1784688510240') format('woff'), + url('iconfont.ttf?t=1784688510240') format('truetype'); } .iconfont { @@ -13,10 +13,94 @@ -moz-osx-font-smoothing: grayscale; } -.icon-xiala5:before { +.icon-zhinengti:before { + content: "\ea0f"; +} + +.icon-a-fabu1:before { + content: "\ea0d"; +} + +.icon-a-search-ai6c9d7b621:before { + content: "\ea0e"; +} + +.icon-remenhuati:before { content: "\e9df"; } +.icon-chengguolingyu:before { + content: "\ea09"; +} + +.icon-chengguoleixing:before { + content: "\ea0a"; +} + +.icon-chengguolaiyuan:before { + content: "\ea0b"; +} + +.icon-zhinengzhushou:before { + content: "\ea08"; +} + +.icon-shine-search:before { + content: "\ea07"; +} + +.icon-zuojiantou3:before { + content: "\ea05"; +} + +.icon-youjiantou2:before { + content: "\ea06"; +} + +.icon-fanhuagongju:before { + content: "\ea02"; +} + +.icon-jingxuanxiangmu1:before { + content: "\ea03"; +} + +.icon-gengduo2:before { + content: "\ea04"; +} + +.icon-shengwuyiyao:before { + content: "\e9f5"; +} + +.icon-youjiantou1:before { + content: "\e9fa"; +} + +.icon-zuojiantou2:before { + content: "\e9fd"; +} + +.icon-daqihaiyanghuanjing:before { + content: "\e9fe"; +} + +.icon-tianwendiliwuli:before { + content: "\e9ff"; +} + +.icon-xinnengyuanxincailiao:before { + content: "\ea00"; +} + +.icon-gongyeshejizhizao:before { + content: "\ea01"; +} + +.icon-tiezi:before { + content: "\e9f4"; +} + .icon-yulan:before { content: "\e9f1"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index ec5ee434..0bb5f4b0 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 dec6613b..50128616 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -6,12 +6,159 @@ "description": "", "glyphs": [ { - "icon_id": "47540662", - "name": "下拉", - "font_class": "xiala5", + "icon_id": "48129347", + "name": "智能体", + "font_class": "zhinengti", + "unicode": "ea0f", + "unicode_decimal": 59919 + }, + { + "icon_id": "48114624", + "name": "发布 (1)", + "font_class": "a-fabu1", + "unicode": "ea0d", + "unicode_decimal": 59917 + }, + { + "icon_id": "48114623", + "name": "search-ai.6c9d7b62 (1)", + "font_class": "a-search-ai6c9d7b621", + "unicode": "ea0e", + "unicode_decimal": 59918 + }, + { + "icon_id": "48114629", + "name": "热门话题", + "font_class": "remenhuati", "unicode": "e9df", "unicode_decimal": 59871 }, + { + "icon_id": "47969738", + "name": "成果领域", + "font_class": "chengguolingyu", + "unicode": "ea09", + "unicode_decimal": 59913 + }, + { + "icon_id": "47969739", + "name": "成果类型", + "font_class": "chengguoleixing", + "unicode": "ea0a", + "unicode_decimal": 59914 + }, + { + "icon_id": "47969740", + "name": "成果来源", + "font_class": "chengguolaiyuan", + "unicode": "ea0b", + "unicode_decimal": 59915 + }, + { + "icon_id": "45990748", + "name": "智能助手", + "font_class": "zhinengzhushou", + "unicode": "ea08", + "unicode_decimal": 59912 + }, + { + "icon_id": "47826921", + "name": "shine-search", + "font_class": "shine-search", + "unicode": "ea07", + "unicode_decimal": 59911 + }, + { + "icon_id": "47798947", + "name": "左箭头", + "font_class": "zuojiantou3", + "unicode": "ea05", + "unicode_decimal": 59909 + }, + { + "icon_id": "47798946", + "name": "右箭头", + "font_class": "youjiantou2", + "unicode": "ea06", + "unicode_decimal": 59910 + }, + { + "icon_id": "47778051", + "name": "泛化工具", + "font_class": "fanhuagongju", + "unicode": "ea02", + "unicode_decimal": 59906 + }, + { + "icon_id": "47778050", + "name": "精选项目", + "font_class": "jingxuanxiangmu1", + "unicode": "ea03", + "unicode_decimal": 59907 + }, + { + "icon_id": "47778049", + "name": "更多", + "font_class": "gengduo2", + "unicode": "ea04", + "unicode_decimal": 59908 + }, + { + "icon_id": "47778058", + "name": "生物医药", + "font_class": "shengwuyiyao", + "unicode": "e9f5", + "unicode_decimal": 59893 + }, + { + "icon_id": "47778057", + "name": "右箭头", + "font_class": "youjiantou1", + "unicode": "e9fa", + "unicode_decimal": 59898 + }, + { + "icon_id": "47778056", + "name": "左箭头", + "font_class": "zuojiantou2", + "unicode": "e9fd", + "unicode_decimal": 59901 + }, + { + "icon_id": "47778052", + "name": "大气海洋环境", + "font_class": "daqihaiyanghuanjing", + "unicode": "e9fe", + "unicode_decimal": 59902 + }, + { + "icon_id": "47778055", + "name": "天文地理物理", + "font_class": "tianwendiliwuli", + "unicode": "e9ff", + "unicode_decimal": 59903 + }, + { + "icon_id": "47778054", + "name": "新能源新材料", + "font_class": "xinnengyuanxincailiao", + "unicode": "ea00", + "unicode_decimal": 59904 + }, + { + "icon_id": "47778053", + "name": "工业设计制造", + "font_class": "gongyeshejizhizao", + "unicode": "ea01", + "unicode_decimal": 59905 + }, + { + "icon_id": "47756092", + "name": "帖子", + "font_class": "tiezi", + "unicode": "e9f4", + "unicode_decimal": 59892 + }, { "icon_id": "47540661", "name": "预览", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index ceaaa825..e8b9ad37 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 48789468..da95c17b 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 c16fe7a0..c6e4a35d 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forums/api.js b/src/forums/api.js index b49e7ce5..2fa95117 100644 --- a/src/forums/api.js +++ b/src/forums/api.js @@ -123,4 +123,11 @@ export function deleteUserForums(id,is_apply) { is_apply } }); -} \ No newline at end of file +} + +export async function getForumHead(id) { + return fetch({ + url: `/api/memos/forum_memos_head/${id}.json`, + method: 'get', + }); +} diff --git a/src/forums/detail/index.jsx b/src/forums/detail/index.jsx index b0ad8c26..8450f65b 100644 --- a/src/forums/detail/index.jsx +++ b/src/forums/detail/index.jsx @@ -154,8 +154,6 @@ function detail(props) { } }) }}>{memo.is_fine ? "取消推荐" : "推荐"} - - {setVisible(1)}}>删除 } {(memo.is_current_user || banned_permission) && @@ -167,6 +165,8 @@ function detail(props) { setVisible(apply_destroy ? 3 : 2) }}>{apply_destroy ? "撤销申请" : "申请删帖"} } + + {banned_permission && {setVisible(1)}}>删除} } > diff --git a/src/forums/edit/index.jsx b/src/forums/edit/index.jsx index 132a9522..bd01a3a2 100644 --- a/src/forums/edit/index.jsx +++ b/src/forums/edit/index.jsx @@ -5,6 +5,7 @@ import { Divider, Form, Input, Cascader, Select, Breadcrumb, Upload, Button, Ico import RichEditor from '../../forge/Component/RichEditor'; import UploadImage from '../../forge/Team/Component/UploadImage'; import { httpUrl } from "../fetch"; +import cookie from 'react-cookies'; const { Option } = Select; function EditForum(props) { @@ -198,7 +199,7 @@ function EditForum(props) { {getFieldDecorator('attachments')( - +

@@ -210,7 +211,7 @@ function EditForum(props) {