update 冲突

src/forge/Component/SiderBar.js

@@ -105,65 +105,10 @@ function SiderBar(props) {
 
   return (
     <div className={"-task-sidebar"} >
-<<<<<<< HEAD
-      {/* 平台反馈 */}
-      <Tooltip title="意见反馈" placement={"left"} overlayClassName="tooltipBox">
-        <div className="consult" onClick={feedBackClick} style={{cursor: 'pointer'}}>
-          {/* <a href={login ? `/Gitlink/forgeplus/issues/new?type=feedback`:`/login?go_page=/Gitlink/forgeplus/issues/new?type=feedback`}> */}
-            <i className="iconfont icon-yijianfankui2"></i>
-          {/* </a> */}
-        </div>
-      </Tooltip>
-
-      {/* 帮助 */}
-      {
-        data && data.length > 0 && (data[0] && data[0].question) ? 
-        <Popover title="帮助" content={content(data)} overlayClassName="helpBox" placement={"left"}>
-          <div className="feedback">
-            <i className="iconfont icon-bangzhu1 font-22"></i>
-          </div>
-        </Popover>
-        :""
-      }
-
-      {/* 分享 */}
-      {/* <div className="scan pr" title="微信扫一扫">
-        <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
-      </div>*/}
-      <ShareModal visible={visible} urlValue={window.location.href} onCancel={()=>setVisible(false)}/>
-      <Popover content={shareContent()} overlayClassName="helpBox shareContent" placement={"left"}>
-        <div className="consult">
-          <i className="iconfont icon-fenxiang"></i>
-        </div> 
-      </Popover>
-
-      {/* 返回顶部 */}
-      <Tooltip title="返回顶部" placement={"left"} overlayClassName="tooltipBox">
-        <div className="gotop">
-          <a><i className="iconfont icon-huidaodingbu1"></i></a>
-        </div>
-      </Tooltip>
-
-      <Modal
-        width={610}
-        className='feedBackModal'
-        visible={feedBackModal}
-        onCancel={()=>{setFeedBackModal(false); history.push(pathname)}}
-        title={'意见反馈'}
-        footer={<Button type='primary' style={{width: '300px', height: '36px'}} onClick={applyFeedBack}>提交</Button>}>
-          <div className='feedBackBox'>
-            <Input.TextArea autoSize={{minRows: 9}} placeholder='请在此处填写您的宝贵意见，若经采纳，我们将通过邮件与您沟通' className={`feedBackText ${failApply ? 'errorInput' : ''}`} maxLength={500} value={feedBackValue} onChange={(e)=>{setFeedBackValue(e.target.value); e.target.value && e.target.value.length && setFailApply(undefined);}}/>
-            <span className='countNumBox'>{(feedBackValue && feedBackValue.length) || 0}/500</span>
-          </div>
-          {failApply && <div className='mt10' style={{color: '#f60011'}}>{failApply}</div>}
-          <div className='mt15 font-15 pln'>若需上传截图，请<a onClick={()=>{setFeedBackModal(false); history.push('/Gitlink/forgeplus/issues/new?type=feedback')}} className='gotoIssueFeedBack'>点击此处</a>留言</div>
-      </Modal>
-=======
       <div className='manual font-17' onClick={()=>{window.location.href="https://help.gitlink.org.cn"}}>
         <i className="iconfont icon-a-22ziliaoshouce-xianxing font-20 mb5"></i>
         使用手册
       </div>
->>>>>>> d906a87238315d1c93e9aff3d56a9cab148962a1
     </div>
   )
 }