Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev

# Conflicts: # public/css/iconfont.css # public/css/iconfont.js # public/css/iconfont.json # src/forge/Component/Contributors.jsx # src/forge/Component/Releases.jsx # src/forge/Main/CoderDepot.jsx # src/forge/Main/Detail.js # src/forge/Main/sub/DetailBanner.jsx
Merge pull request 'FIX 合并 featrue_router' (#46 ) from feature_router into pre_develop_dev
2021-09-06 17:15:24 +08:00 · 2021-09-03 18:01:09 +08:00 · 2021-09-03 17:57:01 +08:00 · 2021-09-03 17:46:49 +08:00 · 2021-09-03 17:18:20 +08:00 · 2021-09-03 17:14:45 +08:00
238 changed files with 5710 additions and 3585 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -1,918 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="AutoImportSettings">
    <option name="autoReloadType" value="SELECTIVE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="色值修改">
      <change beforePath="$PROJECT_DIR$/src/forge/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Component/Component.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Component.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Main/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Main/sub/sub.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/sub/sub.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/Index.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/forge/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/css/index.css" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="DatabaseView">
    <option name="SHOW_INTERMEDIATE" value="true" />
    <option name="GROUP_DATA_SOURCES" value="true" />
    <option name="GROUP_SCHEMA" value="true" />
    <option name="GROUP_CONTENTS" value="false" />
    <option name="SORT_POSITIONED" value="false" />
    <option name="SHOW_EMPTY_GROUPS" value="false" />
    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
    <option name="HIDDEN_KINDS">
      <set />
    </option>
    <expand />
    <select />
  </component>
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/App.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="12376">
              <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="1989">
              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
              <folding>
                <element signature="e#0#26#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="1564">
              <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
              <folding>
                <element signature="e#0#40#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="4097">
              <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
              <folding>
                <element signature="e#0#40#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="2431">
              <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
              <folding>
                <element signature="e#0#42#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/.gitignore">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="765">
              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="306">
              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
              <folding>
                <element signature="e#0#40#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="14127">
              <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
              <folding>
                <element signature="e#0#40#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="4726">
              <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
              <folding>
                <element signature="e#0#40#0" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
  <component name="FindInProjectRecents">
    <findStrings>
      <find>high</find>
      <find>markdown</find>
      <find>markdown-body</find>
      <find>readme</find>
      <find>SSH</find>
      <find>clone</find>
      <find>edu_pu</find>
      <find>edu_</find>
      <find>.str</find>
      <find>ssh</find>
      <find>/projects</find>
      <find>全部项目数</find>
      <find>未选择标签</find>
      <find>未选择里程碑</find>
      <find>.issueItem</find>
      <find>未选择</find>
      <find>issueItem</find>
      <find>detailContent</find>
      <find>df mt20</find>
      <find>.detailHeader-wrapper</find>
      <find>headerMenu-wrapper</find>
      <find>对话</find>
      <find>issueNo</find>
      <find>f-wrap-between</find>
      <find>user_img</find>
      <find>getCommitList</find>
      <find>login</find>
      <find>点击开启</find>
      <find>build</find>
      <find>HEAD</find>
    </findStrings>
    <replaceStrings>
      <replace>任务</replace>
    </replaceStrings>
    <dirStrings>
      <dir>$PROJECT_DIR$/src/forge/Merge</dir>
      <dir>$PROJECT_DIR$</dir>
      <dir>$PROJECT_DIR$/public</dir>
      <dir>$PROJECT_DIR$/src/modules/user/usersInfo</dir>
      <dir>$PROJECT_DIR$/src/modules/user</dir>
      <dir>$PROJECT_DIR$/src/forge</dir>
      <dir>$PROJECT_DIR$/src</dir>
      <dir>$PROJECT_DIR$/</dir>
    </dirStrings>
  </component>
  <component name="Git.Settings">
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  </component>
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
        <option value="$PROJECT_DIR$/src/forge/Settings/Index.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
        <option value="$PROJECT_DIR$/src/forge/Settings/new_tags.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
        <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
        <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
        <option value="$PROJECT_DIR$/src/forge/Index.js" />
        <option value="$PROJECT_DIR$/src/modules/user/Projects.js" />
        <option value="$PROJECT_DIR$/src/App.js" />
        <option value="$PROJECT_DIR$/.gitignore" />
        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" />
        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" />
        <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
        <option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
        <option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
        <option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
        <option value="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" />
        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
        <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
        <option value="$PROJECT_DIR$/src/AppConfig.js" />
        <option value="$PROJECT_DIR$/src/forge/quillForEditor/index.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
        <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
        <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
        <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
        <option value="$PROJECT_DIR$/public/index.html" />
        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/order.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
      </list>
    </option>
  </component>
  <component name="ProjectFrameBounds" fullScreen="true">
    <option name="width" value="1440" />
    <option name="height" value="900" />
  </component>
  <component name="ProjectId" id="1xHteQnKsYu4IEUm8tEsYIEEC5E" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
              <item name="build" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="Scope" />
    </panes>
  </component>
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/forge/Main" />
    <property name="node.js.detected.package.eslint" value="true" />
    <property name="node.js.path.for.package.eslint" value="project" />
    <property name="node.js.path.for.package.tslint" value="project" />
    <property name="node.js.selected.package.eslint" value="E:\file\forgeplus-react\node_modules\eslint" />
    <property name="node.js.selected.package.tslint" value="(autodetect)" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
    <property name="nodejs_package_manager_path" value="npm" />
    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
    <property name="vue.rearranger.settings.migration" value="true" />
  </component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="E:\file\forgeplus-react\src\forge\Main" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$" />
      <recent name="$PROJECT_DIR$/src/modules/user/usersInfo" />
      <recent name="$PROJECT_DIR$/build" />
      <recent name="$PROJECT_DIR$/src/forge/Images" />
    </key>
  </component>
  <component name="RubyModuleManagerSettings">
    <option name="blackListedRootsPaths">
      <list>
        <option value="$PROJECT_DIR$" />
      </list>
    </option>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
      <changelist id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" />
      <created>1584692398144</created>
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1584692398144</updated>
      <workItem from="1584692401543" duration="6228000" />
      <workItem from="1585015135223" duration="21118000" />
      <workItem from="1585194891947" duration="1630000" />
      <workItem from="1585210651078" duration="1600000" />
      <workItem from="1585217705353" duration="104000" />
      <workItem from="1585217834609" duration="4000" />
      <workItem from="1585217980103" duration="3406000" />
      <workItem from="1585288258489" duration="17495000" />
      <workItem from="1585732642767" duration="11458000" />
      <workItem from="1585817691582" duration="2125000" />
      <workItem from="1585900267463" duration="136000" />
      <workItem from="1585902299727" duration="2113000" />
      <workItem from="1586153685130" duration="10062000" />
      <workItem from="1586245827209" duration="1692000" />
      <workItem from="1586330226261" duration="658000" />
      <workItem from="1586400014081" duration="18358000" />
      <workItem from="1586517058808" duration="1607000" />
      <workItem from="1586741565210" duration="25216000" />
      <workItem from="1586946208505" duration="2914000" />
      <workItem from="1587004932342" duration="7698000" />
      <workItem from="1587020811560" duration="543000" />
      <workItem from="1587021467416" duration="8000" />
      <workItem from="1587022017639" duration="2902000" />
      <workItem from="1587047814589" duration="8239000" />
      <workItem from="1587117033332" duration="611000" />
      <workItem from="1587362728834" duration="185000" />
      <workItem from="1587374749323" duration="458000" />
      <workItem from="1587375511570" duration="1067000" />
      <workItem from="1587376696494" duration="11000" />
      <workItem from="1587376745950" duration="14824000" />
      <workItem from="1587452961769" duration="4499000" />
      <workItem from="1587534020999" duration="19518000" />
      <workItem from="1587863258736" duration="1097000" />
      <workItem from="1587864581358" duration="777000" />
      <workItem from="1587870344748" duration="138000" />
      <workItem from="1587882941476" duration="4365000" />
      <workItem from="1587891008299" duration="390000" />
      <workItem from="1630023942152" duration="459000" />
      <workItem from="1630024424307" duration="17223000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="206113000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
    <layout>
      <window_info content_ui="combo" id="Project" order="0" weight="0.20243205" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Favorites" order="2" side_tool="true" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="bottom" id="TODO" order="6" />
      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
      <window_info anchor="bottom" id="Database Changes" order="8" />
      <window_info anchor="bottom" id="Version Control" order="9" sideWeight="0.49928468" weight="0.5638554" />
      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.44457832" />
      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5007153" side_tool="true" weight="0.713253" />
      <window_info anchor="bottom" id="TypeScript" order="12" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
      <window_info anchor="right" id="Database" order="3" />
    </layout>
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
  <component name="Vcs.Log.History.Properties">
    <option name="COLUMN_ORDER">
      <list>
        <option value="0" />
        <option value="2" />
        <option value="3" />
        <option value="1" />
      </list>
    </option>
  </component>
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State />
          </value>
        </entry>
      </map>
    </option>
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
    <option name="oldMeFiltersMigrated" value="true" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="javascript">
          <url>file://$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx</url>
          <line>409</line>
          <properties lambdaOrdinal="-1" />
          <option name="timeStamp" value="1" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="7973">
          <caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="714">
          <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
          <folding>
            <element signature="e#0#41#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/NullData.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="443">
          <caret line="63" column="23" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="23" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="194">
          <caret line="216" column="38" selection-start-line="216" selection-start-column="33" selection-end-line="216" selection-end-column="38" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="311">
          <caret line="58" column="38" selection-start-line="58" selection-start-column="38" selection-end-line="58" selection-end-column="38" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/login/Trialapplication.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="251">
          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
          <folding>
            <element signature="e#0#39#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1190">
          <caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
          <folding>
            <element signature="e#0#39#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="12104">
          <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="2584">
          <caret line="162" selection-start-line="162" selection-end-line="162" />
          <folding>
            <element signature="e#0#39#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="289">
          <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="161">
          <caret line="28" column="49" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
          <folding>
            <element signature="e#0#39#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/build/css/edu-all.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="221">
          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/courses/busyWork/ConnectProject.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="335">
          <caret line="61" column="24" selection-start-line="61" selection-start-column="24" selection-end-line="61" selection-end-column="24" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/node_modules/@types/react/index.d.ts">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="204">
          <caret line="446" column="8" selection-start-line="446" selection-start-column="8" selection-end-line="446" selection-end-column="8" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="204">
          <caret line="1181" column="72" lean-forward="true" selection-start-line="1181" selection-start-column="40" selection-end-line="1181" selection-end-column="72" />
          <folding>
            <element signature="e#0#41#0" expanded="true" />
            <element signature="e#433#515#0" expanded="true" />
            <element signature="e#1358#2042#0" />
            <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
            <element signature="e#2353#2665#0" />
            <element signature="e#2760#2816#0" />
            <element signature="e#2954#2960#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="43" column="50" selection-start-line="43" selection-start-column="50" selection-end-line="43" selection-end-column="50" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="86">
          <caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
          <folding>
            <element signature="e#0#38#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/quillForEditor/index.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="287">
          <caret line="45" column="10" lean-forward="true" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
          <folding>
            <element signature="n#!!doc" expanded="true" />
            <element signature="e#166#188#0" expanded="true" />
            <element signature="e#373#392#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="680">
          <caret line="40" column="16" selection-start-line="40" selection-start-column="16" selection-end-line="40" selection-end-column="16" />
          <folding>
            <element signature="e#0#41#0" expanded="true" />
            <element signature="e#4148#5191#0" />
            <element signature="e#5202#6120#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="175">
          <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="28" selection-end-column="19" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Activity/ActivityItem.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="217">
          <caret line="42" column="18" lean-forward="true" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/js/index.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="188">
          <caret line="2068" column="17" selection-start-line="2068" selection-start-column="17" selection-end-line="2068" selection-end-column="17" />
          <folding>
            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="282">
          <caret line="204" column="12" selection-start-line="204" selection-start-column="12" selection-end-line="206" selection-end-column="19" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
            <element signature="e#8046#8546#0" />
            <element signature="e#8575#9036#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-984">
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/react.d.ts">
      <provider selected="true" editor-type-id="text-editor">
        <state>
          <caret line="927" column="16" lean-forward="true" selection-start-line="927" selection-start-column="16" selection-end-line="927" selection-end-column="16" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="170">
          <caret line="10" column="26" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/App.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1050">
          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="130">
          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="505">
          <caret line="110" column="75" selection-start-line="110" selection-start-column="75" selection-end-line="110" selection-end-column="75" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/common/TextUtil.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="204">
          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/public/css/edu-all.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="171">
          <caret line="3481" column="26" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/public/index.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="72">
          <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="43928">
          <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="153">
          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
          <folding>
            <element signature="n#CoderRootDirectory#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="192">
          <caret line="85" column="23" lean-forward="true" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
          <folding>
            <element signature="e#0#41#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1670">
          <caret line="60" selection-start-line="60" selection-end-line="60" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="326">
          <caret line="375" column="28" selection-start-line="375" selection-start-column="28" selection-end-line="375" selection-end-column="28" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="187">
          <caret line="59" column="93" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="93" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="3400">
          <caret line="200" column="35" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="216">
          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="301">
          <caret line="337" column="28" lean-forward="true" selection-start-line="337" selection-start-column="28" selection-end-line="337" selection-end-column="28" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
            <element signature="e#6358#8304#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="229">
          <caret line="86" column="18" lean-forward="true" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/App.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="12376">
          <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1989">
          <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
          <folding>
            <element signature="e#0#26#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1564">
          <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="4097">
          <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="2431">
          <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
          <folding>
            <element signature="e#0#42#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/.gitignore">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="765">
          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="4726">
          <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="14127">
          <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="306">
          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
          <folding>
            <element signature="e#0#40#0" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
  </component>
 </project>
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@ -19,7 +19,8 @@ const getClientEnvironment = require("./env");
 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
 const shouldUseSourceMap = process.env.NODE_ENV !== "production";
 const env = getClientEnvironment(publicPath);
 // This is the production configuration.
@ -54,7 +55,8 @@ module.exports = {
  },
  bail: true,
  mode: "production",
-  devtool: false, //测试版
+  // devtool: false, //测试版
  devtool: shouldUseSourceMap?'source-map':false,
  entry: [require.resolve("./polyfills"), paths.appIndexJs],
  output: {
    path: paths.appBuild,
--- a/package-lock.json
+++ b/package-lock.json
@ -1273,7 +1273,7 @@
    },
    "babel-cli": {
      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-cli/download/babel-cli-6.26.0.tgz",
      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
      "dev": true,
      "requires": {
@ -1296,7 +1296,7 @@
      "dependencies": {
        "chokidar": {
          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz?cache=0&sync_timestamp=1602585438968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-1.7.0.tgz",
          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
          "dev": true,
          "optional": true,
@ -1314,7 +1314,7 @@
        },
        "source-map": {
          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
          "dev": true
        }
@ -1413,7 +1413,7 @@
    },
    "babel-helper-bindify-decorators": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz",
      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
      "dev": true,
      "requires": {
@ -1476,7 +1476,7 @@
    },
    "babel-helper-explode-class": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz",
      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
      "dev": true,
      "requires": {
@ -1676,7 +1676,7 @@
    },
    "babel-plugin-syntax-async-generators": {
      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz",
      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
      "dev": true
    },
@ -1687,7 +1687,7 @@
    },
    "babel-plugin-syntax-decorators": {
      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz",
      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
      "dev": true
    },
@ -1723,7 +1723,7 @@
    },
    "babel-plugin-transform-async-generator-functions": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
      "dev": true,
      "requires": {
@ -1755,7 +1755,7 @@
    },
    "babel-plugin-transform-decorators": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz",
      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
      "dev": true,
      "requires": {
@ -2060,7 +2060,7 @@
    },
    "babel-plugin-transform-runtime": {
      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
      "requires": {
        "babel-runtime": "^6.22.0"
@ -2077,7 +2077,7 @@
    },
    "babel-polyfill": {
      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
      "requires": {
        "babel-runtime": "^6.26.0",
@ -2087,7 +2087,7 @@
      "dependencies": {
        "regenerator-runtime": {
          "version": "0.10.5",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
        }
      }
@ -2131,7 +2131,7 @@
    },
    "babel-preset-es2015": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz",
      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
      "dev": true,
      "requires": {
@ -2179,7 +2179,7 @@
    },
    "babel-preset-react": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
      "requires": {
        "babel-plugin-syntax-jsx": "^6.3.13",
@ -2212,7 +2212,7 @@
    },
    "babel-preset-stage-2": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz",
      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
      "dev": true,
      "requires": {
@ -2224,7 +2224,7 @@
    },
    "babel-preset-stage-3": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz",
      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
      "dev": true,
      "requires": {
@ -3507,7 +3507,7 @@
    },
    "code-prettify": {
      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
      "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
    },
    "codemirror": {
@ -4885,7 +4885,7 @@
    },
    "dom-closest": {
      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
      "requires": {
        "dom-matches": ">=1.0.1"
@ -4929,7 +4929,7 @@
    },
    "dom-matches": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
    },
    "dom-scroll-into-view": {
@ -5187,7 +5187,7 @@
    },
    "enquire.js": {
      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
      "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
    },
    "entities": {
@ -5706,7 +5706,7 @@
    },
    "eventlistener": {
      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
      "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
    },
    "events": {
@ -7240,8 +7240,7 @@
        "ansi-regex": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
          "optional": true
        },
        "aproba": {
          "version": "1.2.0",
@ -7262,14 +7261,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@ -7284,20 +7281,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@ -7414,8 +7408,7 @@
        "inherits": {
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@ -7427,7 +7420,6 @@
          "version": "1.0.0",
          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@ -7442,7 +7434,6 @@
          "version": "3.0.4",
          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@ -7450,14 +7441,12 @@
        "minimist": {
          "version": "1.2.5",
          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
          "optional": true
        },
        "minipass": {
          "version": "2.9.0",
          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.2",
            "yallist": "^3.0.0"
@ -7476,7 +7465,6 @@
          "version": "0.5.3",
          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
          "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
          "optional": true,
          "requires": {
            "minimist": "^1.2.5"
          }
@ -7538,8 +7526,7 @@
        "npm-normalize-package-bin": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
          "optional": true
        },
        "npm-packlist": {
          "version": "1.4.8",
@ -7567,8 +7554,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@ -7580,7 +7566,6 @@
          "version": "1.4.0",
          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@ -7658,8 +7643,7 @@
        "safe-buffer": {
          "version": "5.1.2",
          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
          "optional": true
        },
        "safer-buffer": {
          "version": "2.1.2",
@ -7695,7 +7679,6 @@
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@ -7715,7 +7698,6 @@
          "version": "3.0.1",
          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
          "optional": true,
          "requires": {
            "ansi-regex": "^2.0.0"
          }
@ -7759,14 +7741,12 @@
        "wrappy": {
          "version": "1.0.2",
          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
          "optional": true
        },
        "yallist": {
          "version": "3.1.1",
          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
          "optional": true
        }
      }
    },
@ -8040,7 +8020,7 @@
    },
    "hammerjs": {
      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
    },
    "handle-thing": {
@ -8881,7 +8861,7 @@
    },
    "immutable": {
      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
    },
    "import-fresh": {
@ -10486,7 +10466,7 @@
    },
    "lodash.throttle": {
      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
    },
    "lodash.uniq": {
@ -11673,7 +11653,7 @@
    },
    "output-file-sync": {
      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/output-file-sync/download/output-file-sync-1.1.2.tgz",
      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
      "dev": true,
      "requires": {
@ -19100,7 +19080,7 @@
    },
    "user-home": {
      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
      "dev": true
    },
@ -19157,7 +19137,7 @@
    },
    "v8flags": {
      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/v8flags/download/v8flags-2.1.1.tgz?cache=0&sync_timestamp=1590964281452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv8flags%2Fdownload%2Fv8flags-2.1.1.tgz",
      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
      "dev": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -193,7 +193,6 @@
    "babel-core": "^6.26.0",
    "babel-plugin-import": "^1.13.0",
    "babel-plugin-transform-runtime": "^6.23.0",
    "babel-polyfill": "^6.26.0",
    "babel-preset-es2015": "^6.24.1",
    "babel-preset-react": "^6.24.1",
    "babel-preset-stage-2": "^6.24.1",
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@ -1363,9 +1363,9 @@ a:visited {
  color: #05101a;
 }
-/*a:hover {*/
+a:hover {
-/*  color: #2A61FF!important;*/
+  color: #2A61FF!important;
-/*}*/
+}
 ol,
 ul,
@ -1609,7 +1609,7 @@ a.decoration {
 }
 .mt6 {
-  margin-top: 3px;
+  margin-top: 6px;
 }
 .mt7 {
@ -2436,7 +2436,7 @@ a.hoverLine:hover{
 .color-grey-9 {
-  color: #333333 !important;
+  color: #999999 !important;
 }
 .color-grey-98 {
@ -2471,19 +2471,21 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo span:hover{
+a.color-grey-3:hover,a.color-ooo:hover {
-  color: #466AFF !important;
+  color: #2A61FF !important;
 }
 /*蓝色*/
 .color-blue, .color-blue-file{
  color: #4CACFF !important;
 }
 .color-blue {
  color: #2A61FF !important;
 }
 .color-blue-file {
  color: #0054CC!important;
 }
 /* 绿色 */
 .color-green-file{
  color: #28BD6C;
 }
 /*主*/
 .color-blue_4C {
  color: #4CACFF !important;
--- 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=1629875571487') format('woff2'),
+  src: url('iconfont.woff2?t=1630632852475') format('woff2'),
-       url('iconfont.woff?t=1629875571487') format('woff'),
+       url('iconfont.woff?t=1630632852475') format('woff'),
-       url('iconfont.ttf?t=1629875571487') format('truetype');
+       url('iconfont.ttf?t=1630632852475') format('truetype');
 }
 .iconfont {
@ -13,6 +13,78 @@
  -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";
 }
@ -105,10 +177,6 @@
  content: "\e883";
 }
 .icon-cangkushezhiicon:before {
  content: "\e885";
 }
 .icon-lianjieicon:before {
  content: "\e887";
 }
@ -117,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";
 }
@ -233,10 +289,6 @@
  content: "\e898";
 }
 .icon-weixuanzhongqingqiuicon:before {
  content: "\e89b";
 }
 .icon-xiezuozheguanliicon:before {
  content: "\e8a1";
 }
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@ -5,6 +5,132 @@
  "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": "项目公告",
@ -166,13 +292,6 @@
      "unicode": "e883",
      "unicode_decimal": 59523
    },
    {
      "icon_id": "23472256",
      "name": "仓库设置icon",
      "font_class": "cangkushezhiicon",
      "unicode": "e885",
      "unicode_decimal": 59525
    },
    {
      "icon_id": "23472258",
      "name": "链接icon",
@ -187,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",
@ -390,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",
--- a/public/css/iconfont.ttf
+++ b/public/css/iconfont.ttf
--- a/public/css/iconfont.woff
+++ b/public/css/iconfont.woff
--- a/public/css/iconfont.woff2
+++ b/public/css/iconfont.woff2
--- a/public/css/iconfont_BACKUP_278.css
+++ b/public/css/iconfont_BACKUP_278.css
--- a/src/App.js
+++ b/src/App.js
@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	BrowserRouter as Router,
+	// BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@ -91,6 +91,10 @@ const ProjectIndex = Loadable({
 	loader: () => import("./forge/Index"),
 	loading: Loading,
 });
 // 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
 const keyWord = ["explore", "settings", "setting", "CCF", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search"];
 class App extends Component {
 	constructor(props) {
 		super(props);
@ -100,6 +104,51 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
 			pathType: null,
 			pathName: null,
 		}
 	}
 	UNSAFE_componentWillMount() {
 		initAxiosInterceptors(this.props);
 		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
 		pathname && this.getPathnameType(pathname);
 		// 添加路由监听，决定组织还是个人
 		this.unlisten = this.props.history.listen((location) => {
 			let newPathname = location.pathname.split('/')[1];
 			if (this.state.pathName !== newPathname) {
 				// this.setState({ pathType: '' });
 				newPathname && this.getPathnameType(newPathname);
 			}
 		});
 	}
 	shouldComponentUpdate(nextProps, nextState) {
 		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
 		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
 			return false;
 		} else {
 			return true;
 		}
 	}
 	getPathnameType = (pathname) => {
 		if (!keyWord.includes(pathname)) {
 			let url = `/owners/${pathname}.json`;
 			axios.get(url).then((response) => {
 				if (response && response.status === 200) {
 					this.setState({
 						pathType: response.data.type || '404',
 						pathName: pathname,
 					})
 				}
 			});
 		}else{
 			this.setState({
 				pathType: pathname,
 				pathName: pathname,
 			});
 		}
 	}
@ -119,13 +168,19 @@ class App extends Component {
 	componentDidMount() {
 		document.title = "loading...";
-		initAxiosInterceptors(this.props);
+
 		this.getAppdata();
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
 	}
 	componentWillUnmount() {
 		this.unlisten && this.unlisten(); // 执行解绑
 	}
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@ -196,7 +251,7 @@ class App extends Component {
 	};
 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
@ -204,87 +259,123 @@ class App extends Component {
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<SiderBar />
-						<Router>
+						{/* <Router> */}
-							<Switch>
+						<Switch>
-								{/* wiki预览 */}
+							{/* wiki预览 */}
-								<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
 								(props) => {
 									return (<WikiPreview {...this.props} {...props} {...this.state} />)
 								}
 							} />
 							{/*项目*/}
 							<Route
 								path={"/:owner/:projectId/devops/:opsId/detail"}
 								render={
 									(props) => {
-										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+										return (<OpsDetail {...this.props} {...props} {...this.state} />)
 									}
-								} />
+								}>
-
+							</Route>
-								{/*项目*/}
+							<Route
-								<Route
+								path={"/settings"}
-									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
+								render={
-									render={
+									(props) => {
-										(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
 											return (<OpsDetail {...this.props} {...props} {...this.state} />)
 										}
 									}>
 								</Route>
 								<Route
 									path={"/settings"}
 									render={
 										(props) => {
 											return (<Security {...this.props} {...props} {...this.state} />)
 										}
 									}>
 								</Route>
 								{/*项目*/}
 								<Route
 									path={"/projects"}
 									render={
 										(props) => {
 											return (<Projects {...this.props} {...props} {...this.state} />)
 										}
 									}>
 								</Route>
 								<Route
 									path="/register"
 									render={
 										(props) => {
 											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 										}
 									}
-								/>
+								}>
-								{/*403*/}
+							</Route>
 								<Route path="/403" component={Shixunauthority} />
-								<Route path="/500" component={http500} />
+							<Route
-								<Route path={"/organize"}
+								path="/register"
-									render={
+								render={
-										(props) => {
+									(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 										}
 									}>
 								</Route>
 								{/*404*/}
 								<Route path="/nopage" component={Shixunnopage} />
 								{/* 查询 */}
 								<Route path="/search" component={Search} />
 								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
 										(props) => {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
 									}></Route>
 								<Route exact path="/"
 									render={
 										(props) => (
 											personal && personal.length > 0 ?
 												<InfosIndex {...this.props} {...props} />
 												:
 												<ProjectIndex {...this.props} {...props} />
 										)
 									}
-								/>
+								}
-								<Route component={Shixunnopage} />
+							/>
-							</Switch>
+							{/*403*/}
-						</Router>
+							<Route path="/403" component={Shixunauthority} />
 							<Route path="/500" component={http500} />
 							{/*404*/}
 							<Route path="/nopage" component={Shixunnopage} />
 							{/* 查询 */}
 							<Route path="/search" component={Search} />
 							<Route exact path="/explore"
 								render={
 									(props) => (
 											<ProjectIndex {...this.props} {...props} />
 									)
 								}
 							/>
 							{/* 组织 */}
 							<Route path={"/organize"}
 								render={
 									(props) => {
 										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 									}
 								}>
 							</Route>
 							{/*新建项目等*/}
 							<Route
 								path={"/projects"}
 								render={
 									(props) => {
 										return (<Projects {...this.props} {...props} {...this.state} />)
 									}
 								}>
 							</Route>
 							{/* 判断为用户/组织，并进入对应页面 */}
 							{
 								pathType === 'User' ?
 									<Route exact path="/:username"
 										render={
 											(props) => {
 												return (<InfosIndex {...this.props} {...this.state} />)
 											}
 										}
 									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
 										render={
 											(props) => {
 												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 											}
 										}>
 									</Route> : pathType === '404' ? <Route path="/" component={Shixunnopage} /> :
 										<Route exact path="/"
 											render={
 												(props) => (
 													personal && personal.length > 0 ?
 														<InfosIndex {...this.props} {...props} />
 														:
 														<ProjectIndex {...this.props} {...props} />
 												)
 											}
 										/>
 								// <Route path="/" component={Loading} />
 							}
 							{/* 个人主页 */}
 							<Route path="/:username"
 								render={
 									(props) => {
 										return (<InfosIndex {...this.props} {...this.state} />)
 									}
 								}></Route>
 							<Route component={Shixunnopage} />
 						</Switch>
 						{/* </Router> */}
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -11,9 +11,9 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 function locationurl(list) {
-  if (window.location.port !== "3007") {
+  // if (window.location.port !== "3007") {
  window.location.href = list
-  }
+  // }
 }
 // TODO 开发期多个身份切换
 let debugType = ""
@ -85,7 +85,10 @@ export function initAxiosInterceptors(props) {
    }
    if (response.data.status === 404) {
-      locationurl('/nopage');
+      let responseURL = response.request ? response.request.responseURL:'';
      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 && responseURL.indexOf('/api/owners/') === -1) {
        locationurl('/nopage');
      }
    }
    if (response.data.status === 500) {
--- a/src/college/College.js
+++ b/src/college/College.js
@ -195,7 +195,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth105",
 					render: (text, record) => (
-						<a href={`/users/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
+						<a href={`/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
 							color:'#007bff',
 						}}>	{
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@ -107,7 +107,7 @@ export function timeAgo(backDate) {
  try {
    moment(backDate);
  } catch (e) {
-    return;
+    return '刚刚';
  }
  if(typeof backDate ==='number'){
    backDate=backDate*1000
@ -134,4 +134,5 @@ export function timeAgo(backDate) {
  if (seconds) {
    return seconds + "秒前";
  }
  return "刚刚";
 }
--- a/src/context/TPIContextProvider.js
+++ b/src/context/TPIContextProvider.js
@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/users/innov"
+		user_url: "/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/users/${resData.user.login}`;
+		user.user_url = `/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@ -14,25 +14,25 @@ class ActivityItem extends Component {
          {/* 如果是版本发布 */}
          {item.trend_type === "VersionRelease" ?
          <p className="itemLine">
-            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
            <span className="activity_type">{item.trend_type}</span>
          </p >
          :
          // 如果是任务
          item.trend_type === "Issue" ?
            <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
              <span className="activity_type">{item.trend_type}</span>
            </p >
            :
            // 如果是合并请求
            <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
              <span className="activity_type">{item.trend_type}</span>
            </p >
          }
          <p className="itemLine mt10">
-            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/${item && item.user_login}`} className="show-user-link">
              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
              <span className="mr20">{item.user_name}</span>
            </Link>
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@ -1,28 +1,20 @@
 import React, { useState } from 'react';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Menu } from 'antd';
 import "./branch.scss";
 import CopyTool from '../Component/CopyTool';
 function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
  const [ key , setKey ] = useState("HTTP");
  // 点击按钮复制功能
  function jsCopy(){
    var e = document.getElementById("copy_rep_content");
    e.select();
    document.execCommand("Copy");
  }
  return (
    <div className="downMenu">
-      <div style={{borderBottom:"1px solid #eee"}}>
+      <div style={{padding:"10px 20px 20px 20px",borderBottom:"1px solid #eee"}}>
        <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
          <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
          <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
        </Menu>
        <div className="gitAddressClone">
          <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <Tooltip title="复制链接">
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
          </Tooltip>
        </div>
      </div>
      <Menu className="edu-txt-center">
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@ -56,7 +56,7 @@
 .branch-tagBox {
  border: 1px solid #D0D0D0;
  border-radius: 3px;
-  height: 36px;
+  height: 40px;
  display: flex;
  align-items: center;
  cursor: pointer;
@ -110,7 +110,6 @@
 .urlMenu {
  line-height: 30px;
  margin-bottom: 10px;
  padding: 15px 20px 0px 20px;
  border-bottom: none;
 }
 .urlMenu li.ant-menu-item {
@ -129,4 +128,8 @@
  border-color: transparent;
 }
 .copytool {
  margin: 0px 10px;
 }
 /*# sourceMappingURL=branch.css.map */
--- a/src/forge/Branch/branch.css.map
+++ b/src/forge/Branch/branch.css.map
@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE","file":"branch.css"}
+{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIN;EACE","file":"branch.css"}
--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@ -48,7 +48,7 @@
 .branch-tagBox{
  border:1px solid #D0D0D0;
  border-radius: 3px;
-  height: 36px;
+  height: 40px;
  display: flex;
  align-items: center;
  cursor: pointer;
@ -98,7 +98,6 @@
 .urlMenu{
  line-height: 30px;
  margin-bottom: 10px;
  padding:15px 20px 0px 20px;
  border-bottom: none;
  li.ant-menu-item{
    height: 30px;
@ -115,4 +114,7 @@
      border-color:transparent ;
    }
  }
 }
 .copytool{
  margin:0px 10px;
 }
--- a/src/forge/Component/AddGroup.jsx
+++ b/src/forge/Component/AddGroup.jsx
@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){
  function addCollaborator(){
    getGroupID && getGroupID(id);
    setID(undefined);
  }
  return(
--- a/src/forge/Component/Component.css
+++ b/src/forge/Component/Component.css
@ -120,14 +120,7 @@ li.ant-menu-item {
 }
 .laterest {
-  background-color: #EF3131;
+  color: #05690d;
  color: #fff;
  font-size: 12px;
  margin-left: 10px;
  padding: 0px 5px;
  border-radius: 2px;
  height: 18px;
  line-height: 18px;
 }
@media screen and (max-width: 1800px) {
@ -172,93 +165,43 @@ li.ant-menu-item {
 }
 .menuPanels {
-  width: 295px;
+  width: 240px;
-}
+  height: 180px;
 .menuPanels .leftline {
  position: relative;
  color: #666;
  height: 16px;
 }
 .menuPanels .leftline::before {
  position: absolute;
  left: -10px;
  top: 3px;
  height: 12px;
  width: 1px;
  background-color: #666666;
  content: "";
 }
 .menuPanels .ant-btn {
  height: 36px;
  line-height: 34px;
  width: 83px;
  text-align: center;
  padding: 0px;
  font-weight: 500;
  font-size: 14px;
 }
 .menuPanels .ant-btn.currentBtn {
  cursor: default;
  color: #333;
 }
 .menuPanels .ant-btn.currentBtn:hover {
  color: #333;
  border-color: #d0d0d0;
 }
 .menuPanels .ant-btn-default {
  color: #333;
  border-color: #d0d0d0;
 }
 .menuPanels .ant-btn-default:hover {
  background: #F3F4F6;
 }
 .menuPanels .ant-btn-primary {
  color: #fff;
  background-color: #2A61FF;
 }
 .menuPanels .focusPanelHeadInfo {
  padding: 14px 16px;
  border-bottom: 1px solid #eee;
 }
 .menuPanels .ant-popover-content, .menuPanels .ant-popover-inner {
  height: 100%;
  width: 100%;
 }
 .menuPanels .ant-popover-inner-content {
  padding: 0px;
 }
 .halfs {
  margin-top: 24px;
  padding: 24px 0px 0px 0px;
  border-top: 1px solid #e8e8e8;
 }
-
+.halfs .attrPerson {
-.aboutSubTitle {
+  padding-bottom: 24px;
  display: flex;
  align-items: center;
 }
 .menuinfos {
-  padding: 10px 20px;
+  padding: 15px 0px;
 }
 .menuinfos > a {
  display: flex;
  flex-direction: column;
  align-items: center;
  border-right: 1px solid #eee;
  flex: 1;
 }
 .menuinfos > a > span:first-child {
-  font-size: 16px;
+  font-size: 18px;
-  font-weight: 500;
+  font-weight: 400;
  color: #333;
  line-height: 22px;
 }
 .menuinfos > a > span:last-child {
  color: #666;
-  font-weight: 400;
+}
-  line-height: 20px;
+.menuinfos > a:last-child {
-  margin-top: 6px;
+  border-right: none;
 }
 /*-------------------个人主页：右侧提示区域--------------------------*/
--- a/src/forge/Component/Component.css.map
+++ b/src/forge/Component/Component.css.map
@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["Component.scss"],"names":[],"mappings":";AAAA;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;;;AAEF;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAKN;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;IACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;AACA;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAON;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"Component.css"}
+{"version":3,"sourceRoot":"","sources":["Component.scss"],"names":[],"mappings":";AAAA;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;;;AAEF;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;;AAIJ;EACE;EACA;;AACA;EACE;EACA;;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;;AAKN;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;IACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;AACA;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAON;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"Component.css"}
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@ -113,14 +113,7 @@ li.ant-menu-item{
  z-index: 10000;
 }
 .laterest{
-  background-color: #EF3131;
+  color: #05690d;
  color: #fff;
  font-size: 12px;
  margin-left: 10px;
  padding:0px 5px;
  border-radius: 2px;
  height: 18px;
  line-height: 18px;
 }
@media screen and (max-width: 1800px){
@ -164,88 +157,39 @@ li.ant-menu-item{
 }
 .menuPanels{
-  width: 295px;
+  width: 240px;
-  .leftline{
+  height: 180px;
    position: relative;
    color: #666;
    height: 16px;
    &::before{
      position: absolute;
      left: -10px;
      top:3px;
      height: 12px;
      width: 1px;
      background-color: #666666;
      content: "";
    }
  }
  .ant-btn{
    height: 36px;
    line-height: 34px;
    width: 83px;
    text-align: center;
    padding:0px ;
    font-weight: 500;
    font-size: 14px;
    &.currentBtn{
      cursor: default;
      color: #333;
      &:hover{
        color: #333;
        border-color: #d0d0d0;
      }
    }
  }
  .ant-btn-default{
    color: #333;
    border-color: #d0d0d0;
    &:hover{
      background: #F3F4F6;
    }
  }
  .ant-btn-primary{
    color: #fff;
    background-color: #2A61FF;
  }
  .focusPanelHeadInfo{
    padding:14px 16px;
    border-bottom: 1px solid #eee;
  }
  .ant-popover-content,.ant-popover-inner{
    height: 100%;
    width: 100%;
  }
  .ant-popover-inner-content{
    padding:0px;
  }
 }
 .halfs{
  margin-top: 24px;
  padding:24px 0px 0px 0px;
  border-top: 1px solid #e8e8e8;
-}
+  .attrPerson{
-.aboutSubTitle{
+    padding-bottom: 24px;
-  display: flex;
+  }
  align-items: center;
 }
 .menuinfos{
-  padding:10px 20px;
+  padding:15px 0px;
  &>a{
    display: flex;
    flex-direction: column;
    align-items: center;
    border-right: 1px solid #eee;
    flex: 1;
    & >span:first-child{
-      font-size: 16px;
+      font-size: 18px;
-      font-weight: 500;
+      font-weight: 400;
      color: #333;
      line-height: 22px;
    }
    & >span:last-child{
      color: #666;
-      font-weight: 400;
+    }
-      line-height: 20px;
+    &:last-child{
-      margin-top: 6px;
+      border-right: none;
    }
  }
 }
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@ -1,13 +1,13 @@
 import React, { useEffect, useState } from 'react';
 import { AlignCenter , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
-import { Popover , Spin , Button } from 'antd';
+import { Popover , Spin } from 'antd';
 import { getImageUrl } from 'educoder';
 import './Component.scss';
 import { getUser } from '../GetData/getData';
 import axios from 'axios';
-function Contributors({contributors,owner,projectsId,currentLogin}){
+function Contributors({contributors,owner,projectsId}){
  const [ menuList ,setMenuList ]= useState([]);
  const [ list , setList ]= useState(undefined);
  const [ total , setTotal ]= useState(0);
@ -50,28 +50,15 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
    if(data){
      let ele = (
        <Spin spinning={isSpin}>
-          <AlignCenter className="focusPanelHeadInfo">
+          <FlexAJ>
-            <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+            <AlignCenter>
-            <div className="flex1 ml10" style={{width:"0"}}>
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-              <AlignCenter>
+              <Link to={`/${data.login}`} className="ml10">{data.name}</Link>
-                <Link to={`/users/${data.login}`} className="font-16">{data.name}</Link>
+            </AlignCenter>
-                {
+            {
-                  data.location && 
+              data.is_watch ? <a className="color-grey-9" onClick={()=>FocusFunc(false,data.login)}>取消关注</a>:<a className="color-blue" onClick={()=>FocusFunc(true,data.login)}>关注</a>
-                  <span className="ml20 font-12 leftline">{data.location}</span>
+            }
-                }
+          </FlexAJ>
              </AlignCenter>
              {
                data.organizations && data.organizations.length > 0 ?
                <AlignCenter className="font-12 mt5">
                  <span>所属组织：</span>
                  <div className="task-hide flex1">
                    {renderArray(data.organizations)}
                  </div>
                </AlignCenter>
                :""
              }
            </div>
          </AlignCenter>
          <AlignCenter className="menuinfos">
            <a href={data.projects_url}>
              <span>{data.projects_count}</span>
@ -86,18 +73,19 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
              <span>关注数</span>
            </a>
          </AlignCenter>
-          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
+          {
-            {
+            data.organizations && data.organizations.length > 0 ?
-              currentLogin && (currentLogin === data.login)
+            <AlignCenter className="font-12 pt4 pb4">
-              ?
+              <span>所属组织：</span>
-              <Button className="currentBtn">当前用户</Button>
+              <div className="task-hide flex1">
-              :
+                {renderArray(data.organizations)}
-              data.is_watch ? 
+              </div>
-              <Button type={"default"} onClick={()=>FocusFunc(false,data.login)}>已关注</Button>
+            </AlignCenter>
-              :
+            :""
-              <Button type={"primary"} onClick={()=>FocusFunc(true,data.login)}>关注TA</Button>
+          }
-            }
+          {
-          </div>
+            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
          }
        </Spin>
      )
      setMenu(ele);
@ -147,17 +135,17 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
  return(
    <div className="halfs">
-      <Link to={`/projects/${owner}/${projectsId}/contribute`} className="font-16 color-ooo aboutSubTitle">
+      <FlexAJ>
-        <span>贡献者</span>
+        <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
-        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
+        <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/contribute`}>全部</Link>
-      </Link>
+      </FlexAJ>
      <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
        {
          total > 0 ?
          list.map((item,key)=>{
            return(
              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/users/${item.login}`}>
+                <Link key={key} to={`/${item.login}`}>
                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                </Link>
              </Popover>
--- a/src/forge/Component/CopyTool.jsx
+++ b/src/forge/Component/CopyTool.jsx
@ -0,0 +1,50 @@
 import React, { useState, useCallback, memo } from 'react';
 import { Tooltip } from 'antd';
 CopyTool.defaultProps = {
  beforeText: '复制',     //浮动过去显示的文字
  afterText: '复制成功',  //点击后显示的文字
  className: '',         //传给svg的class
  inputId: 'copyText',    //要复制的文本的ID
  timeOut:true, //复制后将浮动的文字改为beforeText
 };
 function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
  const [title, setTitle] = useState(() => {
    return beforeText;
  });
  // 复制链接
  const copyUrl = useCallback(() => {
    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
    if (!copyEle) {
      console.error("您的CopyTool未设置正确的inputId");
      return;
    }
    copyEle.select(); // 执行选中元素
    if (document.execCommand('copy')) {
      document.execCommand('copy');
    }
    setTitle(afterText);
    if(timeOut){
      setTimeout(function(){
        setTitle(beforeText);
      },1500)
    }
  }, []);
  return (
    <Tooltip
      placement="top"
      title={title}
      onVisibleChange={() => { setTitle(beforeText) }}
    >
      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
    </Tooltip>
  );
 }
 export default memo(CopyTool);
--- a/src/forge/Component/DeleteModal/Index.jsx
+++ b/src/forge/Component/DeleteModal/Index.jsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
+import { Button } from 'antd';
-import './Index.scss';
+import Modals from '../PublicModal/Index';
 function DeleteBox({ 
  visible , 
@ -12,24 +12,22 @@ function DeleteBox({
  content
 }) {
  return(
-    <Modal
+    <Modals 
-      visible={visible}
+      title={title} 
-      onCancel={onCancel}
+      btn={
      title={title}
      width="600px"
      className="deleteBox"
      footer={
        <div>
          <Button size={'large'} onClick={onCancel}>取消</Button>
          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
        </div>
-      }
+      } 
      onCancel={onCancel} 
      visible={visible}
    >
      <div className="desc">
        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-        <p>{subTitle}</p>
+      <p>{subTitle}</p>
      </div>
-    </Modal>
+    </Modals>
  )
 }
 export default DeleteBox;
--- a/src/forge/Component/DeleteModal/Index.scss
+++ b/src/forge/Component/DeleteModal/Index.scss
@ -1,45 +0,0 @@
 .deleteBox{
  .ant-modal-header{
    background-color: #f8f8f8;
    border-bottom: none;
    .ant-modal-title{
      text-align: left;
      font-size: 20px;
    }
  }
  .ant-modal-body{
    padding:30px 50px;
    p{
      font-size: 16px;
      line-height: 26px;
      color:#666;
      word-break: break-all;
    }
    .desc{
      .descMain{
        align-items: center;
        justify-content: center;
        font-size: 20px;
        margin-bottom: 10px;
        i{
          font-size: 38px!important;
          color:#DF0002
        }
      }
    }
  }
  .ant-modal-footer{
    border-top: none;
    text-align: center;
    padding-bottom: 40px;
    button{
      width: 120px;
      margin:0px 20px;
      &.ant-btn-danger{
        background-color: #fff;
        color: #DF0002;
        border-color: #D0D0D0;
      }
    }
  }
 }
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
    if(dataref.type==="file"){
      onClose();
      let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
    }
  }
--- a/src/forge/Component/EAccount.css
+++ b/src/forge/Component/EAccount.css
@ -1,9 +1,9 @@
 .ant-modal-mask {
-  z-index: 1001;
+  z-index: 1031;
 }
 .ant-modal-wrap {
-  z-index: 1002;
+  z-index: 1032;
 }
 /*# sourceMappingURL=EAccount.css.map */
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -1,6 +1,6 @@
 .ant-modal-mask{
-  z-index: 1001;
+  z-index: 1031;
 }
 .ant-modal-wrap{
-  z-index: 1002;
+  z-index: 1032;
 }
--- a/src/forge/Component/LanguagePower.jsx
+++ b/src/forge/Component/LanguagePower.jsx
@ -25,7 +25,7 @@ function LanguagePower({languages}){
    }
  return(
    <div>
-      <p className="font-16 color-ooo aboutSubTitle">开发语言</p>
+      <p className="font-16 color-grey-6">开发语言</p>
      <div className="progress">
        {
          array && array.map((item,key)=>{
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
  return (
    <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
      <div className="m-infos">
-        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
        <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
        {
          is_current_user ?
          <Button type="default">当前用户</Button>
          : 
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
        }
      </div>
    </Div>
--- a/src/forge/Component/ProfileModal/Index.css
+++ b/src/forge/Component/ProfileModal/Index.css
@ -0,0 +1,21 @@
 .contents {
  display: flex;
  align-items: center;
  justify-content: center;
  margin: 10px auto 0px;
 }
 .contents img {
  margin-right: 13px;
  width: 44px;
 }
 .contents p {
  line-height: 29px;
  max-width: 327px;
  font-size: 16px !important;
 }
 .font-44 {
  font-size: 44px !important;
 }
 /*# sourceMappingURL=Index.css.map */
--- a/src/forge/Component/ProfileModal/Index.css.map
+++ b/src/forge/Component/ProfileModal/Index.css.map
@ -0,0 +1 @@
 {"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;;;AAGJ;EACE","file":"Index.css"}
--- a/src/forge/Component/ProfileModal/Index.jsx
+++ b/src/forge/Component/ProfileModal/Index.jsx
@ -0,0 +1,72 @@
 import React , { useEffect , useState } from 'react';
 import Modals from '../PublicModal/Index';
 import { Button } from 'antd';
 import axios from 'axios';
 import ProfileImg from './images/profile.png';
 import './Index.scss';
 function ProfileModal({visible,onCancel,history}) {
  const [ modalVis , setModalVis ] = useState(visible);
  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
  useEffect(()=>{
    axios.interceptors.response.use((response) => {
      if (response && (response.data.status === 411 || response.data.status === 412)) {
        setModalVis(true);
        if(response.data.status === 412){
          setAddMemberCheck(true);
        }
      }
      return response;
      }, (error) => {
    });
  },[])
  useEffect(()=>{
    setModalVis(visible);
  },[visible])
  function onOk(){
    onCancel();
    setModalVis(false);
    setTimeout(function(){
      window.open(`/settings/profile`,"_blank");
    },200)
  }
  function onNo() {
    onCancel();
    setModalVis(false);
  }
  return(
    <Modals 
      title="完善资料" 
      onCancel={onNo} 
      visible={modalVis}
      btn={
        addMemberCheck?
        <div>
          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
        </div>
        :
        <div>
          <Button size={"large"} onClick={onNo}>暂不补充</Button>
          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
        </div>
      }  
    >
      <div className="contents">
        <img src={ProfileImg} alt=""/> 
        {
          addMemberCheck ?
          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
          :
          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
        }
      </div>
    </Modals>
  )
 }
 export default ProfileModal;
--- a/src/forge/Component/ProfileModal/Index.scss
+++ b/src/forge/Component/ProfileModal/Index.scss
@ -0,0 +1,18 @@
 .contents{
  display: flex;
  align-items: center;
  justify-content: center;
  margin:10px auto 0px;
  img{
    margin-right: 13px;
    width: 44px;
  }
  p{
    line-height: 29px;
    max-width: 327px;
    font-size: 16px!important;
  }
 }
 .font-44{
  font-size: 44px!important;
 }
--- a/src/forge/Component/ProfileModal/Profile.jsx
+++ b/src/forge/Component/ProfileModal/Profile.jsx
@ -0,0 +1,17 @@
 import React from 'react';
 function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
  function checkProfile() {
    if(!completeProfile){
      showCompeleteDialog && showCompeleteDialog();
    }else{
      sureFunc();
    }
  }
  return(
    <a className={className} onClick={checkProfile}>{children}</a>
  )
 }
 export default Profile;
--- a/src/forge/Component/ProfileModal/images/profile.png
+++ b/src/forge/Component/ProfileModal/images/profile.png
--- a/src/forge/Component/PublicModal/Index.css
+++ b/src/forge/Component/PublicModal/Index.css
@ -0,0 +1,75 @@
 .deleteBox {
  z-index: 1033;
 }
 .deleteBox .ant-modal-close-x {
  font-size: 17px !important;
 }
 .deleteBox .ant-modal-header {
  background-color: #f8f8f8;
  padding: 10px 30px;
 }
 .deleteBox .ant-modal-header .ant-modal-title {
  text-align: left;
  font-size: 16px;
  font-weight: bold;
 }
 .deleteBox .ant-modal-close {
  top: 0px !important;
  font-size: 24px !important;
 }
 .deleteBox .ant-modal-body {
  padding: 30px 50px;
 }
 .deleteBox .ant-modal-body p {
  font-size: 14px;
  line-height: 26px;
  color: #666;
  word-break: break-all;
 }
 .deleteBox .ant-modal-body .desc .descMain {
  align-items: center;
  justify-content: center;
  font-size: 20px;
  margin-bottom: 10px;
 }
 .deleteBox .ant-modal-body .desc .descMain i.red {
  color: #DF0002;
 }
 .deleteBox .ant-modal-footer {
  border-top: none;
  text-align: center;
  padding-bottom: 40px;
 }
 .deleteBox .ant-modal-footer button, .deleteBox .ant-modal-footer a {
  width: 96px;
  height: 32px;
  margin: 0px 20px;
  font-weight: 400;
  font-size: 14px;
 }
 .deleteBox .ant-modal-footer button.ant-btn, .deleteBox .ant-modal-footer a.ant-btn {
  border-color: #D0D0D0;
  color: #666;
 }
 .deleteBox .ant-modal-footer button.ant-btn:hover, .deleteBox .ant-modal-footer button.ant-btn:active, .deleteBox .ant-modal-footer button.ant-btn:focus, .deleteBox .ant-modal-footer a.ant-btn:hover, .deleteBox .ant-modal-footer a.ant-btn:active, .deleteBox .ant-modal-footer a.ant-btn:focus {
  background: #f3f4f6;
 }
 .deleteBox .ant-modal-footer button.ant-btn-danger, .deleteBox .ant-modal-footer a.ant-btn-danger {
  background-color: #fff;
  color: #DF0002;
  border-color: #D0D0D0;
 }
 .deleteBox .ant-modal-footer button.ant-btn-danger:hover, .deleteBox .ant-modal-footer button.ant-btn-danger:active, .deleteBox .ant-modal-footer button.ant-btn-danger:focus, .deleteBox .ant-modal-footer a.ant-btn-danger:hover, .deleteBox .ant-modal-footer a.ant-btn-danger:active, .deleteBox .ant-modal-footer a.ant-btn-danger:focus {
  border-color: #DF0002;
  background-color: #fff;
 }
 .deleteBox .ant-modal-footer button.ant-btn.ant-btn-primary, .deleteBox .ant-modal-footer a.ant-btn.ant-btn-primary {
  background-color: #466AFF;
  color: #fff;
  border-color: #466AFF;
 }
 .deleteBox .ant-modal-footer button.ant-btn.ant-btn-primary:hover, .deleteBox .ant-modal-footer button.ant-btn.ant-btn-primary:focus, .deleteBox .ant-modal-footer button.ant-btn.ant-btn-primary:active, .deleteBox .ant-modal-footer a.ant-btn.ant-btn-primary:hover, .deleteBox .ant-modal-footer a.ant-btn.ant-btn-primary:focus, .deleteBox .ant-modal-footer a.ant-btn.ant-btn-primary:active {
  background-color: rgba(70, 106, 255, 0.85);
 }
 /*# sourceMappingURL=Index.css.map */
--- a/src/forge/Component/PublicModal/Index.css.map
+++ b/src/forge/Component/PublicModal/Index.css.map
@ -0,0 +1 @@
 {"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;;AACA;EACE;;AAEF;EACE;EACA;;AACA;EACE;EACA;EACA;;AAGJ;EACE;EACA;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;AAGA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;EACA;;AACA;EACE","file":"Index.css"}
--- a/src/forge/Component/PublicModal/Index.jsx
+++ b/src/forge/Component/PublicModal/Index.jsx
@ -0,0 +1,20 @@
 import React from 'react';
 import { Modal } from 'antd';
 import './Index.scss';
 function Modals({title,children,btn,onCancel,visible}) {
  return(
    <Modal
      visible={visible}
      onCancel={onCancel}
      title={title}
      width={"520px"}
      footer={btn}
      centered={true}
      wrapClassName={"deleteBox"}
    >
      {children}
    </Modal>
  )
 }
 export default Modals;
--- a/src/forge/Component/PublicModal/Index.scss
+++ b/src/forge/Component/PublicModal/Index.scss
@ -0,0 +1,75 @@
 .deleteBox{
  z-index: 1033;
  .ant-modal-close-x{
    font-size: 17px!important;
  }
  .ant-modal-header{
    background-color: #f8f8f8;
    padding:10px 30px;
    .ant-modal-title{
      text-align: left;
      font-size: 16px;
      font-weight: bold;
    }
  }
  .ant-modal-close{
    top:0px !important;
    font-size: 24px !important;
  }
  .ant-modal-body{
    padding:30px 50px;
    p{
      font-size: 14px;
      line-height: 26px;
      color:#666;
      word-break: break-all;
    }
    .desc{
      .descMain{
        align-items: center;
        justify-content: center;
        font-size: 20px;
        margin-bottom: 10px;
        i.red{
          color:#DF0002;
        }
      }
    }
  }
  .ant-modal-footer{
    border-top: none;
    text-align: center;
    padding-bottom: 40px;
    button,a{
      width: 96px;
      height: 32px;
      margin:0px 20px;
      font-weight: 400;
      font-size: 14px;
      &.ant-btn{
        border-color: #D0D0D0;
        color: #666;
        &:hover,&:active,&:focus{
          background: #f3f4f6;
        }
      }
      &.ant-btn-danger{
        background-color: #fff;
        color: #DF0002;
        border-color: #D0D0D0;
        &:hover,&:active,&:focus{
          border-color: #DF0002;
          background-color: #fff;
        }
      }
      &.ant-btn.ant-btn-primary{
        background-color: #466AFF;
        color: #fff;
        border-color: #466AFF;
        &:hover,&:focus,&:active{
          background-color: rgba(70,106,255,0.85);
        }
      }
    }
  }
 }
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -6,29 +6,33 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
  return(
    <div>
-      <Link to={`/projects/${owner}/${projectsId}/releases`} className="font-16 color-ooo aboutSubTitle">
+      <FlexAJ>
-        <span>发行版</span>
+        <AlignCenter><span className="font-16 color-grey-6">发行版</span>
-        { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+          { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
-      </Link>
+        </AlignCenter>
        { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
          <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/releases`}>全部</Link>
          : 
          baseOperate && <Link className="font-12 color-blue" to={`/${owner}/${projectsId}/releases/new`}>新建</Link>
        }
      </FlexAJ>
      {
        releaseVersions && releaseVersions.total_count>0 ?
          releaseVersions.list.map((item,key)=>{
            return(
            key === 0 &&<AlignTop className="mt10">
              <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
              <div>
-                <p className="font-16">
+                <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases`} className="color-grey-3">发布{item.name}版本</Link>
+                  <Link to={`/${owner}/${projectsId}/releases`}>{item.name}</Link>
-                  <span className="laterest">最新</span>
+                  <span className="font-12 laterest ml5">最新</span>
                </p>
-                <p className="color-grey-3 font-12">{item.created_at}</p>
+                <p className="color-grey-9 font-13">{item.created_at}</p>
              </div>
            </AlignTop>
            )
          })
-        :
+        :""
        <div className="mt8">
          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
        </div>
      }
    </div>
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -20,7 +20,7 @@ export default ({ url , name , column  , id , login })=>{
  `;
  return(
    id?
-    <Link to={`/users/${login}`}>
+    <Link to={`/${login}`}>
      <Img>
        { url && <img src={url} alt=""/> }
        <span>{name}</span>
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -149,7 +149,7 @@ function About(props, ref) {
    axios.post(url).then(result=>{
      setIsSpining(false);
      if(result && result.data.status === 0){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
        // 需要将顶部的open_devops修改
        let { changeOpenDevops } = props;
        changeOpenDevops && changeOpenDevops(true);
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@ -96,7 +96,7 @@ function Dispose(props){
          setVisible(false);
          if(result && result.data){
            props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
          }else{
            props.showNotification("流水线新增失败，请稍后再试！");
          }
@ -134,12 +134,12 @@ function Dispose(props){
  // 模板管理
  function toModalManage(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+    props.history.push(`/${owner}/${projectsId}/devops/mould`);
  }
  // 参数管理
  function toparameter(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+    props.history.push(`/${owner}/${projectsId}/devops/params`);
  }
  const operate = current_user && (permission && permission !== "Reporter");
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      render:(value,item)=>{
        let v = turnbar(item.branch);
        return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
        )
      }
    },
@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
        return(
          <span>
            { operate ? 
-              <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
              <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
            }
            { operate ? 
@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
                <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
              </Popconfirm>:""
            }
-            <Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
+            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
          </span>
        )
      }
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@ -36,39 +36,37 @@ export default ((props)=>{
  return(
    <WhiteBack className="opsPanel">
      <Switch {...props}>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId"
+        
-          render={
+        <Route path="/:owner/:projectsId/devops/params"
            (p) => (<New {...props} {...p}/>)
          }
        ></Route>
        <Route path="/projects/:owner/:projectsId/devops/params"
          render={
            (p) => (<Params {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/mould"
+        <Route path="/:owner/:projectsId/devops/mould"
          render={
            (p) => (<Mould {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
          render={
            (p) => (<New {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose"
+        
-          render={
+        <Route path="/:owner/:projectsId/devops/list/:branch"
            (p) => (<Dispose {...props} {...p}/>)
          }
        ></Route>
        <Route path="/projects/:owner/:projectsId/devops/list/:branch"
          render={
            (p) => (<Stucture {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops"
+        <Route path="/:owner/:projectsId/devops/:disposeId"
          render={
-            (p) => (<About {...props} {...p}/>)
+            (p) => (<New {...props} {...p}/>)
          }
        ></Route>
        {/* 原本的两种合为一个 */}
        <Route path="/:owner/:projectsId/devops"
          render={
            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
          }
        ></Route>
      </Switch>
--- a/src/forge/DevOps/Infos.jsx
+++ b/src/forge/DevOps/Infos.jsx
@ -26,7 +26,7 @@ export default ((props)=>{
  return(
    <div className="disposePanel">
      <Banner>
-        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
      </Banner>
      <Div>
        <Dispost {...props}/>
--- a/src/forge/DevOps/Manage/Params.jsx
+++ b/src/forge/DevOps/Manage/Params.jsx
@ -104,7 +104,7 @@ function Params(props){
      <Banner>
        <FlexAJ>
          <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
        </FlexAJ>
      </Banner>
      <Div className="disposeList">
--- a/src/forge/DevOps/Mould.jsx
+++ b/src/forge/DevOps/Mould.jsx
@ -126,7 +126,7 @@ function Mould(props){
    <div>
      <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
      <Banner>
-        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
+        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9">返回</Link></FlexAJ>
      </Banner>
      <Div className="disposeList">
        <FlexAJ>
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -198,7 +198,7 @@ function Structure(props,ref){
  }
  function clickRows(event,e){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`);
+    props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
  }
  const column = [
    {
@ -290,7 +290,7 @@ function Structure(props,ref){
      <Banner>
        <FlexAJ>
          <span>构建列表</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
        </FlexAJ>
      </Banner>
      <Div>
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@ -275,7 +275,7 @@ function disposePipeline(props){
      ...params
    }).then(result=>{
      if(result){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
      }
      setLoading(false);
    }).catch(error=>{
--- a/src/forge/DevOps/opsDetail.jsx
+++ b/src/forge/DevOps/opsDetail.jsx
@ -48,7 +48,7 @@ export default (props) => {
      axios.post(url).then((result) => {
        if (result && result.data) {
          props.showNotification("工作流正在重新构建！");
-          props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`);
+          props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
        }
      })
      .catch((error) => {
@ -87,7 +87,7 @@ export default (props) => {
          </AlignCenter>
          <Link
            style={{ color: "#ddd" }}
-            to={`/projects/${owner}/${projectId}/devops/dispose`}
+            to={`/${owner}/${projectId}/devops`}
          >
            <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
          </Link>
--- a/src/forge/Divert/DivertModal.jsx
+++ b/src/forge/Divert/DivertModal.jsx
@ -41,15 +41,19 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
  // 确认转移
  function onOk(){
    validateFields((error,values)=>{
      console.log(...values);
      if(!error){
        const url = `/${owner}/${repo}/applied_transfer_projects.json`;
        Axios.post(url,{
          ...values
        }).then(result=>{
          if(result){
-            onSuccess(result.data && result.data.owner);
+            if(result.data.status === 0){
              onSuccess(result.data && result.data.owner);
            }else{
              onSuccess();
            }
          }
        }).catch(error=>{})
      }
    })
@ -104,7 +108,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
          </ul>
          :
          <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
            <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
            <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
          </ul>
--- a/src/forge/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@ -1,6 +1,7 @@
 import React, { useState , forwardRef, useEffect } from 'react';
 import { Form , Modal , Input , Radio } from 'antd';
 import Axios from 'axios';
 import CheckProfile from '../Component/ProfileModal/Profile';
 export default Form.create()(
  forwardRef((props)=>{
@ -77,7 +78,7 @@ export default Form.create()(
            </Form.Item>
          </Form>
        </Modal>
-        <a onClick={()=>setVisible(true)}>加入项目</a>
+        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
      </React.Fragment>
    )
  })
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -10,6 +10,7 @@ import HeadSearch from '../Component/HeadSearch';
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
 import CheckProfile from '../Component/ProfileModal/Profile';
 import './header.scss';
 const $ = window.$
@ -222,6 +223,15 @@ class NewHeader extends Component {
      }
    }
  }
  checkProfile=(url)=>{
    const { showCompeleteDialog , completeProfile } = this.props;
    if(!completeProfile){
      showCompeleteDialog && showCompeleteDialog();
    }else{
      window.location.href(url);
    }
  }
  addMenu=(list)=>{
    return(
@ -231,11 +241,16 @@ class NewHeader extends Component {
          {
            list.map((item,key)=>{
              return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && 
                <Menu.Item key={item.name+key}>
                  <CheckProfile {...this.props} sureFunc={()=>{window.location.href=item.url}}>{item.name}</CheckProfile>
                </Menu.Item>
              )
            })
          }
-          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
+          <Menu.Item>
            <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
          </Menu.Item>
        </Menu>
      </div>
    )
@ -245,7 +260,7 @@ class NewHeader extends Component {
    return(
      <Menu className="currentMenu">
        <Menu.Item>
-          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+          <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
        </Menu.Item>
          {
            personal && personal.length > 0 && personal.map((item,key)=>{
@ -254,7 +269,7 @@ class NewHeader extends Component {
              )
            })
          }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
+          <li><Link to={`/settings/profile`}>设置</Link></li>
        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
      </Menu>
    )
@ -347,7 +362,7 @@ class NewHeader extends Component {
      })
    }
-    // let search_url = settings && settings.common && settings.common.search;
+    let search_url = settings && settings.common && settings.common.search;
    let notice_url = settings && settings.common && settings.common.notice;
    return (
      <div className="newHeaders" id="nHeader">
@ -385,16 +400,16 @@ class NewHeader extends Component {
                    if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
                      if (user_login) {
                        if (new_link.indexOf("courses") > -1) {
-                          new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
+                          new_link = new_link.replace(/courses/g, user_login + "/courses")
                        } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+                          new_link = new_link.replace(/contests/g, user_login + "/contests")
                        }
                      } else {
                        is_hidden = true
                      }
                    }
                    if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+                      new_link = new_link.replace(/homes/g, user_login + "/user_activities")
                    }
                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@ -412,7 +427,7 @@ class NewHeader extends Component {
          </div>
          <div className="head-right">
            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            { search_url && <HeadSearch {...this.props}/>}
            {
              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@ -442,7 +457,7 @@ class NewHeader extends Component {
            </span>
            :
            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
-              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+              <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
              </a>
            </Dropdown>
--- a/src/forge/Head/header.css
+++ b/src/forge/Head/header.css
@ -0,0 +1,133 @@
 .dropdownFlex {
  display: flex;
  background: #fff;
  border-radius: 3px;
 }
 .dropdownFlex .ant-menu-vertical > .ant-menu-item {
  border: none;
  height: 35px;
  line-height: 35px;
  margin: 0px;
 }
 .dropdownFlex .ant-menu-vertical > .ant-menu-item.ant-menu-item-selected {
  background-color: #fff;
 }
 .dropdownFlex .ant-menu-vertical > .ant-menu-item.ant-menu-item-selected a {
  color: rgba(0, 0, 0, 0.65) !important;
 }
 .dropdownFlex .ant-menu-vertical > .ant-menu-item.ant-menu-item-active a {
  color: #4cacff !important;
 }
 .dropdownFlex .ant-menu-vertical {
  border: none;
 }
 .currentImg {
  width: 34px;
  height: 34px;
  border-radius: 50%;
  margin-left: 30px;
 }
 .currentMenu {
  width: 120px;
  text-align: center;
  padding: 0px;
 }
 .currentMenu .currentName {
  padding: 0px 8px;
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
  display: block;
 }
 .currentMenu li {
  height: 40px;
  line-height: 40px;
  padding: 0px !important;
  cursor: default;
 }
 .currentMenu li:hover {
  background-color: #fff;
 }
 .currentMenu li:first-child {
  border-bottom: 1px solid #eee;
 }
 .currentMenu li:last-child {
  border-top: 1px solid #eee;
 }
 .currentMenu li:last-child a {
  border-radius: 0px 0px 4px 4px;
 }
 .currentMenu li a {
  padding: 0px;
  margin: 0px;
  display: block;
  color: #666;
 }
 .currentMenu li a:hover {
  color: #fff;
  background: #4CACFF;
 }
 .newFooter {
  position: absolute;
  bottom: 0;
  width: 100%;
  background: #323232;
  clear: both;
  min-width: 1200px;
  z-index: 8;
  left: 0px;
 }
 .newFooter p {
  margin-top: 0;
  margin-bottom: 0px !important;
 }
 .newFooter .footerInfos {
  display: flex;
  max-width: 1200px;
  margin: 0px auto;
  justify-content: space-around;
  padding: 60px 0px;
 }
 .newFooter .footerInfos > ul {
  padding: 0px 40px;
  box-sizing: border-box;
  max-width: 25%;
  text-align: left;
 }
 .newFooter .footerInfos > ul li {
  color: #fff;
  font-weight: 300;
 }
 .newFooter .footerInfos > ul li:first-child {
  font-size: 17px;
 }
 .newFooter .footerInfos > ul li > a, .newFooter .footerInfos > ul li > span {
  color: #bbb;
 }
 .newFooter .footerInfos > ul li > a:hover {
  color: #4cacff;
 }
 .newFooter .footerCopy {
  color: #bbb;
  border-top: 1px solid #4e4e4e;
  padding: 10px 0px;
 }
 .newFooter .footerCopy a {
  color: #bbb;
 }
 .newFooter .footerCopy a:hover {
  color: #4cacff;
 }
 .inviteForm .ant-form-item {
  margin-right: 0px;
 }
 .inviteForm .ant-form-item-label {
  width: 110px;
  text-align: right;
 }
 /*# sourceMappingURL=header.css.map */
--- a/src/forge/Head/header.css.map
+++ b/src/forge/Head/header.css.map
@ -0,0 +1 @@
 {"version":3,"sourceRoot":"","sources":["header.scss"],"names":[],"mappings":"AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EAAE;;AAGF;EAAE;;AAGN;EACE;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;;;AAMN;EACE;;AAEF;EACE;EACA","file":"header.css"}
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -30,6 +30,13 @@
  width: 120px;
  text-align: center;
  padding:0px;
  .currentName{
    padding:0px 8px;
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
    display: block;
  }
  li{
    height: 40px;
    line-height: 40px;
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -12,8 +12,9 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
  loading: Loading,
 });
 const ProjectIndex = Loadable({
@ -21,21 +22,23 @@ const ProjectIndex = Loadable({
  loading: Loading,
 });
-const ProjectDetail = Loadable({
+// 项目详情放在用户和组织下作为二级菜单存在
-  loader: () => import("./Main/Detail"),
+// const ProjectDetail = Loadable({
-  loading: Loading,
+//   loader: () => import("./Main/Detail"),
-});
+//   loading: Loading,
 // });
 class Index extends Component {
-  componentDidUpdate=()=>{
+  componentDidUpdate = () => {
-    this.props.history.listen(()=>{
+    this.props.history.listen(() => {
      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
        window.scrollTo(0, 0)
      }
    })
  }
  render() {
    return (
      <div className="newMain clearfix">
        <Switch {...this.props}>
@ -52,23 +55,24 @@ class Index extends Component {
            )}
          ></Route>
          <Route
-            path="/projects/new"
+            path="/projects/mirror/new"
            render={(props) => (
              <ProjectNew {...this.props} {...props} />
            )}
          ></Route>
-          <Route
+          {/* <Route
-            path="/projects/:owner/:projectsId"
+            path="/:owner/:projectsId"
            render={(props) => (
              <ProjectDetail {...this.props} {...props} />
            )}
-          ></Route>
+          ></Route> */}
          <Route
-            path="/projects"
+            path="/explore"
            render={(props) => (
              <ProjectIndex {...this.props} {...props} />
            )}
          ></Route>
          <Route
            path="/"
            render={(props) => (
@ -86,3 +90,10 @@ export default withRouter(
    parentSelector: ".newMain",
  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
 // export default withRouter(
 //   ImageLayerOfCommentHOC({
 //     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
 //     parentSelector: ".newMain",
 //   })(Index)
 // );
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -1,6 +1,6 @@
 import React , { useEffect , useState } from 'react';
 import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ  } from '../Component/layout';
-import { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
 import CloneAddress from '../Branch/CloneAddress';
@ -20,10 +20,11 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
 import Invite from './sub/Invite';
 import CheckProfile from '../Component/ProfileModal/Profile';
 /**
 * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
 */
- const { Paragraph } = Typography;
+
 function turnbar(str){
  if(str && str.length>0 && str.indexOf("/")>-1){
    return str.replaceAll('/','%2F');
@ -112,7 +113,7 @@ function CoderDepot(props){
  useEffect(()=>{
    if (projectsId && owner && defaultBranch){
      let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+      if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
        let url = pathname.split(`/tree/${b}/`)[1];
        setTreeValue(url);
        getFileInfo(url,branchName);
@ -147,6 +148,7 @@ function CoderDepot(props){
        setReadme(result.data.readme);
        setEditReadme(false);
        setHide(true);
        console.log("dddd:",result.data.entries);
      }
      setTimeout(function(){setIsSpin(false);},500);
    }).catch(error=>{setIsSpin(false);})
@ -198,7 +200,7 @@ function CoderDepot(props){
  // 切换分支或者标签
  function changeBranch(value){
    let checkvalue = turnbar(value);
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
    props.history.push(url);
  }
@ -208,8 +210,12 @@ function CoderDepot(props){
    let checkvalue = turnbar(b);
    return (
    <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+        <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</CheckProfile>
      </Menu.Item>
      <Menu.Item>
        <CheckProfile  {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</CheckProfile>
      </Menu.Item>
    </Menu>
    )
  }
@ -228,12 +234,12 @@ function CoderDepot(props){
    setTreeValue(undefined);
    let branch = branchName || defaultBranch;
    let checkvalue = turnbar(branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
  };
  // 子目录路径返回链接
  function returnUlr(url){
    let enBranch = turnbar(branchName);
-    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
  }
  // 点击跳转到子目录
  function goToSubRoot(path,type,filename){
@ -241,7 +247,7 @@ function CoderDepot(props){
      let enBranch = branchName || defaultBranch;
      let checkvalue = turnbar(enBranch);
      setType(type);
-      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+      props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
    }
  }
@ -253,7 +259,7 @@ function CoderDepot(props){
    //点击直接跳转页面 加载一次路由
    let enBranch = branchName || defaultBranch;
    let checkvalue = turnbar(enBranch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
    setType("file");
    setEditReadme(true);
  };
@ -315,7 +321,7 @@ function CoderDepot(props){
              list = {mainFlag ? dirInfo : undefined}
            />
            <div className="drawerBtn" onClick={()=>setVisible(true)}>
-              <i className="iconfont icon-zuohuaicon font-14"></i>
+              <i className="iconfont icon-youjiantou font-16"></i>
              <span>目录</span>
            </div>
          </React.Fragment>
@ -328,7 +334,7 @@ function CoderDepot(props){
                <div className="panelmenu">
                  <FlexAJ>
                    <AlignCenter>
-                      <div className="mr30">
+                      <div className="mr20">
                        {
                          props && props.platform ?
                          <SelectBranch
@ -345,42 +351,45 @@ function CoderDepot(props){
                        }
                      </div>
                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="depotNum">
+                        <Link to={`/${owner}/${projectsId}/branches`} className="color-grey-9">
-                          <i className="iconfont icon-master_icon font-14 mr3"></i>
+                          <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
-                          <span className="mr3">分支</span>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
                          <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
                        </Link>
                      </AlignCenter>
                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="depotNum">
+                        <Link to={`/${owner}/${projectsId}/tags`} className="color-grey-9">
-                          <i className="iconfont icon-biaoqianicon font-14 mr3"></i>
+                          <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
-                          <span className="mr3">标签</span>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
                          <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
                        </Link>
                      </AlignCenter>
                    </AlignCenter>
-                    <AlignCenter className="depotBtn">
+                    <AlignCenter>
                      {
-                        baseOperate && projectDetail.type !== 2 && pullsFlag &&
+                        baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 合并请求</Button>
+                        <div className="mr20 addOptionBtn">
-                      }
+                          {
-                      {
+                            projectDetail.type !== 2 && pullsFlag &&
-                        baseOperate && issuesFlag &&
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</CheckProfile>
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 任务</Button>
+                          }
                          {
                            issuesFlag &&
                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 任务</CheckProfile>
                          }
                        </div>
                      }
                      { fileOperate &&
-                        <Dropdown overlay={fileMenu()} className="mr10" trigger={['click']}>
+                        <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
-                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></Button>
+                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
                        </Dropdown>
                      }
                      <Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
-                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white mr-3"></i></Button>
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
                      </Dropdown>
                    </AlignCenter>
                  </FlexAJ>
                  {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || fileInfo ?
                    <div className="listtable">
                      {
                        lastCommit &&
@ -390,14 +399,11 @@ function CoderDepot(props){
                            <pre id="ptxt">{lastCommit && lastCommit.message}</pre>
                          </div>
                          { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
-                         
+
-                          <span className="ml20 color-grey-9 mt1">{lastCommit && lastCommit.time_from_now}</span>
+                          <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
-                          { 
+                          { commitCount ? <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
-                            commitCount ? 
+                            <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
-                            <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-9" style={{height:"30px",lineHeight:"30px"}}>
+                          </Link>:"" }
                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i>{commitCount}次提交
                            </Link>:"" 
                          }
                        </div>
                      }
                      <ul className="listtablebody">
@ -434,14 +440,14 @@ function CoderDepot(props){
                            onEdit={onEdit}
                            currentBranch={branchName || defaultBranch}
                            type={projectDetail.type}
-                          ></CoderRootFileDetail>[[]]
+                          ></CoderRootFileDetail>
                        }
                      </ul>
                    </div>
                    : ""
                  }
                  {
-                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                    (dirInfo && dirInfo.length === 0) && !fileInfo ? <Nodata _html="暂未发现文件"/> :""
                  } 
                  {/* readme文件显示(显示文件详情时不显示readme文件) */}
                  { dirInfo && (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
@ -452,47 +458,48 @@ function CoderDepot(props){
                <ShortWidth>
                  <Gap style={{paddingLeft:"30px"}}>
                    <div className="panelmenu">
-                      <FlexAJ className="font-16 color-ooo mb10" style={{lineHeight:"22px"}}>关于
+                      <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
-                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && 
+                        {
-                          <a className="color-grey-6" href="javascript:void(0)"><i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi font-15"></i></a>
+                        projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && 
                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>
                        }
                      </FlexAJ>
-                      {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
+                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
                      {
                        website &&
-                        <div className="color-grey-6 df pinfos mb5">
+                        <p className="color-grey-6 df">
-                          <i className="iconfont icon-lianjie2 font-15 mr10"></i>
+                          <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                          <a href={website} className="color-grey-6" target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
-                        </div>
+                        </p>
                      }
-                      <div className="pinfos mb5">
+                      <p>
-                        <i className="iconfont icon-zishuwenjian_icon font-15 mr10"></i>
+                        <i className="iconfont icon-wenjian4 font-15 mr10 color-grey-9"></i>
-                        <a href="#readme">README.md</a>
+                        <a href="#readme" className="color-grey-6">README.md</a>
-                      </div>
+                      </p>
-                      <div className="color-grey-6 mb5">
+                      <p className="color-grey-6">
-                        <i className="iconfont icon-neicunicon font-15 mr10"></i>
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-6"></i>
                        <span>{projectDetail && projectDetail.size}</span>
-                      </div>
+                      </p>
                      {
                        projectDetail && projectDetail.license_name &&
-                        <div>
+                        <p className="color-grey-6">
-                          <i className="iconfont icon-xieyiicon font-16 mr10 color-grey-6"></i>
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
-                          <span className="color-grey-6">{projectDetail.license_name}</span>
+                          <span>{projectDetail.license_name}</span>
-                        </div>
+                        </p>
                      }
                    </div>
                    {
                      inviteCode && 
                      <div>
                        <Divider />
-                        <Invite code={inviteCode}/>
+                        <Invite code={inviteCode} className={"detailsCode"}/>
                      </div>
                    }
                    {
                      lesson_url &&
                      <div>
                        <Divider />
-                        <p className="font-16 color-ooo">实践课程</p>
+                        <p className="font-16 color-grey-6">实践课程</p>
                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline",wordBreak:"break-all"}}>{lesson_url}</a>
                      </div>
                    }
@ -501,7 +508,7 @@ function CoderDepot(props){
                      projectDetail && projectDetail.release_versions &&
                      <React.Fragment>
                        <Divider />
-                        <Releases
+                        <Releases 
                          owner={owner} 
                          projectsId={projectsId} 
                          releaseVersions={projectDetail.release_versions} 
@ -513,16 +520,11 @@ function CoderDepot(props){
                    }
                    {/* 贡献者 */}
                    {
-                      projectDetail && projectDetail.contributors &&
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.length >0 && 
-                      <Contributors 
+                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                        contributors={projectDetail && projectDetail.contributors} 
                        owner={owner} 
                        projectsId={projectsId} 
                        currentLogin={current_user && current_user.login}
                      />
                    }
                    {/* 语言 */}
-                    { projectDetail && projectDetail.languages && 
+                    { projectDetail && projectDetail.languages && projectDetail.languages.length >0 &&
                      <React.Fragment>
                        <Divider />
                        <LanguagePower languages={projectDetail.languages}/>
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util';
 const typeIco = {
  "submodule":"icon-file-submodule font-17",
-  "file":'icon-wenjian6 font-15',
+  "file":'icon-wenjian5 font-15',
-  "dir":"icon-wenjianjia4 font-15"
+  "dir":"icon-wenjianjia3 font-15"
 }
 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
@ -13,11 +13,11 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
    <li>
      <span>
        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
-          <i className={`iconfont ${typeIco[`${item.type}`]} color-blue-file mr8`}></i>{item.name}
+          <i className={`iconfont ${typeIco[`${item.type}`]} color-blue-file mr5`}></i>{item.name}
        </a>
      </span>
      <span title="init project">
-        <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
+        <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
          {item.commit && item.commit.message}
        </Link>
      </span>
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@ -1,7 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import RenderHtml from '../../components/render-html';
 import { AlignCenter } from '../Component/layout';
-import { Dropdown , Anchor , Spin } from 'antd';
+import { Dropdown , Menu , Spin } from 'antd';
 import { Link } from 'react-router-dom';
 import ReadmeCatelogue from './sub/ReadmeCatelogue';
 const $ = window.$;
@ -32,35 +33,32 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
  function menu(){
    if(menuList && menuList.length > 0){
      return(
-        <ReadmeCatelogue menuList={menuList} hash={history.location.hash}/>
+        <ReadmeCatelogue menuList={menuList}/>
      )
    }else{
      return <Spin />
    }
  }
  return(
    <div className="commonBox readBox" id="readme">
-      <Anchor offsetTop={70} targetOffset={160}>
+      <div className="commonBox-title boxTitle">
-        <div className="commonBox-title boxTitle">
+        <AlignCenter>
-          <AlignCenter>
+          <Dropdown overlay={menu()} trigger={['click']} overlayClassName="menuslist">
-            <Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist">
+            <span className="catelogue">
-              <span className="catelogue">
+              <i className="iconfont icon-zhangjie1 font-14 mr5"></i>
-                <i className="iconfont icon-muluicon font-12 mr5"></i>
+              <span>目录</span>
-                <span>目录</span>
+            </span>
-              </span>
+          </Dropdown>
-            </Dropdown>
+          <span className="commonBox-title-read">README.md</span>
-            <span className="commonBox-title-read">README.md</span>
+        </AlignCenter>
-          </AlignCenter>
+        {
-          {
+          operate ?
-            operate ?
+            <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
-              <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
+              <i className="iconfont icon-a-bianji font-17 color-grey-6"></i>
-                <i className="iconfont icon-a-bianji font-17 color-grey-6"></i>
+            </a>
-              </a>
+          :""
-            :""
+        }
-          }
+      </div>
        </div>
      </Anchor>
      {
        content && 
        <div className="commonBox-info">
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -38,9 +38,9 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                    <p className="f-wrap-alignCenter mt15">
-                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
+                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
                      <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
                    </p>
@ -48,7 +48,7 @@ export default ((props)=>{
                  <span>
                    {
                      (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                      <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
                    }
                    <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                      <a className="ant-dropdown-link">
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -101,7 +101,7 @@ class CoderRootCommit extends Component{
  // 切换分支 search:tag为根据标签搜索
  changeBranch=(value)=>{
    const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
+    this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
  }
  ChangePage=(page)=>{
@ -141,13 +141,13 @@ class CoderRootCommit extends Component{
                    return(
                      <div key={k}>
                        <AlignTop>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
                        </AlignTop>
                        <p className="f-wrap-alignCenter mt15">
                          {
                            item.id ?
-                            <Link to={`/users/${item.login}`} className="show-user-link">
+                            <Link to={`/${item.login}`} className="show-user-link">
                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
                            </Link>:
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -149,7 +149,7 @@ class CoderRootFileDetail extends Component {
      .then((result) => {
        if (result) {
          this.props.showNotification("删除成功!");
-          this.props.history.push(`/projects/${owner}/${projectsId}`);
+          this.props.history.push(`/${owner}/${projectsId}`);
        }
      })
      .catch((error) => {
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
        <Top {...this.props} {...this.state}/>
        <Switch {...this.props}>
          {/* 新建文件 */}
-          <Route path="/projects/:owner/:projectsId/:branch/newfile/:path"
+          <Route path="/:owner/:projectsId/:branch/newfile/:path"
            render={
              (props) => (<FileNew {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/uploadfile"
+          <Route path="/:owner/:projectsId/:branch/uploadfile"
            render={
              (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/newfile"
+          <Route path="/:owner/:projectsId/:branch/newfile"
            render={
              (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+          <Route path="/:owner/:projectsId/commits/branch/:branchName"
            render={
              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/:sha"
+          <Route path="/:owner/:projectsId/commits/:sha"
            render={
              (props) => (<Diff {...this.props} {...props} {...this.state}/>)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits"
+          <Route path="/:owner/:projectsId/commits"
            render={
              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
+          <Route path="/:owner/:projectsId/releases/:versionId/update"
            render={
              (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/new"
+          <Route path="/:owner/:projectsId/releases/new"
            render={
              () => (<CoderRootVersionNew {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases"
+          <Route path="/:owner/:projectsId/releases"
            render={
              () => (<CoderRootVersion {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/tag"
+          <Route path="/:owner/:projectsId/tags"
            render={
              () => (<CoderRootTag {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/branchs"
+          <Route path="/:owner/:projectsId/branches"
            render={
              () => (<CoderRootBranch {...this.props} {...this.state} />)
            }
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@ -49,7 +49,7 @@ export default (( props, { projectDetail }) => {
                          <span className="font-16">{item.name}</span>
                        </span>
                        <span className="ul_tbody_third">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                        </span>
                        <span className="ul_tbody_forth">
                          <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -1,11 +1,10 @@
 import React, { Component } from 'react';
 import { Spin, Tooltip, Button } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop, AlignCenter } from '../Component/layout';
+import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import { numFormat } from 'educoder';
 import '../css/index.scss'
-import './list.scss';
+import './list.css';
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
@ -104,12 +103,12 @@ const Contribute = Loadable({
 })
 const CoderRootCommit = Loadable({
-	loader: () => import('./CoderRootCommit'),
+  loader: () => import('./CoderRootCommit'),
-	loading: Loading,
+  loading: Loading,
 })
 const CoderDepot = Loadable({
-	loader: () => import('./CoderDepot'),
+  loader: () => import('./CoderDepot'),
-	loading: Loading,
+  loading: Loading,
 })
 const TrendsIndex = Loadable({
@ -140,28 +139,28 @@ const WikiEdit = Loadable({
 /**
 * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
 */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
  let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+  if (pathname && pathname !== `/${owner}/${projectsId}`) {
-    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
+    let url = pathname.split(`/${owner}/${projectsId}`)[1];
-    if(url.indexOf("/about")>-1){
+    if (url.indexOf("/about") > -1) {
-      name="about"
+      name = "about"
-    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
+    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
      name = "issues";
-    }else if(url.indexOf("/pulls")>-1){
+    } else if (url.indexOf("/pulls") > -1) {
-      name="pulls"
+      name = "pulls"
-    }else if(url.indexOf("/milestones")>-1){
+    } else if (url.indexOf("/milestones") > -1) {
-      name="milestones"
+      name = "milestones"
-    }else if(url.indexOf("/activity")>-1){
+    } else if (url.indexOf("/activity") > -1) {
-      name="activity"
+      name = "activity"
-    }else if(url.indexOf("/setting")>-1){
+    } else if (url.indexOf("/settings") > -1) {
-      name="setting"
+      name = "settings"
-    }else if(url.indexOf(`/devops`)>-1){
+    } else if (url.indexOf(`/devops`) > -1) {
-      name="devops"
+      name = "devops"
-    }else if(url.indexOf(`/source`)>-1){
+    } else if (url.indexOf(`/source`) > -1) {
-      name="source"
+      name = "source"
-    }else if(url.indexOf(`/wiki`)>-1){
+    } else if (url.indexOf(`/wiki`) > -1) {
-      name="wiki"
+      name = "wiki"
    }
  }
  return name;
@ -184,15 +183,15 @@ class Detail extends Component {
      branchs: undefined,
      branchList: undefined,
      project: null,
-      firstSync:false,
+      firstSync: false,
-      secondSync:false,
+      secondSync: false,
-      open_devops:false,
+      open_devops: false,
-      forkSpin:false,
+      forkSpin: false,
      // 默认分支
-      defaultBranch:undefined,
+      defaultBranch: undefined,
      // 非本平台项目
-      platform:false
+      platform: false
    }
  }
@ -209,36 +208,38 @@ class Detail extends Component {
  }
  getProject = (num) => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/simple.json`;
    axios.get(url).then((result) => {
      if (result && result.data) {
        this.setState({
          project: result.data,
-          open_devops:result.data.open_devops,
+          open_devops: result.data.open_devops,
-          platform:result.data.platform && result.data.platform !== 'educoder'
+          platform: result.data.platform && result.data.platform !== 'educoder'
        })
        if (result.data.type !== 0 && result.data.mirror_status === 1) {
          console.log("--------start channel --------");
          // 是镜像项目，且未完成迁移
          this.canvasChannel();
-          if(num){
+          if (num) {
            this.setState({
-              secondSync:true,
+              secondSync: true,
-              firstSync:false
+              firstSync: false
            })
-          }else{
+          } else {
            this.setState({
-              firstSync:true,
+              firstSync: true,
-              secondSync:false
+              secondSync: false
            })
          }
-        }else{
+        } else if (result.data.mirror_status === 2) {
          this.deleteProjectBack();
        } else {
          this.getDetail();
          this.setState({
-            firstSync:false,
+            firstSync: false,
-            secondSync:false
+            secondSync: false
          })
        }
      }
@ -246,9 +247,9 @@ class Detail extends Component {
  }
  // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
    this.setState({
-      open_devops:flag
+      open_devops: flag
    })
  }
  canvasChannel = () => {
@ -266,11 +267,15 @@ class Detail extends Component {
      disconnected: () => { },
      received: data => {
        console.log(`###### ---received data--- ######`);
        console.log(data);
        if (data) {
          if ( data.project && data.project.mirror_status === 2) {
            this.deleteProjectBack();
          }
          this.getDetail();
          this.setState({
-            firstSync:false,
+            firstSync: false,
-            secondSync:false
+            secondSync: false
          });
          cable.subscriptions.consumer.disconnect();
        }
@ -278,8 +283,25 @@ class Detail extends Component {
    })
  }
  deleteProjectBack = () => {
    const { history } = this.props;
    const { projectsId, owner } = this.props.match.params;
    axios.delete(`/${owner}/${projectsId}.json`).then(res => {
      let hash = '/projects/mirror/new';
      if (res && res.data) {
        history.push({
          pathname: hash,
          mirror_status: 2
        });
      }
      else {
        window.location.hash = hash;
      }
    });
  }
  getDetail = () => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    this.getBanner();
    const url = `/${owner}/${projectsId}/detail.json`;
    axios.get(url).then((result) => {
@ -296,29 +318,29 @@ class Detail extends Component {
          watchers_count: result.data.watchers_count,
          praises_count: result.data.praises_count,
          forked_count: result.data.forked_count,
-          defaultBranch:result.data.default_branch
+          defaultBranch: result.data.default_branch
        })
      }
    }).catch((error) => { })
  }
  // 获取动态导航栏菜单
-  getBanner(){
+  getBanner() {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result=>{
+    axios.get(url).then(result => {
-      if(result){
+      if (result) {
        this.setState({
-          bannerList:result.data
+          bannerList: result.data
        })
      }
-    }).catch(error=>{})
+    }).catch(error => { })
  }
  // 关注和取消关注
  focusFunc = (flag) => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
    const { project_id } = this.state;
    axios({
@ -333,15 +355,15 @@ class Detail extends Component {
        this.setWatchersCount(result.data.watchers_count, result.data.watched);
      }
    })
-    .catch(error => {
+      .catch(error => {
-      console.log(error);
+        console.log(error);
-    });
+      });
  }
  // 点赞和取消点赞
  pariseFunc = (flag) => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
    const { project_id } = this.state;
    axios({
      method: flag ? 'delete' : 'post',
@ -351,9 +373,9 @@ class Detail extends Component {
        this.setPraisesCount(result.data.praises_count, result.data.praised)
      }
    })
-    .catch(error => {
+      .catch(error => {
-      console.log(error);
+        console.log(error);
-    });
+      });
  }
  setWatchersCount = (count, is_watched) => {
@ -373,24 +395,24 @@ class Detail extends Component {
  // fork项目
  forkFunc = () => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
    this.setState({
-      forkSpin:true
+      forkSpin: true
    })
    const { current_user } = this.props
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/forks.json`;
    axios.post(url).then(result => {
      if (result && result.data.status === 0) {
-        this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
+        this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`);
        this.props.showNotification(result.data.message);
      }
      this.setState({
-        forkSpin:false
+        forkSpin: false
      })
    }).catch(error => {
      this.setState({
-        forkSpin:false
+        forkSpin: false
      })
    })
  }
@ -398,8 +420,8 @@ class Detail extends Component {
  // 同步镜像
  synchronismMirror = () => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/sync_mirror.json`;
    axios.post(url).then(result => {
      if (result && result.data && result.data.status === 0) {
@ -413,345 +435,345 @@ class Detail extends Component {
    })
  }
-  textFunc = (forked_from_project_id,fork_info)=>{
+  textFunc = (forked_from_project_id, fork_info) => {
    let type = fork_info && fork_info.fork_project_user_type;
    return forked_from_project_id && fork_info ?
      <div className="color-grey-9 df">
        <span>复刻自</span>
-        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
        <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
      </div> : ""
  }
  render() {
-    const { projectDetail, watchers_count, praises_count, 
+    const { projectDetail, watchers_count, praises_count,
-      forked_count, firstSync , secondSync , 
+      forked_count, firstSync, secondSync,
-      isManager, watched, praised, 
+      isManager, watched, praised,
-      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
+      project, open_devops, platform, defaultBranch, bannerList, forkSpin } = this.state;
    const url = this.props.history.location.pathname;
    const urlArr = url.split("/");
    const urlFlag = (urlArr.length === 3);
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const { current_user } = this.props;
-    let pathname = checkPathname(projectsId,owner,url);
+    let pathname = checkPathname(projectsId, owner, url);
    const { state } = this.props.history.location;
-    
+
    const common = {
      getDetail: this.getDetail,
-      changeOpenDevops:this.changeOpenDevops,
+      changeOpenDevops: this.changeOpenDevops,
      defaultBranch
    }
    return (
      <div>
        <div className="detailHeader-wrapper">
          <div className="normal">
-            <AlignCenter style={{paddingTop:"20px",justifyContent:"space-between"}}>
+            <AlignTop style={{ padding: "20px 0px 10px", justifyContent: "space-between" }}>
-              
+              <div>
                <AlignTop>
                  <div className="projectallName">
                    {project && project.author &&
-                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} title={project.author.name}>{project.author.name}</Link>
+                      <Link to={`/${project.author.login}`}>{project.author.name}</Link>
                    }
                    <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN" title={projectDetail && projectDetail.name}>{projectDetail && projectDetail.name}</Link>
+                    <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                  </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag">私有</span>}
+                  {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                </AlignTop>
-                
+                <div className="mt8">
                  {
                    projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
                      this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
                      : ""
                  }
                  {
                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
                      <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
                      : ""
                  }
                </div>
              </div>
              <div>
                {
-                  firstSync ? "":
+                  firstSync ? "" :
-                  <span className="df">
+                    <span className="df">
                    {
                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
                      <a size="middle" className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
                    }
                    <span className="detail_tag_btn">
                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
                        <i className={watched ? "iconfont icon-quxiaoguanzhu color-blue font-14 mr3":"iconfont icon-morenguanzhu_ICON color-grey-9 font-14 mr3"}></i>
                        <span>{watched ? '取消关注' : '关注'}</span>
                      </a>
                      {
-                        watchers_count > 0 ?
+                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                        platform ?
+                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
                        <Link className="detail_tag_btn_count" to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
                          {numFormat(watchers_count)}
                        </Link>
                        :
                        <span className="detail_tag_btn_count">{watchers_count}</span>
                        :""
                      }
-                    </span>
+                      <Button className="detail_tag_btn">
-                    <span className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.focusFunc(watched)}>
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
+                          <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3" : "iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                        <i className={praised ? "iconfont icon-dianzan_icon color-blue font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{watched ? '取消关注' : '关注'}</span>
                        <span>{praised ? '取消点赞' : '点赞'}</span>
                      </a>
                      {
                        praises_count > 0 ?
                        platform ?
                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
                          {numFormat(praises_count)}
                        </Link>:
                        <span className="detail_tag_btn_count">{praises_count}</span>
                        :""
                      }
                    </span>
                    <span className="detail_tag_btn" loading={forkSpin}>
                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
                          <i className="iconfont icon-fork color-grey-9 mr3 font-16"></i>
                          <span>复刻</span>
                        </a>
-                      </Tooltip>
+                        {
-                      {
+                          watchers_count > 0 ?
-                        forked_count > 0 ?
+                            platform ?
-                        platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/${owner}/${projectsId}/following`, state } : ""}>
-                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                                {watchers_count}
-                          {numFormat(forked_count)}
+                              </Link>
-                        </Link>
+                              :
-                        :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
-                        <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
-                        :""
+                        }
-                      }
+                      </Button>
                      <Button className="detail_tag_btn">
                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.pariseFunc(praised)}>
                          <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3" : "iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
                          <span>{praised ? '取消点赞' : '点赞'}</span>
                        </a>
                        {
                          praises_count > 0 ?
                            platform ?
                              <Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/${owner}/${projectsId}/stargazers`, state }}>
                                {praises_count}
                              </Link> :
                              <span className="detail_tag_btn_count">{praises_count}</span>
                            : ""
                        }
                      </Button>
                      <Button className="detail_tag_btn" loading={forkSpin}>
                        <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
                          <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
                            <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
                          </a>
                        </Tooltip>
                        {
                          forked_count > 0 ?
                            platform ?
                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/members`, state }}>
                                {forked_count}
                              </Link>
                              :
                              <span className="detail_tag_btn_count">{forked_count}</span>
                            : ""
                        }
                      </Button>
                    </span>
                  </span>
                }
              </div>
-            </AlignCenter>
+            </AlignTop>
            <div className="mt6" style={{minHeight:"20px"}}>
              {
                projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
                this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
                :""
              }
              {
                projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
                <span className="color-grey-9">镜像自 <a className="color-blue hoverLine" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
                :""
              }
            </div>
            {
              firstSync ? "" :
-              <DetailBanner 
+                <DetailBanner
-                history={this.props.history}
+                  history={this.props.history}
-                list={bannerList}
+                  list={bannerList}
-                owner={owner}
+                  owner={owner}
-                projectsId={projectsId}
+                  projectsId={projectsId}
-                pathname={pathname}
+                  pathname={pathname}
-                state={state}
+                  state={state}
-                projectDetail={projectDetail}
+                  projectDetail={projectDetail}
-                open_devops={open_devops}
+                  open_devops={open_devops}
-                platform={platform}
+                  platform={platform}
-                urlFlag={urlFlag}
+                  urlFlag={urlFlag}
-                isManager={isManager}
+                  isManager={isManager}
-              />
+                />
            }
          </div>
        </div>
        {
          firstSync ?
-          <Content className="spincontent">
+            <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
-          </Content>
+            </Content>
-          :
+            :
-          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
-            <Switch {...this.props}>
+              <Switch {...this.props}>
-              {/* 资源 */}
+                {/* 资源 */}
-              <Route path="/projects/:owner/:projectsId/source"
+                <Route path="/:owner/:projectsId/source"
-                render={
+                  render={
-                  () => (<Source {...this.props} {...this.state} {...common} />)
+                    () => (<Source {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 主页 */}
+                {/* 主页 */}
-              <Route path="/projects/:owner/:projectsId/about"
+                <Route path="/:owner/:projectsId/about"
-                render={
+                  render={
-                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* wiki新增文件 */}
+                {/* wiki新增文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/add"
+                <Route path="/:owner/:projectsId/wiki/add"
-                render={
+                  render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* wiki编辑文件 */}
+                {/* wiki编辑文件 */}
-              <Route path="/projects/:owner/:projectsId/wiki/edit/:wikiName"
+                <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
-                render={
+                  render={
-                  () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* wiki */}
+                {/* wiki */}
-              <Route path="/projects/:owner/:projectsId/wiki"
+                <Route path="/:owner/:projectsId/wiki"
-                render={
+                  render={
-                  () => (<Wiki {...this.props} {...this.state} {...common} />)
+                    () => (<Wiki {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 工作流 */}
+                {/* 工作流 */}
-              <Route path="/projects/:owner/:projectsId/devops"
+                <Route path="/:owner/:projectsId/devops"
-                render={
+                  render={
-                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 标签列表 */}
+                {/* 标签列表 */}
-              <Route path="/projects/:owner/:projectsId/issues/tags"
+                <Route path="/:owner/:projectsId/issues/tags"
-                render={
+                  render={
-                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 仓库设置 */}
+                {/* 仓库设置 */}
-              <Route path="/projects/:owner/:projectsId/setting"
+                <Route path="/:owner/:projectsId/settings"
-                render={
+                  render={
-                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 任务详情 */}
+               
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
+                {/*修改里程碑*/}
-                render={
+                <Route path="/:owner/:projectsId/milestones/:meilid/edit"
-                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/*修改里程碑*/}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
+                {/* 新建里程碑 */}
-                render={
+                <Route path="/:owner/:projectsId/milestones/new"
-                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 新建里程碑 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/milestones/new"
+                {/*里程碑详情*/}
-                render={
+                <Route path="/:owner/:projectsId/milestones/:meilid"
-                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/*里程碑详情*/}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
+                {/* 里程碑 */}
-                render={
+                <Route path="/:owner/:projectsId/milestones"
-                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 里程碑 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/milestones"
+                {/* 里程碑页面新建任务 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:milepostId/new"
-                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 里程碑页面新建任务 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
+                {/* 新建任务 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/new"
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 新建任务 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/new"
+                {/* 修改详情 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 修改详情 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
+                {/* 复制详情 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
-                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 复制详情 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
+                 {/* 任务详情 */}
-                render={
+                 <Route path="/:owner/:projectsId/issues/:orderId"
-                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-              ></Route>
+                  }
-              {/* 动态 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/activity"
+                {/* 动态 */}
-                render={
+                <Route path="/:owner/:projectsId/activity"
-                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 代码Index */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues"
+                {/* 代码Index */}
-                render={
+                <Route path="/:owner/:projectsId/issues"
-                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 新建合并请求 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
+                {/* 新建合并请求 */}
-                render={
+                <Route path="/:owner/:projectsId/pulls/new/:branch"
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  render={
-                }
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-              ></Route>
+                  }
-              <Route path="/projects/:owner/:projectsId/pulls/new"
+                ></Route>
-                render={
+                <Route path="/:owner/:projectsId/pulls/new"
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  render={
-                }
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-              ></Route>
+                  }
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                ></Route>
-                render={
+                <Route path="/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
-                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                ></Route>
-                render={
+                <Route path="/:owner/:projectsId/pulls/:mergeId/Messagecount"
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                ></Route>
-                render={
+                <Route path="/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
                ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls"
+                <Route path="/:owner/:projectsId/pulls"
-                render={
+                  render={
-                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/watchers"
+                <Route path="/:owner/:projectsId/following"
-                render={
+                  render={
-                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/stargazers"
+                <Route path="/:owner/:projectsId/stargazers"
-                render={
+                  render={
-                  (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/fork_users"
+                <Route path="/:owner/:projectsId/members"
-                render={
+                  render={
-                  (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 贡献者列表 */}
+                {/* 贡献者列表 */}
-              <Route path="/projects/:owner/:projectsId/contribute"
+                <Route path="/:owner/:projectsId/contribute"
-                render={
+                  render={
-                  () => (<Contribute {...this.props} {...this.state} {...common} />)
+                    () => (<Contribute {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 代码库----详情页面 */}
+                {/* 代码库----详情页面 */}
-              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+                <Route path="/:owner/:projectsId/commits/branch/:branchName"
-                render={
+                  render={
-                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/tree/:branchName"
+                <Route path="/:owner/:projectsId/tree/:branchName"
-                render={
+                  render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/:subIndex"
+                <Route path="/:owner/:projectsId/:subIndex"
-                render={
+                  render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId"
+                <Route path="/:owner/:projectsId"
-                render={
+                  render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-            </Switch>
+              </Switch>
-          </Spin>
+            </Spin>
        }
      </div>
    )
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@ -12,19 +12,19 @@ class DetailTop extends Component {
        {
          platform ?
          <React.Fragment>
-            <Link to={`/projects/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
              <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
              <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
              <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
              <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
              <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
              <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
              <i className="iconfont icon-fahangban font-18 mr3"></i>
              <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
            </Link>
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -59,7 +59,7 @@ export default ({ match , history }) => {
              {commit && commit.message &&
                <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
              }
-              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
            </div>
          </div>
          <div className="f-wrap-between" style={{ alignItems: "center" }}>
--- a/src/forge/Main/Index.css
+++ b/src/forge/Main/Index.css
@ -106,30 +106,6 @@
 .Panels .panelmenu {
  padding-top: 30px;
 }
 .Panels .panelmenu .depotBtn .mr-5 {
  margin-right: -5px;
 }
 .Panels .panelmenu .depotBtn .ant-btn {
  height: 36px;
  line-height: 34px;
  width: 83px;
  text-align: center;
  padding: 0px;
  font-weight: 500;
  font-size: 14px;
 }
 .Panels .panelmenu .depotBtn .ant-btn-default {
  color: #333;
  border-color: #d0d0d0;
 }
 .Panels .panelmenu .depotBtn .ant-btn-default:hover {
  background: #F3F4F6;
 }
 .Panels .panelmenu .depotBtn .ant-btn-primary {
  color: #fff;
  background-color: #466AFF;
  opacity: 0.8;
 }
 .Panels .addOptionBtn {
  height: 32px;
  line-height: 30px;
@ -161,18 +137,17 @@
  font-size: 12px;
 }
 .Panels .attrPerson {
-  padding-top: 12px;
+  padding-top: 15px;
  display: flex;
  flex-wrap: wrap;
  padding-bottom: 2px;
 }
 .Panels .attrPerson a {
-  margin: 0px 17px 0px 0px;
+  margin: 10px 10px 0px 0px;
 }
 .Panels .attrPerson a img {
  border-radius: 50%;
-  width: 40px;
+  width: 35px;
-  height: 40px;
+  height: 35px;
 }
 .Panels .attrPerson a:nth-child(6) {
  margin-right: 0px;
@ -206,18 +181,18 @@
  padding-left: 15px;
  position: relative;
  min-width: 33.5%;
-  font-size: 12px;
+}
-  font-weight: 400;
+.Panels .progresstip > span span {
  color: #666;
 }
 .Panels .progresstip > span span:last-child {
  color: #999;
  margin-left: 5px;
 }
 .Panels .listtable {
  margin-top: 20px;
 }
 .Panels .listtable .listtablehead {
  height: 55px;
  display: flex;
  justify-content: space-between;
  align-items: flex-start;
@ -225,7 +200,6 @@
  padding: 13px 20px;
  border-radius: 4px 4px 0px 0px;
  border: 1px solid rgba(42, 97, 255, 0.23);
  background-color: #FAFCFF;
 }
 .Panels .listtable .listtablehead .ellipsistxt {
  margin-top: 6px;
@ -255,6 +229,12 @@
  position: relative;
  padding-right: 8px;
 }
 .Panels .listtable .listtablehead .ellipsistxt.hidetxt::after {
  position: absolute;
  right: 0px;
  bottom: 0px;
  content: "...";
 }
 .Panels .listtable .listtablehead .ellipsis {
  margin-left: 8px;
  cursor: pointer;
@ -285,7 +265,7 @@
  margin-bottom: 0px !important;
 }
 .Panels .listtable .listtablebody > li {
-  height: 38px;
+  height: 44px;
  display: flex;
  justify-content: space-between;
  align-items: center;
@ -318,10 +298,8 @@
 .drawerBtn {
  position: fixed;
  left: -13px;
-  width: 33px;
+  border: 1px solid #cfcddf;
-  background: #FFFFFF;
+  width: 34px;
  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
  border: 1px solid #666666;
  border-radius: 0px 12px 12px 0px;
  height: 70px;
  top: 50%;
@ -329,47 +307,39 @@
  cursor: pointer;
  display: flex;
  flex-direction: column;
-  align-items: center;
+  align-items: flex-end;
  justify-content: center;
  padding-left: 7px;
 }
 .drawerBtn:hover {
-  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
+  box-shadow: 1px 0px 7px rgba(0, 0, 0, 0.1);
 }
 .drawerBtn span {
  writing-mode: vertical-lr;
-  color: #333;
+  color: #202429;
  width: 25px;
  font-size: 14px;
 }
 .drawerBtn i {
-  color: #333;
+  color: #24292e;
-  height: 14px;
+  height: 18px;
-  line-height: 14px;
+  line-height: 18px;
-  width: 14px;
+  width: 18px;
  margin-left: 2px;
  margin-bottom: 3px;
 }
 .downMenu {
-  width: 329px;
+  width: 330px;
  box-shadow: 0px 0px 9px rgba(134, 134, 134, 0.4);
  background-color: #fff;
  box-shadow: 0px 1px 8px 1px rgba(212, 212, 212, 0.5);
  padding-bottom: 14px;
 }
-.downMenu .ant-menu-item {
+.downMenu .ant-menu-vertical .ant-menu-item:hover {
-  height: 50px;
+  background-color: #e6f7ff;
  line-height: 50px;
 }
 .catelogue {
-  cursor: pointer;
+  border: 1px solid lightgray;
  background: #FAFBFC;
  border-radius: 4px;
  border: 1px solid #D0D0D0;
  font-size: 15px;
  font-weight: normal;
-  margin-right: 12px;
+  border-radius: 5px;
  margin-right: 10px;
  padding: 0px 10px;
  height: 30px;
  line-height: 30px;
@ -377,9 +347,6 @@
  display: flex;
  align-items: center;
 }
 .catelogue:hover {
  background-color: #F3F4F6;
 }
 .catelogue span {
  margin-top: 1px;
 }
@ -394,27 +361,4 @@
  color: #05101a;
 }
 .pinfos i, .pinfos a {
  color: #666;
 }
 .pinfos:hover i, .pinfos:hover a {
  color: #466AFF;
 }
 .graph {
  flex: 1;
  margin: 0px 12px;
 }
 .graph .ant-typography {
  white-space: pre-wrap;
  margin-bottom: 0px;
 }
 .ant-anchor-wrapper {
  padding-left: 2px;
 }
 .ant-anchor-wrapper .ant-anchor-ink::before {
  background-color: #fff;
 }
 /*# sourceMappingURL=Index.css.map */
--- a/src/forge/Main/Index.css.map
+++ b/src/forge/Main/Index.css.map
@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AACA;EACE;;AAGA;EAEE;EACA;EACA;;;AAIN;AACA;EACE;EACA;;AACA;EACE;;AAGA;EACE;;AAEF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;EACA;;AACA;EAIE;;AAHA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEE;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAIN;EACE;EACA;EACA;EACA;;AAEE;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;;AAKR;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EAWA;EACA;EACA;EACA;EACA;;AAdA;EACE;EACA;EACA;EACA;AAAsB;EACtB;AAA2B;EAC3B;AAAuB;EACvB;AAAyB;EACzB;;AAOF;EACE;EACA;EACA;EACA;;AASJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AAEE;EAAE;;AACF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;;AAEF;EACE;;;AAIF;EAAI;;AACJ;EACE;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;;;AAGJ;EACE;;AACA;EACE","file":"Index.css"}
+{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AACA;EACE;;AAGA;EAEE;EACA;EACA;;;AAIN;AACA;EACE;EACA;;AACA;EACE;;AAGA;EACE;;AAEF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;EACA;;AACA;EAIE;;AAHA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAIN;EACE;EACA;EACA;EACA;;AAEE;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;;AAKR;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EAWA;EACA;EACA;EACA;EACA;;AAdA;EACE;EACA;EACA;EACA;AAAsB;EACtB;AAA2B;EAC3B;AAAuB;EACvB;AAAyB;EACzB;;AAOF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AAEE;EAAE;;AACF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;;AAGJ;EACE;;AACA;EACE;;AAEF;EACE","file":"Index.css"}
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,5 +1,4 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
 import Slider from "react-slick";
 import { getImageUrl } from 'educoder';
@ -13,6 +12,8 @@ import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
 import banner from '../Images/banner_list.jpg';
 import CheckProfile from '../Component/ProfileModal/Profile';
 const Search = Input.Search;
 class Index extends Component {
@ -228,7 +229,7 @@ class Index extends Component {
  }
  getoDetail=(login,identifier)=>{
-    this.props.history.push(`/projects/${login}/${identifier}`);
+    this.props.history.push(`/${login}/${identifier}`);
  }
  // 选择语言类别
@ -255,8 +256,12 @@ class Index extends Component {
  newItem = ()=>{
    return(
      <Menu>
-        <Menu.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
+        <Menu.Item key="created_mirror">
-        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>新建镜像项目</CheckProfile>
        </Menu.Item>
        <Menu.Item key="created_deposit">
          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建托管项目</CheckProfile>
        </Menu.Item>
      </Menu>
    )
  }
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -108,32 +108,6 @@
  margin: 0 auto;
  .panelmenu{
    padding-top:30px;
    .depotBtn{
      .mr-5{
        margin-right: -5px;
      }
      .ant-btn{
        height: 36px;
        line-height: 34px;
        width: 83px;
        text-align: center;
        padding:0px ;
        font-weight: 500;
        font-size: 14px;
      }
      .ant-btn-default{
        color: #333;
        border-color: #d0d0d0;
        &:hover{
          background: #F3F4F6;
        }
      }
      .ant-btn-primary{
        color: #fff;
        background-color: #466AFF;
        opacity: 0.8;
      }
    }
  }
  .addOptionBtn{
    height: 32px;
@ -166,16 +140,15 @@
    font-size: 12px;
  }
  .attrPerson{
-    padding-top: 12px;
+    padding-top: 15px;
    display: flex;
    flex-wrap: wrap;
    padding-bottom: 2px;
    a{
-      margin: 0px 17px 0px 0px;
+      margin: 10px 10px 0px 0px;
      img{
        border-radius: 50%;
-        width: 40px;
+        width: 35px;
-        height: 40px;
+        height: 35px;
      }
      &:nth-child(6){
        margin-right: 0px;
@ -212,11 +185,10 @@
      padding-left: 15px;
      position: relative;
      min-width: 33.5%;
      font-size: 12px;
      font-weight: 400;
      color: #666;
      span{
        color: #666;
        &:last-child{
          color: #999;
          margin-left: 5px;
        }
      }
@ -225,7 +197,6 @@
  .listtable{
    margin-top: 20px;
    .listtablehead{
      height: 55px;
      display: flex;
      justify-content: space-between;
      align-items: flex-start;
@ -233,7 +204,6 @@
      padding:13px 20px;
      border-radius: 4px 4px 0px 0px;
      border: 1px solid rgba(42, 97, 255, 0.23);
      background-color: #FAFCFF;
      .ellipsistxt{
        margin-top: 6px;
        #ptxt{
@ -256,12 +226,12 @@
          overflow: hidden;
          position: relative;
          padding-right:8px;
-          // &::after{
+          &::after{
-          //   position: absolute;
+            position: absolute;
-          //   right: 0px;
+            right: 0px;
-          //   bottom: 0px;
+            bottom: 0px;
-          //   content:"...";
+            content:"...";
-          // }
+          }
        }
      }
      .ellipsis{
@ -294,7 +264,7 @@
        }
      }
      & > li{
-        height: 38px;
+        height: 44px;
        display: flex;
        justify-content: space-between;
        align-items: center;
@ -329,10 +299,8 @@
 .drawerBtn{
  position: fixed;
  left: -13px;
-  width: 33px;
+  border:1px solid rgb(207,205,223);
-  background: #FFFFFF;
+  width: 34px;
  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
  border: 1px solid #666666;
  border-radius: 0px 12px 12px 0px;
  height: 70px;
  top:50%;
@ -340,55 +308,44 @@
  cursor: pointer;
  display: flex;
  flex-direction: column;
-  align-items: center;
+  align-items: flex-end;
  justify-content: center;
  padding-left: 7px;
  &:hover{
-    box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
+    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
  }
  span{
    writing-mode: vertical-lr;
-    color: #333;
+    color: #202429;
    width: 25px;
    font-size: 14px;
  }
  i{
-    color: #333;
+    color: #24292e;
-    height: 14px;
+    height: 18px;
-    line-height: 14px;
+    line-height: 18px;
-    width: 14px;
+    width: 18px;
    margin-left: 2px;
    margin-bottom: 3px;
  }
 }
 .downMenu{
-  width: 329px;
+  width: 330px;
  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
  background-color: #fff;
-  box-shadow: 0px 1px 8px 1px rgba(212, 212, 212, 0.5);
+  .ant-menu-vertical .ant-menu-item:hover{
-  padding-bottom: 14px;
+    background-color: #e6f7ff;
  .ant-menu-item{
    height: 50px;
    line-height: 50px;
  }
 }
 .catelogue{
-  cursor: pointer;
+  border:1px solid rgb(211, 211, 211);
  background: #FAFBFC;
  border-radius: 4px;
  border: 1px solid #D0D0D0;
  font-size: 15px;
  font-weight: normal;
-  margin-right: 12px;
+  border-radius: 5px;
  margin-right: 10px;
  padding:0px 10px;
  height: 30px;
  line-height: 30px;
  color: #666!important;
  display: flex;
  align-items: center;
  &:hover{
    background-color: #F3F4F6;
  }
  span{
    margin-top: 1px;
  }
@ -401,24 +358,4 @@
  &:hover{
    color: #05101a;
  }
 }
 .pinfos{
  i,a{color: #666;}
  &:hover i,&:hover a{
    color: #466AFF;
  }
 }
 .graph{
  flex:1;
  margin:0px 12px;
  .ant-typography{
    white-space: pre-wrap;
    margin-bottom: 0px;
  }
 }
 .ant-anchor-wrapper{
  padding-left: 2px;
  .ant-anchor-ink::before{
    background-color: #fff;
  }
 }
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@ -28,14 +28,14 @@ class IndexItem extends Component {
                  <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                </a>
                :
-                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                <Link to={`/${item.author && item.author.login}`} className="show-user-link">
                  <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                </Link>
              }
              <div className="p-r-Infos">
                <div className="p-r-name">
                  <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                    <Link to={`/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
                      {item.author.name}/{item.name}
                    </Link>
                    { !item.is_public && <span className="privateTag">私有</span> }
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@ -265,30 +265,32 @@
 .detailHeader-wrapper {
  background-color: #FBFCFF;
  border-bottom: 1px solid #e2e2e2;
  /* box-shadow: 0px 2px 11px 0px#D0D0D0; */
 }
 .headerMenu-wrapper {
  font-size: 16px;
  display: flex;
  flex-direction: row;
  cursor: pointer;
 }
 .headerMenu-wrapper li {
  position: relative;
  text-align: center;
  padding: 0px;
 }
 .headerMenu-wrapper li > a {
  font-size: 14px;
  height: 40px;
  line-height: 28px;
  padding: 0px 20px;
-  display: block;
+}
 .headerMenu-wrapper li a {
  color: #666;
 }
-.headerMenu-wrapper li > a > img {
+
 .headerMenu-wrapper li a > img {
  margin-right: 8px;
 }
-.headerMenu-wrapper li > a > span.num {
+
 .headerMenu-wrapper li a > span.num {
  line-height: 24px;
  margin-left: 5px;
  margin-top: 2px;
@ -300,21 +302,20 @@
  width: 24px;
  height: 24px;
 }
 .headerMenu-wrapper li.active a, .headerMenu-wrapper li.active a i {
-  color: #466AFF !important;
+  color: #2A61FF !important;
 }
-.headerMenu-wrapper li.active::after, .headerMenu-wrapper li:hover::after {
+
 .headerMenu-wrapper li.active::after {
  position: absolute;
  bottom: 0px;
  height: 2px;
-  background-color: rgba(153, 153, 153, 0.2);
+  background-color: #2A61FF;
  content: "";
  left: 0px;
  width: 100%;
 }
 .headerMenu-wrapper li.active::after {
  background-color: #466AFF;
 }
 .detail_tag_btn {
  height: 34px;
@ -323,26 +324,30 @@
  border: 1px solid #D0D0D0;
  display: flex;
  align-items: center;
-  margin-left: 10px;
+  margin-left: 30px;
  padding: 0px;
  background-color: #FAFBFC;
  box-shadow: none;
 }
 .detail_tag_btn:hover {
  background-color: #F3F4F6;
 }
-.detail_tag_btn .detail_tag_btn_name {
+
-  padding: 0px 18px;
+.ant-tooltip {
-  min-width: 82px;
+  max-width: fit-content !important;
  text-align: center;
 }
-.detail_tag_btn .detail_tag_btn_name:hover > span {
+
-  color: #333 !important;
+.detail_tag_btn_name {
  padding: 0px 10px;
  color: #666 !important;
 }
-.detail_tag_btn .detail_tag_btn_name img {
+
 .detail_tag_btn_name img {
  margin-right: 10px;
 }
-.detail_tag_btn .detail_tag_btn_count {
+
 .detail_tag_btn_count {
  width: 42px;
  text-align: center;
  background: #fff;
@ -351,10 +356,6 @@
  border-left: 1px solid #D0D0D0;
 }
 .ant-tooltip {
  max-width: fit-content !important;
 }
 .files-md {
  padding: 20px;
 }
@ -409,7 +410,6 @@
 }
 .gitAddressClone {
  margin: 0px 20px 14px 20px !important;
  display: flex;
  height: 40px;
  align-items: center;
@ -687,8 +687,8 @@
 .commonBox .commonBox-title.boxTitle {
  display: flex;
  justify-content: space-between;
-  height: 55px;
+  height: 65px;
-  line-height: 55px;
+  line-height: 65px;
  background: #FAFCFF;
  border-radius: 4px 4px 0px 0px;
  border: 1px solid rgba(42, 97, 255, 0.23);
@ -714,7 +714,7 @@
 .commonBox-title-read {
  vertical-align: middle;
-  color: #000;
+  color: #666;
  font-size: 14px;
 }
@ -765,6 +765,10 @@
  border-bottom: none;
 }
 .gitAddressClone {
  margin: 0 !important;
 }
 .item_title small {
  font-weight: 400;
  margin-left: 10px;
--- a/src/forge/Main/list.css.map
+++ b/src/forge/Main/list.css.map
@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["list.scss"],"names":[],"mappings":";AACA;EAAQ;;;AACR;AACE;AAAA;EAEA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAsC;;;AACtC;EAAwC;;;AACxC;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;;;AAIN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;;;AAEF;EACE;;;AAEF;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EAAkB;EAAmB;;;AACrC;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;AACE;EACA;;;AAEF;EACE;;;AAKF;EACE;IACE;;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;AAAoB;EACpB;EACA;EACA;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAGA;EACE;;;AAGJ;EACE;EACA;EACA;;;AAGF;EACE;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACA;;;AAEA;EAAc;;;AAEd;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAa;;;AACb;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAY;;;AAEZ;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAIF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE","file":"list.css"}
+{"version":3,"sourceRoot":"","sources":["list.scss"],"names":[],"mappings":";AACA;EAAQ;;;AACR;AACE;AAAA;EAEA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAsC;;;AACtC;EAAwC;;;AACxC;EACE;EACA;EACA;EACA;EACA;EACA;;;AAIF;AACA;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;AACA;EACE;EACA;AACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EAAkB;EAAmB;;;AACrC;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;AACA;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;AACA;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;AACE;EACA;;;AAEF;EACE;;;AAKF;EACE;IACE;;;EAEF;IACE;IACA;;;AAIJ;EACE;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;AAAoB;EACpB;EACA;EACA;EACA;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAGA;EACE;;;AAGJ;EACE;EACA;EACA;;;AAGF;EACE;IACE;IACA;;;EAEF;IACE;;;EAEF;IACE;;;EAEF;IACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACA;;;AAEA;EAAc;;;AAEd;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAa;;;AACb;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EAAY;;;AAEZ;EACE;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAIF;AACA;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;AACA;EACE;;AAEF;EACE","file":"list.css"}
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@ -220,54 +220,49 @@
 .detailHeader-wrapper{
  background-color:#FBFCFF;
  border-bottom:1px solid #e2e2e2;
  /* box-shadow: 0px 2px 11px 0px#D0D0D0; */
 }
 .headerMenu-wrapper{
  font-size: 16px;
  display: flex;
  flex-direction: row;
-  cursor: pointer;
+}
-  li{
+.headerMenu-wrapper li{
-    position: relative;
+  position: relative;
-    text-align: center;
+  text-align: center;
-    padding:0px;
+  height: 40px;
-    & > a{
+  line-height: 28px;
-      font-size: 14px;
+  padding:0px 20px;
-      height: 40px;
+}
-      line-height: 28px;
+.headerMenu-wrapper li a{
-      padding:0px 20px;
+  color: #666;
-      display: block;
+}
-      color: #666; 
+.headerMenu-wrapper li a > img{
-      &> img{
+  margin-right: 8px;
-        margin-right: 8px;
+}
-      }
+.headerMenu-wrapper li a > span.num{
-      &> span.num{
+  line-height: 24px;
-        line-height: 24px;
+  margin-left: 5px;
-        margin-left: 5px;
+  margin-top: 2px;
-        margin-top: 2px;
+  font-size: 12px;
-        font-size: 12px;
+  float: right;
-        float: right;
+  color: #666!important;
-        color: #666!important;
+  background-color:  rgba(153, 153, 153, 0.13);;
-        background-color:  rgba(153, 153, 153, 0.13);;
+  border-radius: 50%;
-        border-radius: 50%;
+  width: 24px;
-        width: 24px;
+  height: 24px;
-        height: 24px;
+}
-      }
+.headerMenu-wrapper li.active a,.headerMenu-wrapper li.active a i{
-    }
+  color: #2A61FF!important;
-    &.active a,&.active a i{
+}
-      color: #466AFF!important;
+.headerMenu-wrapper li.active::after{
-    }
+  position: absolute;
-    &.active::after,&:hover::after{
+  bottom:0px;
-      position: absolute;
+  height:2px;
-      bottom:0px;
+  background-color: #2A61FF;
-      height:2px;
+  content:'';
-      background-color:rgba(153, 153, 153, 0.2);
+  left: 0px;
-      content:'';
+  width:100%;
      left: 0px;
      width:100%;
    }
    &.active::after{
      background-color: #466AFF;
    }
  }
 }
 .detail_tag_btn{
  height:34px;
@ -276,36 +271,32 @@
  border:1px solid #D0D0D0;
  display: flex;
  align-items: center;
-  margin-left: 10px;
+  margin-left: 30px;
  padding:0px;
  background-color:#FAFBFC;
  box-shadow: none;
-  &:hover{
+}
-    background-color: #F3F4F6;
+.detail_tag_btn:hover{
-  }
+  background-color: #F3F4F6;
  .detail_tag_btn_name{
    padding:0px 18px;
    min-width: 82px;
    text-align: center;
    &:hover>span{
      color: #333!important;
    }
    img{
      margin-right: 10px;
    }
  }
  .detail_tag_btn_count{
    width: 42px;
    text-align: center;
    background: #fff;
    border-radius: 0px 4px 4px 0px;
    height:100%;
    border-left: 1px solid #D0D0D0;
  }
 }
 .ant-tooltip {
  max-width: fit-content!important;
 }
 .detail_tag_btn_name{
  padding:0px 10px;
  color: #666!important;
 }
 .detail_tag_btn_name img{
  margin-right: 10px;
 }
 .detail_tag_btn_count{
  width: 42px;
  text-align: center;
  background: #fff;
  border-radius: 0px 4px 4px 0px;
  height:100%;
  border-left: 1px solid #D0D0D0;
 }
 .files-md{
  padding:20px;
 }
@ -356,7 +347,6 @@
 .gitAddressClone{
  margin:0px 20px 14px 20px!important;
  display: flex;
  height: 40px;
  align-items: center;
@ -600,8 +590,8 @@
 .commonBox .commonBox-title.boxTitle{
  display: flex;
  justify-content: space-between;
-  height: 55px;
+  height: 65px;
-  line-height: 55px;
+  line-height: 65px;
  background: #FAFCFF;
  border-radius: 4px 4px 0px 0px;
  border: 1px solid rgba(42, 97, 255, 0.23);
@ -625,7 +615,7 @@
 }
 .commonBox-title-read{
  vertical-align: middle;
-  color: #000;
+  color: #666;
  font-size: 14px;
 }
@ -668,7 +658,9 @@
 .item:last-child{
  border-bottom:none;
 }
-
+.gitAddressClone{
  margin: 0 !important;
 }
 .item_title small{
  font-weight: 400;
  margin-left: 10px;
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@ -52,7 +52,7 @@ function Contribute(props){
                    <AlignCenter>
                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                      <div>
-                        <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
+                        <Link to={`/${item.login}`} className="font-16">{item.name}</Link>
                        <p className="font-12 color-grey-9">提交{item.contributions}次</p>
                      </div>
                    </AlignCenter>
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Skeleton , Tooltip} from 'antd';
 import { Link } from 'react-router-dom';
 import { numFormat } from 'educoder';
 function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
  const [ menuName , setMenuName ] = useState(undefined);
@ -11,14 +10,14 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
      if(pathname && pathname==="source"){
        let a = list.filter(item=>item.menu_name === "resources");
        if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
+          history.push(`/${owner}/${projectsId}`);
        }
      }
      setMenuName(list);
    }
  },[list]);
  return(
-    <div className="f-wrap-between mt25">
+    <div className="f-wrap-between mt15">
      {
        menuName && projectDetail ? 
        <ul className="headerMenu-wrapper">
@ -29,8 +28,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "home" &&
                    <li className={pathname==="about" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuyeicon color-grey-3 mr5 font-14":"iconfont icon-zhuyeicon color-grey-6 font-14 mr5"}></i>
+                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
                        <span>主页</span>
                        </Link>
                    </li>
@ -38,8 +37,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "code" &&
                    <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}`, state }}>
-                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimakuicon color-grey-3 mr5 font-14":"iconfont icon-daimakuicon color-grey-6 font-14 mr5"}></i>
+                        <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
                        <span>代码库</span>
                        </Link>
                    </li>
@ -48,10 +47,10 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                    item.menu_name === "issues" &&
                    <li className={pathname==="issues" ? "active" : ""}>
                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
+                        <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
-                          <i className={pathname==="issues" ? "iconfont icon-yixiuicon color-grey-3 mr5 font-14":"iconfont icon-yixiuicon color-grey-6 font-14 mr5"}></i>
+                          <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
                          <span>易修</span>
-                          {projectDetail && projectDetail.issues_count ? <span className="num">{numFormat(projectDetail.issues_count)}</span> : ""}
+                          {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
                        </Link>
                      </Tooltip>
                    </li>
@ -59,17 +58,17 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
                    <li className={pathname==="pulls" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiuicon color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiuicon color-grey-6 font-14 mr5"}></i>
+                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
                        <span>合并请求</span>
-                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{numFormat(projectDetail.pull_requests_count)}</span> : ""}
+                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
                      </Link>
                    </li>:""
                  }
                  {
                    item.menu_name === "wiki" &&
                    <li className={pathname === "wiki" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/wiki`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
                        <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
                        <span>Wiki</span>
                      </Link>
@ -78,47 +77,48 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "devops" && platform ? 
                    <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
+                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
-                        <i className="iconfont icon-gongzuoliuicon font-13 mr8"></i>工作流(beta版)
+                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
-                        {projectDetail && projectDetail.ops_count ? <span>{numFormat(projectDetail.ops_count)}</span> : ""} 
+                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                      </Link>
                    </li>
                    :""
                  }
-                  {/* {
+                  {
-                    item.menu_name === "resources" &&
+                    // item.menu_name === "resources" &&
-                    <li className={pathname==="source" ? "active" : ""}>
+                    // <li className={pathname==="source" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
+                    //   <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
-                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
+                    //       <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
-                          <span>资源库</span>
+                    //       <span>资源库</span>
-                          {projectDetail && projectDetail.source_count ? <span className="num">{numFormat(projectDetail.source_count)}</span> :""}
+                    //       {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
-                      </Link>
+                    //   </Link>
-                    </li>
+                    // </li>
-                  } */}
+                  }
                  {
                    item.menu_name === "versions" &&
                    <li className={pathname==="milestones" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
-                          <i className={pathname==="milestones" ? "iconfont icon-lichengbeiicon color-grey-3 mr5 font-14":"iconfont icon-lichengbeiicon color-grey-6 font-14 mr5"}></i>
+                          <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
                          <span>里程碑</span>
-                          {projectDetail && projectDetail.versions_count ? <span className="num">{numFormat(projectDetail.versions_count)}</span> :""}
+                          {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
                      </Link>
                    </li>
                  }
                  {
                    item.menu_name === "activity" &&
                     <li className={pathname==="activity" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
-                        <i className={pathname==="activity" ? "iconfont icon-dongtaiicon color-grey-3 mr5 font-14":"iconfont icon-dongtaiicon color-grey-6 font-14 mr5"}></i>
+                        <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
                        <span>动态</span>
                      </Link>
                    </li>
                  }
                  {
-                    item.menu_name === "setting" &&
+                    item.menu_name === "settings" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
+                    <li className={pathname === "settings" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                      <Link to={`/${owner}/${projectsId}/settings`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}></i>
+                        <i className={url && url.indexOf("/settings") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
                        <span>仓库设置</span>
                      </Link>
                    </li>
--- a/src/forge/Main/sub/Invite.jsx
+++ b/src/forge/Main/sub/Invite.jsx
@ -1,26 +1,15 @@
 import React from 'react';
 import { Tooltip , message } from 'antd';
 import './sub.scss';
 import CopyTool from '../../Component/CopyTool';
 function Invite({code,className}) {
  function jsCopy(id) {
    const copyEle = document.querySelector(id); // 获取要复制的节点
    const range = document.createRange(); // 创造range
    window.getSelection().removeAllRanges(); //清除页面中已有的selection
    range.selectNode(copyEle); // 选中需要复制的节点
    window.getSelection().addRange(range); // 执行选中元素
    document.execCommand("Copy"); // 执行copy操作
    message.success('复制成功');
  }
  return(
    <div className={className}>
      <span className="font-16 color-ooo">邀请码</span>
      <div>
-        <span id="devitecode">{code}</span>
+        <input value={code} id="devitecode" style={{width:"62px",border:"none",cursor:"default"}} readOnly/>
-        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+        <CopyTool timeOut={true} beforeText={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} className="ml8 font-16" inputId="devitecode"/>
          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
        </Tooltip>
      </div>
    </div>
  )
--- a/src/forge/Main/sub/ReadmeCatelogue.jsx
+++ b/src/forge/Main/sub/ReadmeCatelogue.jsx
@ -1,11 +1,11 @@
-import React , { useState , useEffect } from 'react';
+import React , {useState } from 'react';
 import { Anchor , Input } from 'antd';
 import './sub.scss';
 import { Base64 } from 'js-base64';
 const { Link } = Anchor;
 const { Search } = Input;
-function ReadmeCatelogue({ menuList , hash }) {
+function ReadmeCatelogue({ menuList }) {
  const [ goHref , setGoHref ] = useState("");
  const [ value , setValue ] = useState("");
  const [ menu , setMenu] = useState(menuList);
@ -18,7 +18,7 @@ function ReadmeCatelogue({ menuList , hash }) {
  function changeValue(e) {
    setValue(e.target.value);
    if(e.target.value){
-      let m = menuList.filter(i=>i.text.indexOf(e.target.value)>-1);
+      let m = menu.filter(i=>i.text.indexOf(e.target.value)>-1);
      setMenu(m);
    }else{
      setMenu(menuList);
@ -41,7 +41,7 @@ function ReadmeCatelogue({ menuList , hash }) {
              menu.map((item,key)=>{
                return(
                  <div style={{paddingLeft:`${item.level *10}px`}} className={goHref===item.href?"items active":"items"}>
-                    <Link href={`#${item.text}`} title={item.text} />
+                    <Link href={`${item.href}`} title={item.text} />
                  </div>
                )
              })
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
          {getFieldDecorator("lesson_url",{
            rules:[]
          })(
-            <Input placeholder="实践课程链接" />
+            <Input placeholder="实践课程链接"/>
          )}
        </Form.Item>
      </Form>
--- a/src/forge/Main/sub/sub.css
+++ b/src/forge/Main/sub/sub.css
@ -34,10 +34,13 @@
  padding: 15px;
  border-bottom: 1px solid #eee;
 }
 .menuslist .anchorBox {
  max-height: 255px;
  overflow-y: auto;
 }
 .menuslist .ant-anchor-wrapper {
  margin-left: 0px;
  padding: 5px 15px;
  max-height: 255px !important;
 }
 .menuslist .ant-anchor-wrapper .items {
  border-radius: 4px;
--- a/src/forge/Main/sub/sub.css.map
+++ b/src/forge/Main/sub/sub.css.map
@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["sub.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EAIA;;AAHA;EACE;;;AAMJ;EACE;;AAEF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AACA;EACE;;AAIN;EACE;EACA;EACA;;AAEF;EACE","file":"sub.css"}
+{"version":3,"sourceRoot":"","sources":["sub.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EAIA;;AAHA;EACE;;;AAMJ;EACE;;AAEF;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AACA;EACE;;AAIN;EACE;EACA;EACA;;AAEF;EACE","file":"sub.css"}
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@ -34,10 +34,13 @@
    padding:15px;
    border-bottom: 1px solid #eee;
  }
  .anchorBox{
    max-height: 255px;
    overflow-y: auto;
  }
  .ant-anchor-wrapper{
    margin-left: 0px;
    padding:5px 15px;
    max-height: 255px!important;
    .items{
      border-radius: 4px;
      margin-bottom: 5px;
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
              <div className="prInfo">
                <FlexAJ>
                  <AlignCenter>
-                    <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                    <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                  </AlignCenter>
-                  <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                </FlexAJ>
                <AlignCenter className="mt15">
                  <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                      <span>{item.name}</span>
                    </AlignCenter>
                    <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
                      <span className="color-green">+{item.addition}</span>
                      <span className="color-red ml20">-{item.deletion}</span>
                    </span>
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@ -228,7 +228,7 @@ class MergeDetail extends Component {
              <div>
                {
                  data && data.issue.user_permission ?
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                    <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
                    : ''
                }
              </div>
@ -248,8 +248,8 @@ class MergeDetail extends Component {
          <div className="detailHeader-wrapper">
            <div className="normal f-wrap-between">
              <ul className="headerMenu-wrapper">
-                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
+                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
-                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
+                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
              </ul>
            </div>
          </div>
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@ -49,7 +49,7 @@ class MergeItem extends Component {
  };
  render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
    const { projectsId , owner } = this.props.match.params;
    const { current_user } = this.props;
    const renderList = () => {
@ -62,7 +62,7 @@ class MergeItem extends Component {
                <p className="mb15 df" style={{ alignItems: "center" }}>
                  <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                  <Link
-                    to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                    className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
                    style={{ maxWidth: "300px" }}
                  >
@ -78,7 +78,7 @@ class MergeItem extends Component {
                </p>
                <p className="grid-item font-13">
                  <Link
-                    to={`/users/${item && item.author_login}`}
+                    to={`/${item && item.author_login}`}
                    className="show-user-link"
                  >
                    <img
@ -91,7 +91,7 @@ class MergeItem extends Component {
                  </Link>
                  <AlignCenter>
                    <Link
-                      to={`/users/${item && item.author_login}`}
+                      to={`/${item && item.author_login}`}
                      className="show-user-link color-grey-8 ml5"
                    >
                      {item && item.author_name}
@ -109,7 +109,7 @@ class MergeItem extends Component {
                        item.pull_request_head &&
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                            className="maxW200px hide-1 ver-middle"
                          >
                            {item.is_original
@ -133,7 +133,7 @@ class MergeItem extends Component {
                        item.pull_request_base && 
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                            className="maxW200px hide-1 ver-middle"
                          >
                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@ -156,7 +156,7 @@ class MergeItem extends Component {
                <li>
                  {item.assign_user_name ? (
                    <Link
-                      to={`/users/${item.assign_user_login}`}
+                      to={`/${item.assign_user_login}`}
                      className="show-user-link"
                    >
                      {item.assign_user_name}
@ -175,7 +175,7 @@ class MergeItem extends Component {
                    {item.journals_count ? (
                      <Link
                        className="mr5 color-grey-8"
-                        to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                        to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                      >
                        <i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
                        {item.journals_count}
@ -183,7 +183,7 @@ class MergeItem extends Component {
                    ) : (
                      ""
                    )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                      <div
                        className="milepostleft"
                        style={{
@ -196,7 +196,7 @@ class MergeItem extends Component {
                      >
                        <div className="grid-item mr15 color-grey-9">
                          <Link
-                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
+                            to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                            className="color-grey-9"
                          >
                            <i className="iconfont icon-bianji3 font-14 mr5"></i>
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@ -100,7 +100,7 @@ class MergeSubmit extends Component{
        width:"10%",
        render: (text,item) => (
          <span className="f-wrap-alignCenter">
-            <Link to={`/users/${item.login}`} className="show-user-link">
+            <Link to={`/${item.login}`} className="show-user-link">
                <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
          <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
          </Link>
@ -110,7 +110,7 @@ class MergeSubmit extends Component{
        title:"SHA",
        dataIndex: 'sha',
        render: (text) => (
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
+          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
        )
      },{
        title:"备注",
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@ -361,7 +361,7 @@ class MessageCount extends Component {
                      <div className="mt15">
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                            className="ver-middle"
                          >
                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@ -376,7 +376,7 @@ class MessageCount extends Component {
                        </span>
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
+                            to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                            className="ver-middle"
                          >
                            {data.issue.project_author_name}:{data.pull_request.base}
@ -386,14 +386,14 @@ class MessageCount extends Component {
                    }
                    <div className="mt15">
-                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                      <Link to={`/${data.issue.author_login}`} className="show-user-link">
                        <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
                          alt="" width="24" height="24" style={{borderRadius:"50%"}}
                        />
                      </Link>
                      <span className="ver-middle">
                        <span className="color-grey-8 mr5">由</span>
-                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
+                        <Link to={`/${data.issue.author_login}`} className="show-user-link color-blue">
                          {data.issue.author_name}
                        </Link>
                        <span className="ml5 color-grey-8">
@ -408,7 +408,7 @@ class MessageCount extends Component {
                          <span className="color-grey-8">审查人员：</span>
                          {data.issue.assign_user_name ? (
                            <Link
-                              to={`/users/${data.issue.assign_user_login}`}
+                              to={`/${data.issue.assign_user_login}`}
                              className="show-user-link color-blue"
                            >
                              {data.issue.assign_user_name}
@ -448,7 +448,7 @@ class MessageCount extends Component {
                            type="green"
                            ghost
                            className="ml20"
-                            onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+                            onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
                          >
                            编辑
                          </Button>
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@ -186,7 +186,7 @@ class NewMerge extends Component {
    // this.ischeckmerge();
    let { id ,merge , pull } = this.state;
    if(type==="pull"){
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
+      this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
      this.compareProject(id,value,merge);
    }else{
      this.compareProject(id,pull,value);
@ -208,7 +208,7 @@ class NewMerge extends Component {
        merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
      }
    })
-    this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
+    this.props.history.push(`/${login}/${identifier}/pulls/new`);
    this.newMergelist(login,identifier);
  };
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@ -4,10 +4,11 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 import axios from "axios";
 import CheckProfile from '../Component/ProfileModal/Profile';
 const Search = Input.Search;
 /**
@ -212,7 +213,7 @@ class merge extends Component {
  checkOperation() {
    const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
  }
  render() {
    const { projectsId , owner } = this.props.match.params;
@ -255,10 +256,10 @@ class merge extends Component {
            />
          </div>
          {
-            data && data.user_admin_or_member &&
+            data && data.user_admin_or_developer &&
-            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+            <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={() => this.checkOperation()}>
              +&nbsp;新建合并请求
-            </a>
+            </CheckProfile>
          }
        </div>
        <div className="f-wrap-between screenWrap">
@ -387,7 +388,7 @@ class merge extends Component {
          <Spin spinning={isSpin}>
            {data && data.search_count && data.search_count > 0 ? (
              <div>
-                <OrderItem
+                <MergeItem
                  issues={issues}
                  search_count={search_count}
                  page={select_params.page}
@ -396,8 +397,8 @@ class merge extends Component {
                  project_author_name={data.project_author_name}
                  {...this.props}
                  {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
+                  user_admin_or_developer={data && data.user_admin_or_developer}
-                ></OrderItem>
+                ></MergeItem>
              </div>
            ):""}
            {search_count > select_params.limit ? (
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@ -165,7 +165,7 @@ class MergeForm extends Component {
              this.setState({
                isSpin: false,
              });
-              this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
+              this.props.history.push(`/${owner}/${projectsId}/pulls`);
              const { getDetail } = this.props;
              getDetail && getDetail();
            } else {
@ -195,7 +195,7 @@ class MergeForm extends Component {
                isSpin: false,
              });
              this.props.history.push(
-                `/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+                `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
              );
            } else {
              this.setState({
@ -287,7 +287,7 @@ class MergeForm extends Component {
                    type="default"
                    className="ml30"
                    onClick={()=>{
-                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                      this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
                    }}
                  >
                    <span className="plr10">取消</span>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
hc1913847458	ab85e3972f	Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev # Conflicts: # public/css/iconfont.css # public/css/iconfont.js # public/css/iconfont.json # src/forge/Component/Contributors.jsx # src/forge/Component/Releases.jsx # src/forge/Main/CoderDepot.jsx # src/forge/Main/Detail.js # src/forge/Main/sub/DetailBanner.jsx	2021-09-06 17:15:24 +08:00
jasder	657bfbc6df	Merge pull request 'FIX 合并 featrue_router' (#46 ) from feature_router into pre_develop_dev	2021-09-03 18:01:09 +08:00
jasder	7e1dde4ecd	Merge pull request '新建项目接口报错后前端需要去掉加载效果' (#45 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 17:57:01 +08:00
caishi	3d6136bbbb	新建项目不成功，需要去掉加载状态	2021-09-03 17:46:49 +08:00
jasder	b6ed5d79e7	Merge pull request '修改相关issue的代码提交' (#44 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 17:18:20 +08:00
caishi	21ce83e537	issue	2021-09-03 17:14:45 +08:00
jasder	03a8e79382	Merge pull request 'issue修改' (#43 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 16:08:12 +08:00
caishi	3fce9a99ad	头部姓名过长，省略	2021-09-03 14:57:39 +08:00
caishi	db18cd41b0	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-03 14:46:16 +08:00
caishi	7fb7dbe687	issue	2021-09-03 14:46:06 +08:00
jasder	5e58f349cd	Merge pull request '修改路由相关issue' (#42 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-03 14:43:55 +08:00
何童崇	4e08bf6fe3	修改路由labels	2021-09-03 14:39:21 +08:00
caishi	bc8e513b97	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-03 14:10:57 +08:00
caishi	4621a75ec8	项目列表	2021-09-03 14:10:36 +08:00
何童崇	17671a7c87	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-03 13:51:24 +08:00
jasder	47ecda06ca	Merge pull request '个人信息资料提示+新的需求' (#41 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 13:50:38 +08:00
何童崇	ebd94ed3a1	修改路由相关issue及顺带测出的问题	2021-09-03 13:48:56 +08:00
caishi	d1128a0dfc	个人资料完善box style	2021-09-03 13:48:07 +08:00
baladiwei	47f5d98d79	Merge pull request '修改例子中的路由以及新提出的路由，修改之前由于修改路由带来的issue' (#40 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-03 11:48:21 +08:00
何童崇	a5bdf26f96	修改路由issue	2021-09-03 11:38:22 +08:00
何童崇	f6a0c3b33f	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-03 11:37:08 +08:00
jasder	9d2dc3426c	Merge pull request '关注页面issue+个人资料弹框漏掉的按钮' (#39 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 11:32:40 +08:00
caishi	5abe75d637	个人资料issue+样式	2021-09-03 11:26:23 +08:00
何童崇	9e14821125	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-03 10:17:32 +08:00
jasder	2f3f33d58e	Merge pull request '个人资料完善弹框样式修改' (#38 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-03 10:13:35 +08:00
caishi	43b31427d8	弹框样式修改	2021-09-03 10:08:24 +08:00
何童崇	03d568f5f7	合并蔡世代码并解决冲突	2021-09-03 09:26:34 +08:00
何童崇	24c4c746cd	修改其他路由及修改issue	2021-09-03 09:23:12 +08:00
jasder	3fc0737e43	Merge pull request '个人信息资料完善提示弹框，基本资料页面路由修改' (#37 ) from caishi/forgeplus-react:feature_router into feature_router	2021-09-02 17:44:43 +08:00
何童崇	4f39f03b19	修改路由的issue	2021-09-02 17:20:26 +08:00
caishi	b475edae74	hover-issue delete	2021-09-02 16:39:35 +08:00
caishi	dbb5efdcd5	issue-part 2	2021-09-02 15:04:26 +08:00
caishi	322260c3fc	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router # Conflicts: # src/forge/Team/List.jsx	2021-09-02 14:16:30 +08:00
caishi	375ad38364	issue	2021-09-02 14:13:16 +08:00
baladiwei	ef6f334d94	Merge pull request '修改路由带来的bug' (#36 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-02 13:40:15 +08:00
何童崇	559b797c2e	修改路由带来的bug	2021-09-02 13:37:24 +08:00
caishi	adc134ec44	复制-组件	2021-09-02 10:10:21 +08:00
caishi	bf3f404238	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-01 18:15:32 +08:00
jasder	9b62b3b047	Merge pull request '上传路由修改，上传sourcesource-map配置' (#35 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-01 17:54:05 +08:00
caishi	c14f06301f	appconfig	2021-09-01 17:49:42 +08:00
caishi	105e1c61b8	个人资料是否完善-弹框	2021-09-01 17:46:58 +08:00
何童崇	80dde2bc97	上传路由修改，上传sourcesource-map配置	2021-09-01 17:34:47 +08:00
caishi	3b03ead3af	Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router	2021-09-01 11:24:43 +08:00
caishi	86f50d4278	基本资料	2021-09-01 11:24:37 +08:00
baladiwei	bddc0f2f91	Merge pull request '改nopage的问题' (#34 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-01 11:01:22 +08:00
何童崇	30a141c92e	修改nopage的问题	2021-09-01 10:58:38 +08:00
caishi	58115f8dae	box	2021-09-01 10:28:11 +08:00
baladiwei	9655cd5105	Merge pull request 'router修改' (#33 ) from tongChong/forgeplus-react:feature_router into feature_router	2021-09-01 09:41:00 +08:00
何童崇	01b3ee8d49	修改projects路由	2021-09-01 09:33:22 +08:00
何童崇	662a758980	修改user/org路由时的bug	2021-08-30 17:42:13 +08:00
hc1913847458	358d236034	‘ save files	2021-08-30 13:42:54 +08:00
caishi	1ea61fe7ab	save files	2021-08-30 10:55:06 +08:00
何童崇	0b64631222	合并镜像、权限、wiki修改	2021-08-30 10:39:09 +08:00
何童崇	eb02b814a9	修改user路由	2021-08-30 10:31:51 +08:00
baladiwei	ca9a606e53	Merge pull request 'pre-release merge' (#29 ) from pre_develop_dev into pre_develop	2021-08-30 10:26:54 +08:00
baladiwei	8adf7f8de6	Merge pull request '优化日期显示' (#31 ) from tongChong/forgeplus-react:pre_develop_dev into pre_develop_dev	2021-08-27 16:33:43 +08:00
何童崇	349c2a6f35	修改返回日期的显示	2021-08-27 16:31:15 +08:00
baladiwei	f096d6db6e	Merge pull request '注释资源库，wiki修改显示' (#30 ) from tongChong/forgeplus-react:pre_develop_dev into pre_develop_dev	2021-08-27 16:10:00 +08:00
何童崇	492e8e067f	注释资源库，wiki修改显示	2021-08-27 16:07:21 +08:00
baladiwei	95ae2bbd46	Merge pull request '组织团队权限-测试通过版' (#28 ) from caishi/forgeplus-react:pre_develop into pre_develop_dev	2021-08-27 15:01:47 +08:00
caishi	a1b5395b8c	合并请求-判断条件改成user_admin_or_member	2021-08-27 14:04:27 +08:00
caishi	dee7b23f3e	转移到组织-提示文案	2021-08-27 11:44:41 +08:00
caishi	f7dd67d41a	merge	2021-08-27 10:54:55 +08:00
caishi	e7fd980116	组织团队权限	2021-08-27 10:53:00 +08:00
caishi	d8ab7c0759	权限问题测试版-第二版	2021-08-26 17:38:56 +08:00
caishi	d64eb738f7	团队权限分支	2021-08-26 17:38:56 +08:00
jasder	55080f93c1	Merge pull request '镜像问题websocket失败兼容' (#27 ) from tongChong/forgeplus-react:hotfix_websocket into pre_develop_dev	2021-08-26 17:35:00 +08:00
何童崇	e606147d03	修改组织和首页的路由	2021-08-26 14:18:14 +08:00
caishi	7851785335	团队权限分支	2021-08-25 14:25:35 +08:00
何童崇	52e08e77e5	修改websocket问题	2021-08-25 11:52:52 +08:00
baladiwei	fcac8c782a	Merge pull request '组织团队（新增和设置）权限' (#21 ) from caishi/forgeplus-react:pre_develop into pre_develop_dev	2021-08-25 11:03:30 +08:00
caishi	061fa0ee71	组织团队设置：增加可选访问单元wiki	2021-08-24 16:25:55 +08:00
caishi	5d465ec782	组织团队设置：可以设置版本库权限，允许设置访问项目单元	2021-08-24 16:25:47 +08:00
baladiwei	39fef1ce3c	Merge pull request '修改头像的bug，提取copyUrl组件，优化函数式模态框组件' (#20 ) from tongChong/forgeplus-react:feature_wikis into pre_develop_dev	2021-08-23 11:47:44 +08:00
何童崇	d1a3c7b9c3	优化删除函数组件	2021-08-23 09:41:57 +08:00
何童崇	ba263a28f1	修改头像，增加复制toolTip组件，优化组件代码	2021-08-20 14:45:16 +08:00
		`@ -1 +1 @@`
			{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE","file":"branch.css"}				{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;;AAIN;EACE","file":"branch.css"}
		`@ -0,0 +1 @@`
							`{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;EACA;;;AAGJ;EACE","file":"Index.css"}`