不能修改组织账号

组织团队-无数据显示错误
组织基本设置-正则和新建的页面不一致
2021-04-27 17:25:00 +08:00 · 2021-04-27 09:45:14 +08:00 · 2021-04-26 16:32:12 +08:00 · 2021-04-25 18:00:05 +08:00 · 2021-04-23 18:04:49 +08:00 · 2021-04-23 14:51:04 +08:00
198 changed files with 4339 additions and 6389 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,5 +1,5 @@
 {
-  "name": "educoder",
+  "name": "forge",
  "version": "0.1.0",
  "lockfileVersion": 1,
  "requires": true,
@ -3888,11 +3888,6 @@
        "randomfill": "^1.0.3"
      }
    },
-    "crypto-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
-      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
-    },
    "crypto-random-string": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@ -20480,6 +20475,16 @@
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
      "dev": true
    },
+    "xterm": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npm.taobao.org/xterm/download/xterm-4.8.1.tgz",
+      "integrity": "sha1-FVoXKaQ+Gom0BlJOIsVjQznjnKE="
+    },
+    "xterm-addon-fit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npm.taobao.org/xterm-addon-fit/download/xterm-addon-fit-0.4.0.tgz",
+      "integrity": "sha1-BuDF0KaqrPsAnvVl76HIHpPZAZM="
+    },
    "y18n": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
--- a/package.json
+++ b/package.json
@ -87,7 +87,6 @@
    "react-infinite-scroller": "^1.2.4",
    "react-loadable": "^5.3.1",
    "react-monaco-editor": "0.37",
-    "react-pdf": "^4.2.0",
    "react-player": "^1.15.3",
    "react-redux": "5.0.7",
    "react-resizable": "^1.10.1",
@ -112,7 +111,9 @@
    "webpack-dev-server": "^3.10.3",
    "webpack-manifest-plugin": "^2.2.0",
    "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20"
+    "wrap-md-editor": "^0.2.20",
+    "xterm": "4.8.1",
+    "xterm-addon-fit": "0.4.0"
  },
  "scripts": {
    "start": "node --max_old_space_size=15360 scripts/start.js",
--- a/public/css/edu-all.css
+++ b/public/css/edu-all.css
@ -1,5 +1,6 @@
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader {
+  background: #24292D !important;
  width: 100%;
  height: 60px !important;
  min-width: 1200px;
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@ -2346,7 +2346,6 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
  margin: 0 auto;
-  padding-bottom: 110px;
  min-width: 1200px;
 }

@ -4108,21 +4107,6 @@ em.vertical-line {

 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/

-/*底部*/
-.newFooter {
-  max-height: 110px;
-}
-
-.newFooter {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  background: #323232;
-  clear: both;
-  min-width: 1200px;
-  z-index: 8;
-  left: 0px;
-}

 .footercon {
  border-bottom: 1px solid #47494d;
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
--- a/public/css/iconfont.eot
+++ b/public/css/iconfont.eot
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@ -5,6 +5,55 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "991344",
+      "name": "提交",
+      "font_class": "tijiao",
+      "unicode": "e860",
+      "unicode_decimal": 59488
+    },
+    {
+      "icon_id": "1852052",
+      "name": "数据库",
+      "font_class": "dataBase",
+      "unicode": "e85a",
+      "unicode_decimal": 59482
+    },
+    {
+      "icon_id": "4165948",
+      "name": "文件",
+      "font_class": "wenjian4",
+      "unicode": "e85b",
+      "unicode_decimal": 59483
+    },
+    {
+      "icon_id": "17165148",
+      "name": "链接",
+      "font_class": "lianjie2",
+      "unicode": "e85c",
+      "unicode_decimal": 59484
+    },
+    {
+      "icon_id": "17463741",
+      "name": "分支",
+      "font_class": "fenzhi2",
+      "unicode": "e85d",
+      "unicode_decimal": 59485
+    },
+    {
+      "icon_id": "17972521",
+      "name": "分支-3",
+      "font_class": "fenzhi-3",
+      "unicode": "e85e",
+      "unicode_decimal": 59486
+    },
+    {
+      "icon_id": "18682391",
+      "name": "天平",
+      "font_class": "tianping",
+      "unicode": "e85f",
+      "unicode_decimal": 59487
+    },
    {
      "icon_id": "1770896",
      "name": "撤销",
--- a/public/css/iconfont.svg
+++ b/public/css/iconfont.svg
@ -20,6 +20,27 @@ Created by iconfont
  />
    <missing-glyph />
    
+    <glyph glyph-name="tijiao" unicode="&#59488;" d="M776.340596 759.889666l-369.442335 0c-7.573056 0-14.839097-2.967819-20.263042-8.187088L201.197681 571.177294c-5.526284-5.423946-8.801119-12.997002-8.801119-20.774735l-1.023386-513.637418c0-7.777733 2.967819-15.043774 8.494104-20.570058 5.526284-5.526284 12.792325-8.494104 20.570058-8.494104L382.746352 7.700979c12.485309 0 22.514491 10.029182 22.514491 22.514491s-10.029182 22.514491-22.514491 22.514491L236.402159 52.729962l0.921047 467.687388 194.03398 0c16.681191 0 30.189886 13.508695 30.189886 30.189886L461.547072 714.860684l298.828703 0 0-665.200879L621.195283 49.659804c-12.485309 0-22.514491-10.029182-22.514491-22.514491s10.029182-22.514491 22.514491-22.514491l155.145313 0c16.06716 0 29.064162 12.997002 29.064162 29.064162L805.404757 730.825505C805.404757 746.892664 792.407755 759.889666 776.340596 759.889666zM416.518089 565.446332 259.837697 565.446332l153.610234 149.414351 3.172497 0L416.620428 565.446332zM713.30002 434.452928c0 12.485309-10.029182 22.514491-22.514491 22.514491L326.460124 456.96742c-12.485309 0-22.514491-10.029182-22.514491-22.514491l0 0c0-12.485309 10.029182-22.514491 22.514491-22.514491l364.325405 0C703.270837 411.938437 713.30002 421.967619 713.30002 434.452928L713.30002 434.452928zM713.30002 357.698981c0 12.485309-10.029182 22.514491-22.514491 22.514491L326.460124 380.213472c-12.485309 0-22.514491-10.029182-22.514491-22.514491l0 0c0-12.485309 10.029182-22.514491 22.514491-22.514491l364.325405 0C703.270837 335.184489 713.30002 345.213672 713.30002 357.698981L713.30002 357.698981zM713.30002 279.921647c0 12.485309-10.029182 22.514491-22.514491 22.514491L326.460124 302.436138c-12.485309 0-22.514491-10.029182-22.514491-22.514491l0 0c0-12.485309 10.029182-22.514491 22.514491-22.514491l364.325405 0C703.270837 257.407156 713.30002 267.436338 713.30002 279.921647L713.30002 279.921647zM501.970818 220.155906c-1.535079 1.535079-4.093544 1.43274-5.526284-0.102339l-54.853488-59.458725c-2.251449-2.456126-0.511693-6.447332 2.865481-6.447332L479.968019 154.147511l0-88.829902c0-2.251449 1.842095-4.298221 4.093544-4.298221l36.841895 0c2.251449 0 4.093544 2.046772 4.093544 4.298221L524.997002 154.045173l35.511493 0c3.479512 0 5.219268 4.195882 2.660804 6.652009L501.970818 220.155906z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="dataBase" unicode="&#59482;" d="M512 793.4c110.7 0 215-12.3 293.9-34.7 35.8-10.2 65-22.1 84.5-34.7 18.6-12 21.3-19.7 21.6-20.6-0.2-0.9-3-8.6-21.6-20.6-19.5-12.5-48.7-24.5-84.5-34.7-78.9-22.3-183.2-34.7-293.9-34.7s-215 12.3-293.9 34.7c-35.8 10.2-65 22.1-84.5 34.7-18.6 12-21.3 19.7-21.6 20.6 0.2 0.9 3 8.6 21.6 20.6 19.5 12.5 48.7 24.5 84.5 34.7 78.9 22.4 183.2 34.7 293.9 34.7M512 833.4c-243 0-440-58.2-440-130s197-130 440-130 440 58.2 440 130-197 130-440 130zM112 705.6h-40v-641h40v641zM952 705.9h-40v-641h40v641zM912 65v-0.5c-0.2-0.9-3-8.6-21.6-20.6-19.5-12.5-48.7-24.5-84.5-34.7-78.9-22.3-183.2-34.6-293.9-34.6s-215 12.3-293.9 34.7c-35.8 10.2-65 22.1-84.5 34.7-18.6 12-21.3 19.7-21.6 20.6v0.3l-40-0.3v-0.1c0-71.8 197-130 440-130s440 58.2 440 130v0.4l-40 0.1zM912 275.5v-0.5c-0.2-0.9-3-8.6-21.6-20.6-19.5-12.5-48.7-24.5-84.5-34.7-78.9-22.3-183.2-34.7-293.9-34.7s-215 12.3-293.9 34.7c-35.8 10.2-65 22.1-84.5 34.7-18.6 12-21.3 19.7-21.6 20.6v0.3l-40-0.3v-0.1c0-71.8 197-130 440-130s440 58.2 440 130v0.4l-40 0.2zM912 497v-0.5c-0.2-0.9-3-8.6-21.6-20.6-19.5-12.5-48.7-24.5-84.5-34.7-78.9-22.3-183.2-34.7-293.9-34.7s-215 12.3-293.9 34.7c-35.8 10.2-65 22.1-84.5 34.7-18.6 12-21.3 19.7-21.6 20.6v0.3l-40-0.3v-0.1c0-71.8 197-130 440-130s440 58.2 440 130v0.4l-40 0.2z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="wenjian4" unicode="&#59483;" d="M751.3-61.4H274.7c-82.7 0-150 67.3-150 150V679.8c0 82.7 67.3 150 150 150h138.9c13.8 0 25-11.2 25-25s-11.2-25-25-25H274.7c-55.1 0-100-44.9-100-100v-591.2c0-55.1 44.9-100 100-100h476.6c55.1 0 100 44.9 100 100v390H653.6c-32.4 0-62.8 12.6-85.7 35.6-22.9 23-35.4 53.5-35.2 85.9l0.9 204.9c0 10 6 19 15.2 22.9 9.2 3.9 19.8 2 27-4.8l317.7-301.2 0.3-0.3 0.5-0.5c4.3-4.5 6.9-10.6 6.9-17.2v-415c0.1-83-67.2-150.3-149.9-150.3z m-168 808.3l-0.6-147.1c-0.1-19 7.3-36.9 20.7-50.4 13.4-13.5 31.3-20.9 50.3-20.9h160L583.3 746.9zM701.4 298H324.6c-13.8 0-25 11.2-25 25s11.2 25 25 25h376.8c13.8 0 25-11.2 25-25s-11.2-25-25-25zM701.4 148.7H324.6c-13.8 0-25 11.2-25 25s11.2 25 25 25h376.8c13.8 0 25-11.2 25-25s-11.2-25-25-25z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="lianjie2" unicode="&#59484;" d="M427.392 259.328a40.448 40.448 0 0 0-31.168 13.376c-93.44 93.44-93.44 244.864 0 342.784l209.28 209.28c93.44 93.44 249.344 93.44 342.784 0a243.264 243.264 0 0 0 71.232-169.216c0-62.272-26.688-124.608-71.232-169.152L832.64 361.728c-17.856-17.792-44.544-17.792-57.92 0-17.792 17.792-17.792 44.544 0 57.856l120.256 120.256a155.904 155.904 0 0 1 0 222.592 155.904 155.904 0 0 1-222.656 0l-209.28-209.28a155.904 155.904 0 0 1 0-222.592c17.856-17.792 17.856-44.48 0-57.856-8.832-4.48-22.208-13.376-35.584-13.376zM240.448-128c-66.816 0-124.672 26.688-169.216 71.232A243.264 243.264 0 0 0 0 112.448c0 62.272 26.688 124.608 71.232 169.152l120.192 120.192c17.856 17.856 44.544 17.856 57.92 0 17.792-17.792 17.792-44.48 0-57.856l-120.256-120.192a155.904 155.904 0 0 1 0-222.656 158.08 158.08 0 0 1 111.36-44.48 158.08 158.08 0 0 1 111.296 44.48l209.28 209.28a158.08 158.08 0 0 1 44.48 111.36c0 44.48-17.792 80.064-44.544 111.232-17.792 17.792-17.792 44.544 0 57.92 17.792 17.792 44.544 17.792 57.92 0a243.264 243.264 0 0 0 71.232-169.216c0-66.752-26.752-124.672-71.232-169.152l-209.28-209.28C365.056-101.312 307.2-128 240.448-128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fenzhi2" unicode="&#59485;" d="M737.792 811.2a128 128 0 0 0 36.352-250.752C761.6 440.96 690.176 374.08 567.936 369.28l-14.208-0.256c-104.704 0-179.456-21.12-225.472-61.312l0.064-121.6a128 128 0 1 0-76.8 0V561.024a128 128 0 1 0 76.8 0l-0.128-160.96c53.44 28.352 121.6 43.264 203.84 45.44l21.76 0.32c88.064 0 133.248 35.456 143.36 115.968a128 128 0 0 0 40.64 249.344zM289.92 128a64 64 0 1 1 0-128 64 64 0 0 1 0 128z m0 619.2a64 64 0 1 1 0-128 64 64 0 0 1 0 128z m447.872 0a64 64 0 1 1 0-128 64 64 0 0 1 0 128z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="fenzhi-3" unicode="&#59486;" d="M199.095774 895.999795a170.536926 170.536926 0 0 0 59.166708-330.526654c30.719994-284.446663 286.719943-339.046332 406.753199-349.85977a170.577886 170.577886 0 1 0 159.866848-229.826514 171.622366 171.622366 0 0 0-161.566688 113.786857c-241.766352 11.386878-325.406655 102.973419-407.326639 205.373399v-101.273579a170.659806 170.659806 0 1 0-113.786857 0V564.346742A170.721246 170.721246 0 0 0 199.095774 895.999795m0-113.786857a56.893429 56.893429 0 1 1 56.893428-56.893429 57.057269 57.057269 0 0 1-56.893428 56.893429m0-682.659704a56.893429 56.893429 0 1 1 56.893428-56.893428 57.057269 57.057269 0 0 1-56.893428 56.893428m625.766275 113.786858a56.893429 56.893429 0 1 1 56.893428-56.893429 57.057269 57.057269 0 0 1-56.893428 56.893429z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tianping" unicode="&#59487;" d="M669.5 495.5c0-74.4 60.5-134.9 134.9-134.9s134.9 60.5 134.9 134.9c0 30.3-21.4 84.9-63.7 162.3-31 56.8-62.5 105.9-62.8 106.4v0.1c-0.2 0.3-0.4 0.6-0.7 0.9 0 0.1-0.1 0.1-0.1 0.2-0.2 0.2-0.4 0.5-0.6 0.7-0.1 0.1-0.2 0.2-0.3 0.2-0.2 0.2-0.4 0.3-0.6 0.5-0.1 0.1-0.2 0.1-0.3 0.2-0.6 0.4-1.3 0.8-2 1.1-0.1 0-0.2 0.1-0.2 0.1l-0.9 0.3c-0.1 0-0.2 0.1-0.3 0.1-0.3 0.1-0.6 0.1-0.9 0.2h-0.3c-0.4 0-0.8 0.1-1.2 0.1H556.6c-4.6 20.4-22.8 35.7-44.6 35.7s-40-15.3-44.6-35.7H221.6c-0.4 0-0.8 0-1.2-0.1h-0.3c-0.3 0-0.6-0.1-0.9-0.2-0.1 0-0.2-0.1-0.3-0.1l-0.9-0.3c-0.1 0-0.2-0.1-0.2-0.1-0.7-0.3-1.4-0.7-2-1.1-0.1-0.1-0.2-0.1-0.3-0.2-0.2-0.2-0.4-0.3-0.6-0.5-0.1-0.1-0.2-0.2-0.3-0.2l-0.7-0.7-0.1-0.1c-0.2-0.3-0.5-0.6-0.7-0.9v-0.1c-0.3-0.5-31.8-49.5-62.8-106.4-42.3-77.4-63.7-132-63.7-162.3 0-74.4 60.5-134.9 134.9-134.9s134.9 60.5 134.9 134.9c0 30.3-21.4 84.9-63.7 162.3-20.6 37.7-41.4 72-53.1 91h227.7c3.9-17.2 17.4-30.7 34.6-34.6v-587.9H315.7c-5.5 0-10-4.5-10-10V55H172.9c-5.5 0-10-4.5-10-10v-71.4c0-5.5 4.5-10 10-10h678.2c5.5 0 10 4.5 10 10V45c0 5.5-4.5 10-10 10H718.3v61.4c0 5.5-4.5 10-10 10H522V714.2c17.2 3.9 30.7 17.4 34.6 34.6h229.7c-11.7-18.9-32.5-53.2-53.2-91-42.2-77.3-63.6-131.9-63.6-162.3z m171.6-512H182.9v51.4h658.3v-51.4z m-142.8 71.4H325.7v51.4h372.7v-51.4zM221.6 380.6c-63.4 0-114.9 51.6-114.9 114.9 0 1.1 0 2.2 0.1 3.4h229.7c0.1-1.2 0.1-2.3 0.1-3.4-0.1-63.3-51.6-114.9-115-114.9z m111.3 138.3H110.2c6.3 24.4 22.1 64.2 57.6 129.2 21.1 38.6 42.4 73.6 53.7 91.9 11.4-18.3 32.7-53.3 53.7-91.9 35.6-65 51.5-104.8 57.7-129.2zM512 733.1c-14.2 0-25.7 11.5-25.7 25.7s11.5 25.7 25.7 25.7 25.7-11.5 25.7-25.7-11.5-25.7-25.7-25.7z m292.4-352.5c-63.4 0-114.9 51.6-114.9 114.9 0 1.1 0 2.3 0.1 3.5 0.6-0.1 1.1-0.2 1.7-0.2h227.9c0.1-1.2 0.1-2.3 0.1-3.4 0.1-63.2-51.5-114.8-114.9-114.8z m0 359.4c11.4-18.3 32.7-53.3 53.7-91.9 35.5-65 51.3-104.9 57.6-129.2H693.1c6.3 24.4 22.1 64.2 57.6 129.2 21.1 38.7 42.3 73.7 53.7 91.9z"  horiz-adv-x="1024" />
+
+    
    <glyph glyph-name="chexiao" unicode="&#58967;" d="M530.496 524.928h-6.144V661.632c0 51.136-29.312 72.448-65.472 43.328L122.816 434.624c-36.096-28.992-36.096-76.48 0.128-105.472l333.504-267.648c36.16-28.992 67.968 0.448 67.968 43.584v144.256h50.496c145.856 0 257.152-62.976 325.248-184.576 13.376-22.08 27.456-17.28 27.456 0-2.944 216.576-186.368 460.16-397.12 460.16z"  horiz-adv-x="1024" />

    
--- 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/src/App.js
+++ b/src/App.js
@ -75,17 +75,6 @@ const EducoderLogin = Loadable({
 	loading: Loading,
 })

-// 成果库
-const Achieve = Loadable({
-	loader: () => import('./achieveRequirement/achieve'),
-	loading: Loading,
-})
-// 需求管理
-const Requirement = Loadable({
-	loader: () => import('./achieveRequirement/requirement'),
-	loading: Loading,
-})
-
 class App extends Component {
 	constructor(props) {
 		super(props);
@ -270,28 +259,7 @@ class App extends Component {
 										(props) => {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
-									}></Route>
-
-								{/*成果库*/}
-								<Route
-									path={"/achieve"}
-									render={
-										(props) => {
-											return (<Achieve {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-
-								{/*需求管理/创客行动*/}
-								<Route
-									path={"/requirement"}
-									render={
-										(props) => {
-											return (<Requirement {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-
+								}></Route>
 								<Route exact path="/"
 									render={
 										(props) => (
@ -299,12 +267,7 @@ class App extends Component {
 										)
 									}
 								/>
-
-
-
 								<Route component={Shixunnopage} />
-
-
 							</Switch>
 						</Router>
 					</MuiThemeProvider>
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -2,17 +2,17 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-import cookie from 'react-cookies';
-import './index.css';
-let message501 = false;

+import './index.css';
+
+let message501 = false;
 broadcastChannelOnmessage('refreshPage', () => {
-  window.location.reload()
+  window.location.reload();
 })

 function locationurl(list) {
  if (window.location.port !== "3007") {
-    window.location.href = list
+  window.location.href = list
  }
 }
 // TODO 开发期多个身份切换
@ -24,55 +24,22 @@ if (isDev) {
    parsed = queryString.parse(_search);
  }
  debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
-    window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 's'
+  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
-function clearAllCookie() {
-  cookie.remove('_educoder_session', { path: '/' });
-  cookie.remove('autologin_trustie', { path: '/' });
-  setpostcookie()
-}
-// clearAllCookie();
-function setpostcookie() {
-  const str = window.location.pathname;
-  if (str.indexOf("/wxcode") !== -1) {
-    cookie.remove('_educoder_session', { path: '/' });
-    cookie.remove('autologin_trustie', { path: '/' });
-    const _params = window.location.search;
-    if (_params) {
-      let _search = _params.split('?')[1];
-      let _educoder_sessions = _search.split('&')[0].split('=');
-      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
-      let autologin_trusties = _search.split('&')[1].split('=');
-      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
-    }
-  }
-}
-setpostcookie();
-
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-  initOnlineOfflineListener()
-  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
-  var
-    proxy = "http://localhost:3000";
-    proxy = "http://117.50.100.12:49999";
+  // 判断网络是否连接
+  initOnlineOfflineListener();

-  const requestMap = {};
-  window.setfalseInRequestMap = function (keyName) {
-    requestMap[keyName] = false;
-  }
+  var proxy = "https://testforgeplus.trustie.net";
  //响应前的设置
  axios.interceptors.request.use(
    config => {
-      setpostcookie()
-      clearAllCookie()
-
-      if (config.url.indexOf(proxy) !== -1 || config.url.indexOf("http") !== -1) {
+      if(config.url.indexOf("http") !== -1) {
        return config
      }
-      requestProxy(config)
-
+      requestProxy(config);
      let url = `/api${config.url}`;

      if (`${config[0]}` !== `true`) {
@ -86,11 +53,6 @@ export function initAxiosInterceptors(props) {
        } else {
          config.url = url;
        }
-        setpostcookie();
-      }
-      if (config.url.indexOf('update_file') === -1) {
-        requestMap[config.url] = true;
-        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
      }
      return config;
    },
@ -145,8 +107,6 @@ export function initAxiosInterceptors(props) {
        message501 = false
      }, 2000);
    }
-    requestMap[response.config.url] = false;
-    setpostcookie();
    return response;
  }, function (error) {
    return Promise.reject(error);
--- a/src/achieveRequirement/achieve.js
+++ b/src/achieveRequirement/achieve.js
@ -1,97 +0,0 @@
-import React, { Component } from "react";
-
-import { Route, Switch } from "react-router-dom";
-import { withRouter } from "react-router";
-import { SnackbarHOC } from "educoder";
-import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
-import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-import Loadable from "react-loadable";
-import Loading from "../Loading";
-import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
-import './index.scss';
-
-const AchieveIndex = Loadable({
-  loader: () => import("./achieve/achieveList"),
-  loading: Loading,
-});
-const AchieveDetail = Loadable({
-  loader: () => import("./achieve/achieveDetail"),
-  loading: Loading,
-});
-const AchieveMine = Loadable({
-  loader: () => import("./achieve/achieveMine"),
-  loading: Loading,
-});
-const AchieveAdd = Loadable({
-  loader: () => import("./achieve/achieveEdit"),
-  loading: Loading,
-});
-const AchieveEdit = Loadable({
-  loader: () => import("./achieve/achieveEdit"),
-  loading: Loading,
-});
-
-class Index extends Component {
-  render() {
-    return (
-      <div className="newMain clearfix">
-        <Switch {...this.props}>
-
-          <Route
-            path="/achieve/achieveDetail/:achieveId"
-            render={(props) => (
-              <AchieveDetail {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/achieve/achieveMine"
-            render={(props) => (
-              <AchieveMine {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/achieve/achieveAdd"
-            render={(props) => (
-              <AchieveAdd {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/achieve/achieveEdit/:achieveId"
-            render={(props) => (
-              <AchieveEdit {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/achieve"
-            render={(props) => (
-              <AchieveIndex {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/"
-            render={(props) => (
-              <AchieveIndex {...this.props} {...props} />
-            )}
-          ></Route>
-
-          {/* <Route
-            exact
-            path="/"
-            render={(props) => (
-              this.props.current_user && this.props.current_user.login ?
-              <Infos {...this.props} {...props} />
-              :
-              <AchieveIndex {...this.props} {...props} />
-            )}
-          ></Route> */}
-        </Switch>
-      </div>
-    );
-  }
-}
-export default withRouter(
-  ImageLayerOfCommentHOC({
-    imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
-    parentSelector: ".newMain",
-  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
-);
--- a/src/achieveRequirement/achieve/achieveDetail/index.jsx
+++ b/src/achieveRequirement/achieve/achieveDetail/index.jsx
@ -1,142 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Modal } from 'antd';
-import { Document, Page, pdfjs } from 'react-pdf';
-import DelModal from '../../components/DelModal';
-import { httpUrl } from '../../../fetch';
-import { deleteAchieve, getAchieveDetail } from '../api';
-import './index.scss';
-
-pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
-
-export default (props) => {
-  const { match, history, current_user } = props;
-  const id = match.params.achieveId;
-  const [achiveForm, setAchiveForm] = useState({});
-  const [createUserId, setCreateUserId] = useState("");
-  const [visible, setVisible] = useState(false);
-  const [fileType, setFileType] = useState(4);
-  const [fileUrl, setFileUrl] = useState(4);
-  const [numPages, setNumPages] = useState(null);
-
-  useEffect(() => {
-    getAchieveDetail(id).then(data => {
-      setAchiveForm(data);
-      setCreateUserId(data.user.id);
-    })
-  }, [id]);
-
-  function editItem() {
-    props.history.push(`/achieve/achieveEdit/${id}`);
-  }
-
-  function deletItem() {
-    DelModal(() => {
-      deleteAchieve(id).then(res => {
-        if (res.code === '1') {
-          props.showNotification("删除成功");
-          history.go(-1);
-        } else {
-          props.showNotification("删除失败");
-        }
-      })
-    });
-  }
-
-  function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
-  }
-
-  function pdfShow(e) {
-    setFileType(e.fileType);
-    if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
-      // pdf||video||img
-      setVisible(true);
-      setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
-    }
-  }
-
-  function onDocumentLoadSuccess({ numPages }) {
-    setNumPages(numPages);
-  }
-
-  return (
-    <div className="centerbox">
-      <div className="center-content">
-        <div className="centerScreen">
-          <div className="center-left-but">{achiveForm.achievementName}</div>
-          {
-            createUserId === current_user.user_id &&
-            <div className="center-right-but" ><span onClick={editItem}>编辑</span> <span onClick={deletItem}>删除</span></div>
-          }
-        </div>
-
-        <Descriptions className="item-content" column={1}>
-          <Descriptions.Item label="成果类别">{achiveForm.achievementType && achiveForm.achievementType.dicItemName}</Descriptions.Item>
-          <Descriptions.Item label="标签">
-            {
-              achiveForm.achievementLabel && achiveForm.achievementLabel.map(itemx => {
-                return <span className="list-tag" key={itemx + 'ax'}>{itemx}</span>
-              })
-            }
-          </Descriptions.Item>
-          <Descriptions.Item label="单位名称">{achiveForm.achievementBelong}</Descriptions.Item>
-          <Descriptions.Item label="发布时间">{achiveForm.updatedAt}</Descriptions.Item>
-          <Descriptions.Item label="成果描述">{achiveForm.achievementRemark}</Descriptions.Item>
-          <Descriptions.Item label="成果文件" className="file-list-item">
-            {
-              achiveForm.achievementAttachments && achiveForm.achievementAttachments.map(item => {
-                return <div className="file-list-box" key={item.id + 'down'}>
-                  <p onClick={() => { pdfShow(item) }}>{item.fileName}</p>
-                  <span className="downP" onClick={() => { downFile(item) }}>下载</span>
-                </div>
-              })
-            }
-          </Descriptions.Item>
-        </Descriptions>
-      </div>
-
-      <Modal
-        visible={visible}
-        maskClosable={true}
-        closable={true}
-        footer={null}
-        onCancel={() => { setVisible(false) }}
-        className="file-modal"
-      >
-        {
-          fileType === 3 && <div >
-            <img className="show-img" src={fileUrl} alt="" />
-          </div>
-        }
-        {
-          fileType === 2 && <div>
-            <video src={fileUrl} style={{ width: '100%' }} controls="controls">您的浏览器不支持 video 标签。</video>
-          </div>
-        }
-        {
-          fileType === 1 && <div className="pdf-box">
-            {
-              <Document
-                file={fileUrl}
-                onLoadSuccess={onDocumentLoadSuccess}
-              >
-                {new Array(numPages).fill("").map((item, index) => {
-                  return (
-                    <Page
-                      loading=""
-                      noData=""
-                      key={index}
-                      pageNumber={index + 1}
-                      renderTextLayer={true}
-                    />
-                  );
-                })}
-              </Document>
-            }
-          </div>
-        }
-      </Modal>
-    </div>
-  )
-}
--- a/src/achieveRequirement/achieve/achieveDetail/index.scss
+++ b/src/achieveRequirement/achieve/achieveDetail/index.scss
@ -1,33 +0,0 @@
-// 内容详情
-.item-content {
-  padding: 10px 10px 0 30px;
-}
-.ant-descriptions-item-label {
-  width: 5em;
-  margin-right: 5px;
-  color: rgba(0, 0, 0, 0.65);
-  text-align: right;
-}
-.ant-descriptions-item-content {
-  color: rgba(0, 0, 0, 1);
-}
-.file-list-item > span {
-  vertical-align: top;
-}
-.file-list-box {
-  width: 600px;
-  height: 60px;
-  display: flex;
-  justify-content: space-between;
-  p:hover {
-    cursor: pointer;
-    color: #0089ff;
-  }
-  .downP {
-    color: #0089ff;
-    cursor: pointer;
-    text-decoration: none;
-  }
-}
-
-
--- a/src/achieveRequirement/achieve/achieveEdit/index.jsx
+++ b/src/achieveRequirement/achieve/achieveEdit/index.jsx
@ -1,236 +0,0 @@
-import React, { forwardRef, useCallback, useEffect, useState } from 'react';
-import { Form, Input, Select, Button, } from 'antd';
-import Upload from '../../components/Upload';
-import { httpUrl } from '../../../fetch';
-import { getDictionary, getAchieveDetail, addAchieve, editAchieve } from '../api';
-import './index.scss';
-
-const Option = Select.Option;
-const { TextArea } = Input;
-
-export default Form.create()(
-  forwardRef(({ form, showNotification, match, history }, ref) => {
-    const [shareType, setShareType] = useState([]);
-    const [tagType, setTagType] = useState([]);
-    const [fileList, setFileList] = useState(null);
-    const [achievementFileTypes, setAchievementFileTypes] = useState('');
-
-    const id = match.params.achieveId;
-    const { getFieldDecorator, validateFields, setFieldsValue } = form;
-
-    useEffect(() => {
-      id && getAchieveDetail(id).then(data => {
-        const formValue = {
-          achievementName: data.achievementName,
-          achievementTypeId: data.achievementTypeId,
-          achievementBelong: data.achievementBelong,
-          achievementLabel: data.achievementLabel,
-          achievementRemark: data.achievementRemark,
-          achievementFiles: data.achievementFiles
-        };
-        setFieldsValue(formValue);
-        if (data.achievementAttachments.length) {
-          for (const item of data.achievementAttachments) {
-            item.name = item.fileName;
-            item.size = item.fileSize;
-            item.uid = "rc-upload" + item.id
-          }
-          setFileList(data.achievementAttachments);
-        }
-      })
-    }, [id]);
-
-    // 加载选项数据
-    useEffect(() => {
-      getDictionary('share_type').then((res) => {
-        setShareType(res.data);
-      });
-      getDictionary("tag_type").then((res) => {
-        setTagType(res.data);
-      });
-    }, []);
-
-    // 上传附件后得到的文件数组
-    function UploadFunc(fileList) {
-      setFileList(fileList);
-      let files = [];
-      let fileTypes = [];
-      for (const item of fileList) {
-        files.push(item.id || item.response.data.id);
-        fileTypes.push(item.fileType || item.response.data.fileType);
-      }
-      setFieldsValue({
-        achievementFiles: files.join()
-      });
-      setAchievementFileTypes(fileTypes.join());
-    }
-
-    const helper = useCallback(
-      (label, name, rules, widget) => (
-        <Form.Item label={label}>
-          {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
-        </Form.Item>
-      ),
-      []
-    );
-
-    const formItemLayout = {
-      labelCol: {
-        xs: { span: 12 },
-        sm: { span: 4 },
-      },
-      wrapperCol: {
-        xs: { span: 12 },
-        sm: { span: 16 },
-      },
-    };
-
-    const tailFormItemLayout = {
-      wrapperCol: {
-        xs: {
-          span: 20,
-          offset: 4,
-        },
-        sm: {
-          span: 20,
-          offset: 4,
-        },
-      },
-    };
-
-    // 修改
-    function saveItem() {
-      validateFields((error, values) => {
-        if (!error) {
-          let params = {
-            ...values,
-            achievementFileTypes,
-          };
-          params.achievementLabel = params.achievementLabel.join();
-
-          if (id) {
-            // 编辑
-            params.id = id;
-            editAchieve(params).then(res => {
-              if (res.code === '1') {
-                showNotification("成果更新成功！");
-                history.go(-1);
-              } else {
-                showNotification(res.message);
-              }
-            });
-          } else {
-            // 新增
-            params.uploadUserId = 1;
-            addAchieve(params).then(res => {
-              if (res.code === '1') {
-                showNotification("成果新增成功！");
-                history.go(-1);
-              } else {
-                showNotification(res.message);
-              }
-            });
-          }
-        }
-      })
-    }
-
-    return (
-      <div className="centerbox">
-        <div className="center-content">
-
-          <div className="centerScreen">
-            <div className="center-left-but">{id ? '修改' : '新增'}成果</div>
-          </div>
-
-          <Form className="achieve-form" {...formItemLayout}>
-            {helper(
-              "成果名称：",
-              "achievementName",
-              [{ required: true, message: "请输入成果名称" }],
-              <Input
-                className="edit-input"
-                placeholder="请输入成果名称"
-              />
-            )}
-
-            {helper(
-              "成果类别：",
-              "achievementTypeId",
-              [{ required: true, message: "请选择成果类别" }],
-              <Select placeholder="请选择成果类别"
-                className="edit-input"
-              >
-                {
-                  shareType.map(item => {
-                    return <Option key={item.dicItemName + item.id} value={item.id}>{item.dicItemName}</Option>
-                  })
-                }
-              </Select>
-            )}
-
-            {helper(
-              "单位名称：",
-              "achievementBelong",
-              [{ required: true, message: "请输入单位名称" }],
-              <Input
-                className="edit-input"
-                placeholder="请输入单位名称"
-              />
-            )}
-
-            <Form.Item label={"成果文件："} required={true}>
-              <Upload
-                className="commentStyle"
-                load={UploadFunc}
-                size={100}
-                showNotification={showNotification}
-                actionUrl={httpUrl}
-                fileList={fileList}
-              />
-
-              {/* 用一个隐藏的input实现上传文件的必填校验 */}
-              {getFieldDecorator('achievementFiles', {
-                rules: [{ required: true, message: "请上传成果文件" }], validateFirst: true
-              })(<Input style={{ display: 'none' }} />)}
-            </Form.Item>
-
-            {helper(
-              "标签：",
-              "achievementLabel",
-              [{ required: true, message: "请选择成果标签" }],
-              <Select
-                className="edit-input"
-                placeholder="请选择成果标签"
-                mode="tags"
-                tokenSeparators={[',']}
-              >
-                {
-                  tagType.map(item => {
-                    return <Option key={item.dicItemName}>{item.dicItemName}</Option>
-                  })
-                }
-              </Select>
-            )}
-
-            {helper(
-              "成果描述：",
-              "achievementRemark",
-              [{ required: true, message: "请输入成果描述" }],
-              <TextArea
-                placeholder="请输入成果描述"
-                autoSize={{ minRows: 3, maxRows: 5 }}
-              />
-            )}
-
-            <Form.Item {...tailFormItemLayout}>
-              <Button className="mr20" type={"primary"} onClick={saveItem}>保存</Button>
-              <Button onClick={() => { history.go(-1) }}>取消</Button>
-            </Form.Item>
-
-          </Form>
-        </div>
-      </div>
-    )
-  })
-)
--- a/src/achieveRequirement/achieve/achieveEdit/index.scss
+++ b/src/achieveRequirement/achieve/achieveEdit/index.scss
@ -1,4 +0,0 @@
-  .achieve-form{
-    padding:24px 40px 0px 40px;
-  }
-  
--- a/src/achieveRequirement/achieve/achieveList/index.jsx
+++ b/src/achieveRequirement/achieve/achieveList/index.jsx
@ -1,148 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import classNames from 'classnames';
-import { Pagination, Button, Icon } from 'antd';
-import ChooseNav from '../../components/chooseNav';
-import ItemList from '../../components/itemList';
-import { getDictionary, getAchieveList } from '../api';
-
-export default (props) => {
-  const { current_user } = props;
-  // console.log(current_user);
-
-  const [achievementTypeId, setAchievementTypeId] = useState('');  //成果类别
-  const [achievementFileTypes, setAchievementFileTypes] = useState('');  //文件类型
-  const [orderBy, setOrderBy] = useState('-1');
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  const [industryOption, setIndustryOption] = useState([]);
-  const [achiveList, setAchiveList] = useState([]);
-
-  useEffect(() => {
-    getDictionary('share_type').then(res => {
-      if (res && res.data) setIndustryOption(res.data);
-    });
-  }, []);
-
-  useEffect(() => {
-    const params = {
-      achievementTypeId,
-      achievementFileTypes,
-      achievementLabel: '',
-      isOwned: '',
-      orderBy,
-      curPage,
-      pageSize: 10
-    };
-    getAchieveList(params).then(data => {
-      setAchiveList(data.rows);
-      setTotal(data.total);
-    })
-  }, [achievementTypeId, achievementFileTypes, orderBy, curPage]);
-
-
-  function changeOptionId(option, type) {
-    if (type === 'share_type') {
-      setAchievementTypeId(option.id);
-      setCurPage(1);
-    } else if (type === 'file_type') {
-      setAchievementFileTypes(option.id);
-      setCurPage(1);
-    }
-  }
-
-  function changeSort(sortType) {
-    setOrderBy(sortType);
-    setCurPage(1);
-  }
-
-  function goAchieveMine() {
-    props.history.push('/achieve/achieveMine');
-  }
-  function goAdd() {
-    props.history.push("/achieve/achieveAdd");
-  }
-
-  function achiveClick(id) {
-    props.history.push(`/achieve/achieveDetail/${id}`);
-  }
-
-  const filetypeOption = [
-    {
-      dicItemName: '文件',
-      id: 1
-    },
-    {
-      dicItemName: '视频',
-      id: 2
-    },
-    {
-      dicItemName: '图片',
-      id: 3
-    },
-    {
-      dicItemName: '软件',
-      id: 4
-    },
-    {
-      dicItemName: '其它',
-      id: 5
-    },
-  ];
-
-
-  return (
-    <div className="centerbox">
-      <div className="nav-content">
-        <ChooseNav
-          key={'share_type'}
-          type={'share_type'}
-          title={'成果类别'}
-          options={industryOption}
-          changeOptionId={changeOptionId}
-        />
-
-        <ChooseNav
-          key={'file_type'}
-          type={'file_type'}
-          title={'文件类型'}
-          options={filetypeOption}
-          changeOptionId={changeOptionId}
-        />
-      </div>
-
-      <div className="center-content">
-        <div className="centerScreen">
-          <div className="center-left-but">
-            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === '-1' })} onClick={() => { changeSort('-1') }}>默认</div>
-            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === 'created_at' })} onClick={() => { changeSort('created_at') }}><Icon type="arrow-down" />最新</div>
-            <div className={classNames({ 'center-left-butD': true, 'center-left-butDACT': orderBy === 'view_count' })} onClick={() => { changeSort('view_count') }}><Icon type="arrow-down" />最热</div>
-          </div>
-          {
-            // current_user.login &&
-            <div className="center-right-but">
-              <Button className="mr15 font-12" size="small" type="primary" onClick={goAchieveMine}>我的成果</Button>
-              <Button className="mr20 font-12" size="small" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>发布成果</Button>
-            </div>
-          }
-        </div>
-
-        <ItemList
-          list={achiveList}
-          itemClick={achiveClick}
-        />
-
-      </div>
-
-      <div className="edu-txt-center ">
-        <Pagination
-          showQuickJumper
-          onChange={(page) => { setCurPage(page) }}
-          current={curPage}
-          total={total}
-          showTotal={total => `共 ${total} 条`}
-        />
-      </div>
-
-    </div>
-  )
-}
--- a/src/achieveRequirement/achieve/achieveMine/index.jsx
+++ b/src/achieveRequirement/achieve/achieveMine/index.jsx
@ -1,82 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Pagination } from 'antd';
-import ItemList from '../../components/itemList';
-import DelModal from '../../components/DelModal';
-import { deleteAchieve, getAchieveList } from '../api';
-
-export default (props) => {
-  const [achiveList, setAchiveList] = useState([]);
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-
-  useEffect(() => {
-    getAcheiveListOwn();
-  }, [curPage]);
-
-  function getAcheiveListOwn() {
-    const params = {
-      achievementTypeId: '',
-      achievementFileTypes: '',
-      achievementLabel: '',
-      // isOwned: '',  //方便游客身份时显示数据
-      isOwned: true,
-      orderBy: -1,
-      curPage,
-      pageSize: 10
-    };
-    getAchieveList(params).then(data => {
-      setAchiveList(data.rows);
-      setTotal(data.total);
-    })
-  }
-
-  function achiveClick(id) {
-    props.history.push(`/achieve/achieveDetail/${id}`);
-  }
-
-  function editItem(id) {
-    props.history.push(`/achieve/achieveEdit/${id}`);
-  }
-
-  function deletItem(id) {
-    DelModal(() => {
-      deleteAchieve(id).then(res => {
-        if (res.code === '1') {
-          props.showNotification("删除成功");
-          getAcheiveListOwn();
-        } else {
-          props.showNotification("删除失败");
-        }
-      })
-    });
-  }
-
-  return (
-    <div className="centerbox">
-      <div className="center-content">
-        <div className="centerScreen">
-          <div className="center-left-but">
-            我的成果
-          </div>
-        </div>
-
-        <ItemList
-          list={achiveList}
-          itemClick={achiveClick}
-          deletItem={deletItem}
-          editItem={editItem}
-        />
-      </div>
-
-      <div className="edu-txt-center ">
-        <Pagination
-          showQuickJumper
-          onChange={(page) => { setCurPage(page) }}
-          current={curPage}
-          total={total}
-          showTotal={total => `共 ${total} 条`}
-        />
-      </div>
-    </div>
-  )
-}
--- a/src/achieveRequirement/achieve/api.js
+++ b/src/achieveRequirement/achieve/api.js
@ -1,62 +0,0 @@
-import fetch from '../../fetch';
-
-// 获取字典分类列表
-export function getDictionary(id) {
-  return fetch({
-    url: '/dicItem/getData?dicTypeCode=' + id,
-    method: 'get'
-  });
-}
-
-// 成果列表查询
-export async function getAchieveList(params) {
-  let res = await fetch({
-    url: '/api/achievement/',
-    method: 'get',
-    params,
-  })
-  if (res && res.data) {
-    for (const i of res.data.rows) {
-      // 处理分解标签
-      i.tag = i.achievementLabel.split(',');
-    }
-  }
-  return res.data;
-}
-
-//新增成果
-export function addAchieve(data) {
-  return fetch({
-    url: '/api/achievement/',
-    method: 'post',
-    data: data
-  });
-}
-
-//删除成果
-export function deleteAchieve(id) {
-  return fetch({
-    url: '/api/achievement/' + id,
-    method: 'DELETE',
-  });
-}
-
-//更新成果
-export function editAchieve(data) {
-  return fetch({
-    url: '/api/achievement/',
-    method: 'put',
-    data: data
-  });
-}
-
-// 成果详情查询
-export async function getAchieveDetail(id) {
-  let res = await fetch({
-    url: '/api/achievement/' + id,
-    method: 'get',
-  });
-  res.data.achievementLabel = res.data.achievementLabel.split(',');
-  return res.data;
-}
-
--- a/src/achieveRequirement/components/DelModal.jsx
+++ b/src/achieveRequirement/components/DelModal.jsx
@ -1,20 +0,0 @@
-import { Modal } from 'antd';
-
-export default (
-  handleOk,
-  title,
-  content,
-  handleCancel) => {
-  return Modal.confirm({
-    title: title || "警告",
-    content: content || "确认删除？",
-    okText: '确定',
-    cancelText: '取消',
-    onOk() {
-      handleOk && handleOk();
-    },
-    onCancel() {
-      handleCancel && handleCancel();
-    }
-  });
-}
--- a/src/achieveRequirement/components/Upload.jsx
+++ b/src/achieveRequirement/components/Upload.jsx
@ -1,97 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { Upload, Button } from 'antd';
-import axios from 'axios';
-import { appendFileSizeToUploadFileAll } from 'educoder';
-axios.defaults.withCredentials = true;
-
-function Uploads({ className, size, actionUrl, fileList, showNotification, load }) {
-  const [files, setFiles] = useState(undefined);
-
-  useEffect(() => {
-    if (fileList) {
-      init();
-    }
-  }, [fileList]);
-
-  function init() {
-    let f = appendFileSizeToUploadFileAll(fileList);
-    setFiles(f);
-  }
-  function onAttachmentRemove(file) {
-    if (!file.percent || file.percent === 100) {
-      deleteAttachment(file);
-      return false;
-    }
-  }
-  function deleteAttachment(file) {
-    let id = (file.response && file.response.data && file.response.data.id) || file.id;
-
-    // 暂时不直接删除上传的文件，只在最后保存的时候进行修改
-    let nf = files.filter(item => {
-      let itemId = (item.response && item.response.data && item.response.data.id) || item.id;
-      return itemId !== id;
-    });
-    setFiles(nf);
-    // fileIdList(nf);
-    load && load(nf);
-
-    // 发送服务到后台删除文件，同步更新数据
-    // const url = actionUrl + `/busiAttachments/${id}`;
-    // axios.delete(url).then((response) => {
-    //   if (response.data) {
-    //     if (response.data.code === "1") {
-    //       let nf = files.filter(item => (item.response.data.id !== id) && (item.id !== id));
-    //       setFiles(nf);
-    //       fileIdList(nf);
-    //     } else {
-    //       showNotification(response.data.message);
-    //     }
-    //   }
-    // }).catch(function (error) {
-    //   console.log(error);
-    // });
-  }
-
-
-  function handleChange(info) {
-    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-      let fileList = info.fileList;
-      setFiles(appendFileSizeToUploadFileAll(fileList));
-      if (info.file.status === 'done' || info.file.status === 'removed') load && load(fileList);
-    }
-  }
-
-  // function fileIdList(fileList) {
-  //   let id = [];
-  //   let fileType = [];
-  //   for (const item of fileList) {
-  //     id.push(item.id || item.response.data.id);
-  //     fileType.push(item.fileType || item.response.data.fileType);
-  //   }
-  //   load && load(id.join(), fileType.join());
-  // }
-
-  function beforeUpload(file) {
-    const isLt100M = file.size / 1024 / 1024 < size;
-    if (!isLt100M) {
-      showNotification(`文件大小必须小于${size}MB!`);
-    }
-    return isLt100M;
-  }
-
-  const upload = {
-    name: 'file',
-    fileList: files,
-    action: actionUrl + `/busiAttachments/upload`,
-    onChange: handleChange,
-    onRemove: onAttachmentRemove,
-    beforeUpload: beforeUpload,
-  };
-  return (
-    <Upload {...upload} className={className}>
-      <Button type="primary">点击上传</Button>
-      <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
-    </Upload>
-  )
-}
-export default Uploads;
--- a/src/achieveRequirement/components/chooseNav/index.jsx
+++ b/src/achieveRequirement/components/chooseNav/index.jsx
@ -1,29 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import classNames from 'classnames';
-import './index.scss';
-
-export default (props) => {
-  const { title, options, changeOptionId, type } = props;
-
-  const [option, setOption] = useState({ id: "", dicItemName: "" ,dicItemCode:""});
-
-  useEffect(() => {
-    changeOptionId(option, type);
-  }, [option])
-
-  return (
-
-    <div className="shop-box">
-      <div className="choose-title">{title}</div>
-      <div className="choose-list">
-        <div className={classNames({ "choose-item-checked": option.id === "", "choose-item": true })} key={"all"} onClick={() => { setOption({ id: "", dicItemName: "" }) }}>全部</div>
-        {
-          options.map((item) => {
-            return <div className={classNames({ "choose-item-checked": option.id === item.id, "choose-item": true })} key={item.dicItemName} onClick={() => { setOption(item) }} >{item.dicItemName}</div>
-          })
-        }
-      </div>
-    </div>
-
-  )
-}
--- a/src/achieveRequirement/components/chooseNav/index.scss
+++ b/src/achieveRequirement/components/chooseNav/index.scss
@ -1,41 +0,0 @@
-.nav-content {
-  margin-top:20px;
-  background: #fff;
-  border-bottom: 1px solid #eaeaea;
-  box-shadow: #ddd 0px 0px 5px;
-}
-.shop-box {
-  width: 1280px;
-  border-top: 1px solid #eaeaea;
-  display: flex;
-  justify-content: start;
-}
-.choose-title {
-  width: 110px;
-  background: #f3f3f3;
-  text-align: center;
-  padding: 16px 0;
-  font-size: 14px;
-  color: #666;
-  font-weight: 600;
-}
-.choose-list {
-  width: 1170px;
-  padding: 16px 0;
-  display: flex;
-  justify-content: start;
-}
-.choose-item {
-  font-size: 14px;
-  text-align: center;
-  padding: 0 15px ;
-  cursor: pointer;
-  &:hover{
-    color: #0072ff;
-  }
-}
-
-.choose-item-checked {
-  color: #0072ff;
-}
-
--- a/src/achieveRequirement/components/itemList/index.jsx
+++ b/src/achieveRequirement/components/itemList/index.jsx
@ -1,42 +0,0 @@
-import React from 'react';
-import './index.scss';
-const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
-const classArr = ['', 'list-done', 'list-done', 'list-done', 'list-error', '', '', 'list-error'];
-
-export default (props) => {
-  const { list, itemClick, editItem, deletItem, activeByStatus } = props;
-
-  return (
-    list.map(item => {
-      return (
-        <div className="list-box" key={item.id}>
-          <div className="list-title" onClick={() => { itemClick(item.id) }}>
-            {item.achievementName || item.title}
-            {item.status && <span className={classArr[item.status]}>{statusArr[item.status]}</span>}
-          </div>
-          <div >
-            {
-              item.tag.map(i => {
-                return <span className="list-tag" key={i + "av"}>{i}</span>;
-              })
-            }
-          </div>
-          <div className="list-other">
-            {item.user && <p>发布者：{item.user.nickname ? item.user.nickname : item.user.login}</p>}
-            {item.createUser && <p>发布者：{item.createUser.nickname ? item.createUser.nickname : item.createUser.login}</p>}
-            <p>发布时间：{item.achievementPublishTime || item.createTime}</p>
-          </div>
-          {
-            editItem && <div className="list-box-action">
-              {
-                !activeByStatus || (activeByStatus && item.status == '0' || item.status == '4' || item.status == '5') &&
-                <button onClick={() => { editItem(item.id) }}><i className="iconfont icon-zaibianji font-25"></i></button>
-              }
-              <button onClick={() => { deletItem(item.id) }}><i className="iconfont icon-shanchu font-30 "></i></button>
-            </div>
-          }
-        </div>
-      )
-    })
-  )
-}
--- a/src/achieveRequirement/components/itemList/index.scss
+++ b/src/achieveRequirement/components/itemList/index.scss
@ -1,70 +0,0 @@
-.list-box {
-  position: relative;
-  padding: 20px;
-  background: #fff;
-  border-bottom: 1px solid #dedede;
-}
-.list-title {
-  font-size: 17px;
-  color: #000;
-  cursor: pointer;
-}
-.list-title:hover {
-  color: #409eff;
-}
-.list-title span {
-  padding: 3px 5px;
-  margin-left:.5em;
-  background: #f8c753;
-  font-size: 13px;
-  color: #fff;
-  border-radius: 3px;
-}
-span.list-done {
-  background: #35d77e;
-}
-span.list-error {
-  background: #f56c6c;
-}
-
-.list-tag {
-  display: inline-block;
-  margin: 5px 10px 5px 0;
-  background: #cfe9ff;
-  color: #0089ff;
-  font-size: 14px;
-  border-radius: 3px;
-  padding: 2px 5px;
-}
-.list-other > p {
-  display: inline-block;
-  margin: 0 10px 0 0;
-  font-size: 12px;
-  color: #666;
-}
-
-.list-box-action {
-  position: absolute;
-  display: flex;
-  align-items: center;
-  top: 0;
-  bottom: 0;
-  right: 100px;
-  visibility: hidden;
-}
-.list-box:hover .list-box-action {
-  visibility: visible;
-}
-.list-box-action button {
-  display: inline-block;
-  margin: 0 25px;
-  width: 50px;
-  height: 50px;
-  color: #0089ff;
-  line-height: 50px;
-  text-align: center;
-  border: 0;
-  border-radius: 25px;
-  box-shadow: 2px 2px 5px 2px #eee;
-  cursor: pointer;
-}
--- a/src/achieveRequirement/index.scss
+++ b/src/achieveRequirement/index.scss
@ -1,100 +0,0 @@
-// 本模块公共样式
-
-.centerbox {
-  width: 80vw;
-  max-width: 1280px;
-  margin: 40px auto;
-}
-.center-content {
-  margin: 20px 0;
-  background: #fff;
-  border: 1px solid #dedede;
-  box-shadow: #eee 0px 1px 1px 3px;
-}
-.centerScreen {
-  display: flex;
-  justify-content: space-between;
-  height: 46px;
-  background-color: #fff;
-  border-bottom: 1px solid #dedede;
-}
-
-// 内容标题左侧样式
-.center-left-but {
-  display: flex;
-  justify-content: start;
-  align-items: center;
-  margin-left: 20px;
-  font-size: 16px;
-  font-weight: 600;
-}
-.center-left-butD {
-  height: 24px;
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 24px;
-  color: #333;
-  padding: 0 10px;
-  background-color: #fff;
-  border: 1px solid #dedede;
-}
-.center-left-butD:hover {
-  background-color: #fff;
-  color: #409eff;
-  cursor: pointer;
-}
-.center-left-butDACT {
-  background-color: #409eff;
-  color: #fff;
-}
-
-// 内容标题右侧样式
-.center-right-but {
-  display: flex;
-  align-items: center;
-}
-.center-right-but > span {
-  margin: 0 10px;
-  font-size: 16px;
-  color: #0089ff;
-  cursor: pointer;
-}
-
-// 通用标签样式
-.list-tag {
-  display: inline-block;
-  margin-right: 10px;
-  background: #cfe9ff;
-  color: #0089ff;
-  font-size: 14px;
-  border-radius: 3px;
-  padding: 2px 5px;
-  line-height: 25px;
-}
-
-// 文件预览modal样式
-.file-modal {
-  width: 800px !important;
-  .ant-modal-body {
-    padding-top: 40px;
-    .pdf-box {
-      height: 70vh;
-      overflow-y: scroll;
-    }
-  }
-  .ant-modal-close {
-    top: 0 !important;
-  }
-  .show-img {
-    width: 100%;
-  }
-  .react-pdf__Page__canvas,
-  .react-pdf__Page__textContent {
-    margin: 0 auto;
-    max-width: 100%;
-  }
-}
-
-.edit-input {
-  max-width: 500px;
-}
--- a/src/achieveRequirement/requirement.js
+++ b/src/achieveRequirement/requirement.js
@ -1,95 +0,0 @@
-import React, { Component } from "react";
-
-import { Route, Switch } from "react-router-dom";
-import { withRouter } from "react-router";
-import { SnackbarHOC } from "educoder";
-import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
-import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-import Loadable from "react-loadable";
-import Loading from "../Loading";
-import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
-import './index.scss';
-
-const RequireList = Loadable({
-  loader: () => import("./requirement/requireList"),
-  loading: Loading,
-});
-
-const RequireDetail = Loadable({
-  loader: () => import("./requirement/requireDetail"),
-  loading: Loading,
-});
-
-const RequireMine = Loadable({
-  loader: () => import("./requirement/requireMine"),
-  loading: Loading,
-});
-const RequireAdd = Loadable({
-  loader: () => import("./requirement/requireEdit"),
-  loading: Loading,
-});
-const RequireEdit = Loadable({
-  loader: () => import("./requirement/requireEdit"),
-  loading: Loading,
-});
-
-class Index extends Component {
-  render() {
-    return (
-      <div className="newMain clearfix">
-        <Switch {...this.props}>
-
-          <Route
-            path="/requirement/requireDetail/:requireId"
-            render={(props) => (
-              <RequireDetail {...this.props} {...props} />
-            )}
-          ></Route>
-           <Route
-            path="/requirement/requireMine"
-            render={(props) => (
-              <RequireMine {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/requirement/requireAdd"
-            render={(props) => (
-              <RequireAdd {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/requirement/requireEdit/:requireId"
-            render={(props) => (
-              <RequireEdit {...this.props} {...props} />
-            )}
-          ></Route>
-          <Route
-            path="/requirement"
-            render={(props) => (
-              <RequireList {...this.props} {...props} />
-            )}
-          ></Route>
-
-
-
-          {/* <Route
-            exact
-            path="/"
-            render={(props) => (
-              this.props.current_user && this.props.current_user.login ?
-              <Infos {...this.props} {...props} />
-              :
-              <RequireIndex {...this.props} {...props} />
-            )}
-          ></Route> */}
-        </Switch>
-      </div>
-    );
-  }
-}
-export default withRouter(
-  ImageLayerOfCommentHOC({
-    imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
-    parentSelector: ".newMain",
-  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
-);
--- a/src/achieveRequirement/requirement/api.js
+++ b/src/achieveRequirement/requirement/api.js
@ -1,71 +0,0 @@
-import fetch from '../../fetch';
-
-// 获取字典分类列表
-export function getDictionary(id) {
-  return fetch({
-    url: '/dicItem/getData?dicTypeCode=' + id,
-    method: 'get'
-  });
-}
-
-// 需求列表查询
-export async function getRequirementList(data) {
-  let res = await fetch({
-    url: '/requirement/page',
-    method: 'post',
-    data,
-  });
-  if (res && res.data && res.data.rows) {
-    for (const i of res.data.rows) {
-      // 处理分解标签
-      i.tag = i.tag.split(',');
-    }
-  }
-  return res.data;
-}
-
-//新增需求
-export function addRequirement(data) {
-  return fetch({
-    url: '/requirement/add',
-    method: 'post',
-    data: data
-  });
-}
-
-//删除需求
-export function deleteRequirement(id) {
-  return fetch({
-    url: '/requirement/delete?id=' + id,
-    method: 'DELETE',
-  });
-}
-
-//更新需求
-export function updateRequirement(data) {
-  return fetch({
-    url: '/requirement/update',
-    method: 'put',
-    data: data
-  });
-}
-
-// 需求详情查询
-export async function getRequirementDetail(id) {
-  let res = await fetch({
-    url: '/requirement/getInfo?id=' + id,
-    method: 'get',
-  });
-  if (res && res.data) {
-    res.data.tag = res.data.tag.split(',');
-    return res.data;
-  }
-}
-
-//获取用户列表
-export function getAllUsers() {
-  return fetch({
-    url: '/user/getUsers',
-    method: 'get'
-  });
-}
--- a/src/achieveRequirement/requirement/requireDetail/index.jsx
+++ b/src/achieveRequirement/requirement/requireDetail/index.jsx
@ -1,217 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Descriptions, Modal, Button } from 'antd';
-import { Document, Page, pdfjs } from 'react-pdf';
-import DelModal from '../../components/DelModal';
-import Upload from '../../components/Upload';
-import { httpUrl } from '../../../fetch';
-import { deleteRequirement, getRequirementDetail, updateRequirement } from '../api';
-import './index.scss';
-
-pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
-
-export default ({ match, history, current_user, showNotification }) => {
-  const id = match.params.requireId;
-  const [requireForm, setRequireForm] = useState({});
-  const [visible, setVisible] = useState(false);
-  const [visibleAchieve, setVisibleAchieve] = useState(false);
-  const [fileType, setFileType] = useState(4);
-  const [fileUrl, setFileUrl] = useState(4);
-  const [numPages, setNumPages] = useState(null);
-  const [fileList, setFileList] = useState(null);
-  const [edit, setEdit] = useState(false);
-
-
-  useEffect(() => {
-    getRequirementDetail(id).then(data => {
-      if (data) {
-        setRequireForm(data);
-        if (data.achievementList) {
-          for (const item of data.achievementList) {
-            item.name = item.fileName;
-            item.size = item.fileSize;
-            item.uid = "rc-upload" + item.id
-          }
-          setFileList(data.achievementList);
-        }
-      }
-    });
-  }, [id, edit]);
-
-  function editItem() {
-    history.push(`/requirement/requireEdit/${id}`);
-  }
-
-  function deletItem() {
-    DelModal(() => {
-      deleteRequirement(id).then(res => {
-        if (res.code === '1') {
-          showNotification("删除成功");
-          history.go(-1);
-        } else {
-          showNotification("删除失败");
-        }
-      })
-    });
-  }
-
-  function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
-  }
-
-  function pdfShow(e) {
-    setFileType(e.fileType);
-    if (e.fileType === 1 || e.fileType === 2 || e.fileType === 3) {
-      // pdf||video||img
-      setVisible(true);
-      setFileUrl(httpUrl + '/busiAttachments/view/' + e.id);
-    }
-  }
-
-  function onDocumentLoadSuccess({ numPages }) {
-    setNumPages(numPages);
-  }
-
-  // 上传附件后得到的文件数组
-  function UploadFunc(fileList) {
-    setFileList(fileList);
-  }
-
-  function uploadAchievement() {
-    let files = [];
-    let filestype = [];
-    for (const item of fileList) {
-      files.push(item.id || item.response.data.id);
-      filestype.push(item.fileType || item.response.data.fileType);
-    }
-    let data = {
-      id,
-      achievements: files.toString(),
-      // createUserAccount: sessionStorage.getItem('SET_Account'),//用户信息
-      // createUserName: sessionStorage.getItem('SET_NAME'),
-      status: "2"
-    }
-    updateRequirement(data).then(res => {
-      if (res.code === '1') {
-        showNotification('更新成果文件成功!');
-        setEdit(!edit);
-        setVisibleAchieve(false);
-      }
-    })
-  }
-
-  return (
-    <div className="centerbox">
-      <div className="center-content">
-        <div className="centerScreen">
-          <div className="center-left-but">{requireForm.title}</div>
-          {
-            <div className="center-right-but">
-              {
-                // (role||operator||needsForm.assignedUserLogin==userid||needsForm.createUserAccount==userid)&&(needsForm.status==1||needsForm.status==2||needsForm.status==7||needsForm.status==5)
-                ((current_user.admin || current_user.operator || requireForm.assignedUserLogin == current_user.login || requireForm.createUserAccount == current_user.login)
-                  && (requireForm.status == 1 || requireForm.status == 2 || requireForm.status == 7 || requireForm.status == 5)) &&
-                <Button className="mr15 font-12" size="small" type="primary" onClick={() => { setVisibleAchieve(true) }}>上传成果</Button>
-              }
-
-              {
-                requireForm.createUserAccount === current_user.login &&
-                <React.Fragment>
-                  <span onClick={editItem}>编辑</span>
-                  <span onClick={deletItem}>删除</span>
-                </React.Fragment>
-              }
-            </div>
-          }
-
-        </div>
-
-        <Descriptions className="item-content" column={1}>
-          <Descriptions.Item label="需求类别">{requireForm.typeName}</Descriptions.Item>
-          <Descriptions.Item label="标签">
-            {
-              requireForm.tag && requireForm.tag.map(itemx => {
-                return <span className="list-tag" key={itemx + 'ax'}>{itemx}</span>
-              })
-            }
-          </Descriptions.Item>
-          <Descriptions.Item label="指派人员">{requireForm.assignedUserName}</Descriptions.Item>
-          <Descriptions.Item label="结束时间">{requireForm.endTime}</Descriptions.Item>
-          <Descriptions.Item label="需求描述">{requireForm.remark}</Descriptions.Item>
-          <Descriptions.Item label="需求文件" className="file-list-item">
-            {
-              requireForm.attachmentList && requireForm.attachmentList.map(item => {
-                return <div className="file-list-box" key={item.id + 'down'}>
-                  <p onClick={() => { pdfShow(item) }}>{item.fileName}</p>
-                  <span className="downP" onClick={() => { downFile(item) }}>下载</span>
-                </div>
-              })
-            }
-          </Descriptions.Item>
-        </Descriptions>
-      </div>
-
-      <Modal
-        visible={visible}
-        maskClosable={true}
-        closable={true}
-        footer={null}
-        onCancel={() => { setVisible(false) }}
-        className="file-modal"
-      >
-        {
-          fileType === 3 && <div >
-            <img className="show-img" src={fileUrl} alt="" />
-          </div>
-        }
-        {
-          fileType === 2 && <div>
-            <video src={fileUrl} style={{ width: '100%' }} controls="controls">您的浏览器不支持 video 标签。</video>
-          </div>
-        }
-        {
-          fileType === 1 && <div className="pdf-box">
-            {
-              <Document
-                file={fileUrl}
-                onLoadSuccess={onDocumentLoadSuccess}
-              >
-                {new Array(numPages).fill("").map((item, index) => {
-                  return (
-                    <Page
-                      loading=""
-                      noData=""
-                      key={index}
-                      pageNumber={index + 1}
-                      renderTextLayer={true}
-                      width={750}
-                    />
-                  );
-                })}
-              </Document>
-            }
-          </div>
-        }
-      </Modal>
-
-      <Modal
-        visible={visibleAchieve}
-        maskClosable={true}
-        closable={true}
-        onCancel={() => { setVisibleAchieve(false) }}
-        onOk={uploadAchievement}
-        className="upload-modal"
-      >
-        <Upload
-          className="commentStyle"
-          load={UploadFunc}
-          size={100}
-          showNotification={showNotification}
-          actionUrl={httpUrl}
-          fileList={fileList}
-        />
-      </Modal>
-
-    </div>
-  )
-}
--- a/src/achieveRequirement/requirement/requireDetail/index.scss
+++ b/src/achieveRequirement/requirement/requireDetail/index.scss
@ -1,40 +0,0 @@
-// 内容详情
-.item-content {
-  padding: 10px 10px 0 30px;
-}
-.ant-descriptions-item-label {
-  width: 5em;
-  margin-right: 5px;
-  color: rgba(0, 0, 0, 0.65);
-  text-align: right;
-}
-.ant-descriptions-item-content {
-  color: rgba(0, 0, 0, 1);
-}
-.file-list-item > span {
-  vertical-align: top;
-}
-.file-list-box {
-  width: 600px;
-  height: 60px;
-  display: flex;
-  justify-content: space-between;
-  p:hover {
-    cursor: pointer;
-    color: #0089ff;
-  }
-  .downP {
-    color: #0089ff;
-    cursor: pointer;
-    text-decoration: none;
-  }
-}
-
-.upload-modal{
-  width: 800px !important;
-  .commentStyle{
-    display: inline-block;
-    width: 100%;
-  }
-}
-
--- a/src/achieveRequirement/requirement/requireEdit/index.jsx
+++ b/src/achieveRequirement/requirement/requireEdit/index.jsx
@ -1,247 +0,0 @@
-import React, { forwardRef, useCallback, useEffect, useState } from 'react';
-import { Form, Input, Select, Button, DatePicker } from 'antd';
-import moment from 'moment';
-import Upload from '../../components/Upload';
-import { httpUrl } from '../../../fetch';
-import { getDictionary, getRequirementDetail, addRequirement, updateRequirement } from '../api';
-import './index.scss';
-
-const Option = Select.Option;
-const { TextArea } = Input;
-const format = "YYYY-MM-DD HH:mm:ss";
-
-export default Form.create()(forwardRef(({current_user, form, showNotification, match, history }, ref) => {
-
-  const [requireType, setRequireType] = useState([]);
-  const [tagType, setTagType] = useState([]);
-  const [fileList, setFileList] = useState(null);
-  const [typeCode, setTypeCode] = useState('');
-  const [typeName, setTypeName] = useState('');
-
-  const id = match.params.requireId;
-  const { getFieldDecorator, validateFields, setFieldsValue, } = form;
-
-  useEffect(() => {
-    id && getRequirementDetail(id).then(data => {
-      const formValue = {
-        title: data.title,
-        attachments: data.attachments,
-        // typeCode: data.typeCode,   //为使用select labelInValue，在代码中初始化值
-        endTime: moment(data.endTime),
-        tag: data.tag,
-        remark: data.remark
-      };
-      setFieldsValue(formValue);
-      setTypeName(data.typeName);
-      setTypeCode(data.typeCode)
-      if (data.attachmentList.length) {
-        for (const item of data.attachmentList) {
-          item.name = item.fileName;
-          item.size = item.fileSize;
-          item.uid = "rc-upload" + item.id
-        }
-        setFileList(data.attachmentList);
-      }
-    })
-  }, [id]);
-
-  // 加载选项数据
-  useEffect(() => {
-    getDictionary('requirement_type').then((res) => {
-      setRequireType(res.data);
-    });
-    getDictionary("tag_type").then((res) => {
-      setTagType(res.data);
-    });
-  }, []);
-
-
-  // 上传附件后得到的文件数组
-  function UploadFunc(fileList) {
-    setFileList(fileList);
-    let files = [];
-    for (const item of fileList) {
-      files.push(item.id || item.response.data.id);
-    }
-    setFieldsValue({
-      attachments: files.join()
-    });
-  }
-
-  const helper = useCallback(
-    (label, name, rules, widget, initialValue) => (
-      <Form.Item label={label}>
-        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
-      </Form.Item>
-    ), []);
-
-  const formItemLayout = {
-    labelCol: {
-      xs: { span: 12 },
-      sm: { span: 4 },
-    },
-    wrapperCol: {
-      xs: { span: 12 },
-      sm: { span: 16 },
-    },
-  };
-
-  const tailFormItemLayout = {
-    wrapperCol: {
-      xs: {
-        span: 20,
-        offset: 4,
-      },
-      sm: {
-        span: 20,
-        offset: 4,
-      },
-    },
-  };
-
-  // 修改
-  function saveItem() {
-    validateFields((error, values) => {
-      if (!error) {
-        let params = {
-          ...values,
-          createUserAccount:current_user.login|| sessionStorage.getItem("SET_Account"), //用户信息
-          createUserName:current_user.username|| sessionStorage.getItem("SET_NAME"),    //模拟时使用莫胜吕
-          typeName,
-          typeCode,
-          status: 0, //状态
-        };
-        params.tag = params.tag.join();
-        params.endTime = params.endTime.format(format);
-        if (id) {
-          // 编辑
-          params.id = id;
-          updateRequirement(params).then(res => {
-            if (res.code === '1') {
-              showNotification("需求更新成功！");
-              history.go(-1);
-            } else {
-              showNotification(res.message);
-            }
-          });
-        } else {
-          // 新增
-          addRequirement(params).then(res => {
-            if (res.code === '1') {
-              showNotification("需求新增成功！");
-              history.go(-1);
-            } else {
-              showNotification(res.message);
-            }
-          });
-        }
-      }
-    })
-  }
-
-  function changeTypeName(value) {
-    setTypeCode(value.key);
-    setTypeName(value.label);
-  }
-
-  return (
-    <div className="centerbox">
-      <div className="center-content">
-
-        <div className="centerScreen">
-          <div className="center-left-but">{id ? '修改' : '新增'}需求</div>
-        </div>
-        <Form className="achieve-form" {...formItemLayout}>
-          {helper(
-            "需求名称：",
-            "title",
-            [{ required: true, message: "请输入需求名称" }],
-            <Input
-              className="edit-input"
-              placeholder="请输入需求名称"
-            />
-          )}
-
-          {helper(
-            "需求类型：",
-            "typeCode",
-            [{ required: true, message: "请选择需求类别" }],
-            <Select placeholder="请选择需求类别"
-              className="edit-input"
-              labelInValue
-              onChange={changeTypeName}
-            >
-              {
-                requireType.map(item => {
-                  return <Option key={item.id + ''} value={item.id + ''}>{item.dicItemName}</Option>
-                })
-              }
-            </Select>
-            , { key: typeCode, label: typeName })}
-
-          {helper(
-            "结束时间：",
-            "endTime",
-            [{ required: true, message: "请输入结束时间" }],
-            <DatePicker
-              showTime
-              format={format}
-              placeholder="请输入结束时间"
-            />
-          )}
-
-          <Form.Item label={"需求文件："} required={true}>
-            <Upload
-              className="commentStyle"
-              load={UploadFunc}
-              size={100}
-              showNotification={showNotification}
-              actionUrl={httpUrl}
-              fileList={fileList}
-            />
-
-            {/* 用一个隐藏的input实现上传文件的必填校验 */}
-            {getFieldDecorator('attachments', {
-              rules: [{ required: true, message: "请上传需求文件" }], validateFirst: true
-            })(<Input style={{ display: 'none' }} />)}
-          </Form.Item>
-
-          {helper(
-            "标签：",
-            "tag",
-            [{ required: true, message: "请选择需求标签" }],
-            <Select
-              placeholder="请选择需求标签"
-              className="edit-input"
-              mode="tags"
-              tokenSeparators={[',']}
-            >
-              {
-                tagType.map(item => {
-                  return <Option key={item.dicItemName}>{item.dicItemName}</Option>
-                })
-              }
-            </Select>
-          )}
-
-          {helper(
-            "需求描述：",
-            "remark",
-            [{ required: true, message: "请输入需求描述" }],
-            <TextArea
-              placeholder="请输入需求描述"
-              autoSize={{ minRows: 3, maxRows: 5 }}
-            />
-          )}
-
-          <Form.Item {...tailFormItemLayout}>
-            <Button className="mr20" type={"primary"} onClick={saveItem}>保存</Button>
-            <Button onClick={() => { history.go(-1) }}>取消</Button>
-          </Form.Item>
-
-        </Form>
-      </div>
-    </div>
-  )
-})
-)
--- a/src/achieveRequirement/requirement/requireEdit/index.scss
+++ b/src/achieveRequirement/requirement/requireEdit/index.scss
@ -1,4 +0,0 @@
-  .achieve-form{
-    padding:24px 40px 0px 40px;
-  }
-  
--- a/src/achieveRequirement/requirement/requireList/index.jsx
+++ b/src/achieveRequirement/requirement/requireList/index.jsx
@ -1,117 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Pagination, Button } from 'antd';
-import ChooseNav from '../../components/chooseNav';
-import ItemList from '../../components/itemList';
-import { getDictionary, getRequirementList } from '../api';
-
-export default (props) => {
-  const { current_user } = props;
-  // console.log(current_user);
-
-  const [requirementType, setrequirementType] = useState([]);  //需求类别选项数组
-  const [requirementStatusArr, setrequirementStatusArr] = useState([]);  //需求状态选项数组
-  const [requirementTypeName, setRequirementTypeName] = useState('');  //当前需求类别
-  const [requirementStatus, setRequirementStatus] = useState('');  //当前需求状态
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  const [requirementList, setRequirementList] = useState([]);
-
-  useEffect(() => {
-    getDictionary('requirement_type').then(res => {
-      if (res && res.data) setrequirementType(res.data);
-    });
-    getDictionary('requirement_status').then(res => {
-      if (res && res.data) setrequirementStatusArr(res.data);
-    });
-  }, []);
-
-  useEffect(() => {
-    const params = {
-      tag: null,
-      status: requirementStatus || null,
-      typeName: requirementTypeName || null,
-      queryType: 'all',
-      curPage,
-      pageSize: 10
-    };
-    getRequirementList(params).then(data => {
-      if (data && data.rows) {
-        setRequirementList(data.rows);
-        setTotal(data.total);
-      }
-    })
-  }, [requirementTypeName, requirementStatus, curPage]);
-
-  function changeOptionId(option, type) {
-    if (type === 'requirement_type') {
-      setRequirementTypeName(option.dicItemName);
-      setCurPage(1);
-    } else if (type === 'requirement_status') {
-      setRequirementStatus(option.dicItemCode);
-      setCurPage(1);
-    }
-  }
-
-  function goRequirementMine() {
-    props.history.push('/requirement/requireMine');
-  }
-  function goAdd() {
-    props.history.push("/requirement/requireAdd");
-  }
-
-  function achiveClick(id) {
-    props.history.push(`/requirement/requireDetail/${id}`);
-  }
-
-  return (
-    <div className="centerbox">
-      <div className="nav-content">
-        <ChooseNav
-          key={'requirement_type'}
-          type={'requirement_type'}
-          title={'需求类别'}
-          options={requirementType}
-          changeOptionId={changeOptionId}
-        />
-
-        <ChooseNav
-          key={'requirement_status'}
-          type={'requirement_status'}
-          title={'需求状态'}
-          options={requirementStatusArr}
-          changeOptionId={changeOptionId}
-        />
-      </div>
-
-      <div className="center-content">
-        <div className="centerScreen">
-          <div className="center-left-but">需求大厅</div>
-          {
-            current_user.login &&
-            <div className="center-right-but">
-              <Button className="mr15 font-12" size="small" type="primary" onClick={goRequirementMine}>我的需求</Button>
-              <Button className="mr20 font-12" size="small" type="primary" onClick={goAdd}><i className="iconfont icon-zaibianji font-12 mr3"></i>发布需求</Button>
-            </div>
-          }
-        </div>
-
-        <ItemList
-          list={requirementList}
-          itemClick={achiveClick}
-        />
-
-      </div>
-
-      <div className="edu-txt-center ">
-        <Pagination
-          showQuickJumper
-          onChange={(page) => { setCurPage(page) }}
-          current={curPage}
-          total={total}
-          showTotal={total => `共 ${total} 条`}
-        />
-      </div>
-
-    </div>
-  )
-}
--- a/src/achieveRequirement/requirement/requireMine/allRequire.jsx
+++ b/src/achieveRequirement/requirement/requireMine/allRequire.jsx
@ -1,333 +0,0 @@
-import React, { useEffect, forwardRef, useCallback, useState } from 'react';
-import classnames from 'classnames';
-import { Form, Radio, Input, Select, Pagination, Table, Button, Modal } from 'antd';
-import DelModal from '../../components/DelModal';
-import { deleteRequirement, getRequirementList, getAllUsers, updateRequirement } from '../api';
-
-const Option = Select.Option;
-const { TextArea } = Input;
-
-const statusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '其他', '验收未通过'];
-const chooseStatusArr = ['待审核', '进行中', '成果验收中', '完成', '审核未通过', '延期', '全部'];
-const statusColor = ['#f8c753', '#67c23a', '#67c23a', '#67c23a', '#F56C6C', '#f8c753', '#f8c753', '#F56C6C'];
-
-export default Form.create()(forwardRef(({ form, showNotification, match, history }, ref) => {
-  const [requirementList, setRequirementList] = useState([]);
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  const [status, setStatus] = useState(6);
-  const [checkVisible, setCheckVisible] = useState(false);
-  const [checkStatus, setCheckStatus] = useState(1);
-  const [acceptVisible, setAcceptVisible] = useState(false);
-  const [currentId, setCurrentId] = useState('');
-  const [allUsers, setAllUsers] = useState([]);
-
-
-  const { getFieldDecorator, validateFields, } = form;
-
-  useEffect(() => {
-    getRequireList();
-  }, [curPage, status]);
-
-  useEffect(() => {
-    if (checkVisible) {
-      getAllUsers().then(res => {
-        if (res.code === '1') {
-          setAllUsers(res.data);
-        } else {
-          showNotification(res.message);
-        }
-      })
-    }
-  }, [checkVisible]);
-
-  function getRequireList() {
-    let searchStaus = "";
-    if (status !== 6) {
-      searchStaus = status;
-    }
-    const params = {
-      curPage,
-      pageSize: 10,
-      status: searchStaus,
-      tag: "",
-      title: "",
-      typeName: "",
-      currentUser: "",
-      queryType: "all"  //all:所有  my:我创建的  tome:指派给我的
-    };
-    getRequirementList(params).then(data => {
-      if (data) {
-        for (const item of data.rows) {
-          item.createUserName = item.createUser.nickname ? item.createUser.nickname : item.createUser.login;
-        }
-        setRequirementList(data.rows);
-        setTotal(data.total);
-      }
-    })
-  }
-
-  function detailItem(id) {
-    history.push(`/requirement/requireDetail/${id}`);
-  }
-
-  function editItem(id) {
-    history.push(`/requirement/requireEdit/${id}`);
-  }
-
-  function deletItem(id) {
-    DelModal(() => {
-      deleteRequirement(id).then(res => {
-        if (res.code === '1') {
-          showNotification("删除成功");
-          getRequireList();
-        } else {
-          showNotification("删除失败");
-        }
-      })
-    }, '此操作将删除该记录, 是否继续?');
-  }
-
-  // 审核
-  function checkItem() {
-    validateFields((error, values) => {
-      if (!error) {
-        let params = {
-          id: currentId,
-          status: checkStatus,      //状态
-          assignedUserLogin: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
-          assignedUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
-          vertifyUserAccount: values.vertifyUserAccount ? values.vertifyUserAccount.key : '',
-          vertifyUserName: values.vertifyUserAccount ? values.vertifyUserAccount.label : '',
-          vertifyComments: values.vertifyComments,
-        };
-        console.log(params);
-        updateRequirement(params).then(res => {
-          if (res.code === '1') {
-            showNotification("操作成功!");
-            setCheckVisible(false);
-            getRequireList();
-          } else {
-            showNotification(res.message);
-          }
-        });
-      }
-    })
-  }
-
-  // 验收
-  function acceptItem() {
-    validateFields((error, values) => {
-      if (!error) {
-        let params = {
-          status: values.status,
-          id: currentId,
-          checkComments: values.checkComments,
-        };
-        console.log(params);
-        updateRequirement(params).then(res => {
-          if (res.code === '1') {
-            showNotification("操作成功!");
-            setAcceptVisible(false);
-            getRequireList();
-          } else {
-            showNotification(res.message);
-          }
-        });
-      }
-    })
-  }
-
-  const columns = [
-    {
-      title: '需求标题',
-      dataIndex: 'title',
-      key: 'title',
-      width: '20%',
-    },
-    {
-      title: '类型',
-      dataIndex: 'typeName',
-      key: 'typeName',
-    },
-    {
-      title: '创建人',
-      dataIndex: 'createUserName',
-      key: 'createUserName',
-    },
-    {
-      title: '指派人',
-      key: 'assignedUserName',
-      dataIndex: 'assignedUserName',
-    },
-    {
-      title: '创建时间',
-      key: 'createTime',
-      dataIndex: 'createTime',
-    },
-    {
-      title: '结束时间',
-      key: 'endTime',
-      dataIndex: 'endTime',
-    },
-    {
-      title: '状态',
-      key: 'status',
-      dataIndex: 'status',
-      render: (text, record) => {
-        return <span style={{ color: statusColor[text] }}>{statusArr[text]}</span>
-      }
-    },
-    {
-      title: '操作',
-      key: 'action',
-      render: (text, record) => (
-        <span>
-          <Button className="mr5 font-12" type="primary" size="small" onClick={() => { editItem(record.id) }}><i className="iconfont icon-zaibianji font-15 mr3"></i></Button>
-          <Button className="mr5 font-12" type="danger" size="small" onClick={() => { deletItem(record.id) }}><i className="iconfont icon-shanchu font-15 "></i></Button>
-          <Button className="mr5 font-12" type="info" size="small" onClick={() => { detailItem(record.id) }}>详情</Button>
-          {record.status === '0' && <Button className="mr5 font-12" type="primary" size="small" onClick={() => { setCurrentId(record.id); setCheckVisible(true); }}>审核</Button>}
-          {record.status === '2' && <Button className="mr5 font-12" type="success" size="small" onClick={() => { setCurrentId(record.id); setAcceptVisible(true) }}>验收成果</Button>}
-        </span>
-      ),
-    },
-  ];
-
-  const helper = useCallback(
-    (label, name, rules, widget, initialValue) => (
-      <Form.Item label={label}>
-        {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)}
-      </Form.Item>
-    ), []);
-
-  const formItemLayout = {
-    labelCol: {
-      xs: { span: 12 },
-      sm: { span: 6 },
-    },
-    wrapperCol: {
-      xs: { span: 12 },
-      sm: { span: 18 },
-    },
-  };
-
-  return (
-    <React.Fragment>
-
-      <div className="choose-status">
-        {
-          chooseStatusArr.map((item, i) => {
-            return <Button className={classnames({ mr10: true, active: status === i })} type="dashed" key={i} onClick={() => { setStatus(i) }}> {item}</Button>
-          })
-        }
-      </div>
-
-      <Table
-        rowKey={(row) => row.id}
-        dataSource={requirementList}
-        columns={columns}
-        pagination={false}
-      />
-
-      <div className="edu-txt-center mt10">
-        <Pagination
-          showQuickJumper
-          onChange={(page) => { setCurPage(page) }}
-          current={curPage}
-          total={total}
-        />
-      </div>
-
-      <Modal
-        title="需求审核"
-        visible={checkVisible}
-        onOk={checkItem}
-        onCancel={() => { setCheckVisible(false) }}
-        className="form-edit-modal"
-      >
-
-        {checkVisible && <Form  {...formItemLayout}>
-          <Form.Item label="审批结果：">
-            <Radio.Group value={checkStatus} onChange={(e) => { setCheckStatus(e.target.value) }}>
-              <Radio className="columsRadio" value={1}>
-                同意
-            </Radio>
-              <Radio className="columsRadio" value={4}>
-                拒绝
-            </Radio>
-            </Radio.Group>
-          </Form.Item>
-
-          {helper(
-            "指派用户：",
-            "vertifyUserAccount",
-            [{ required: checkStatus === 1, message: "请指派用户" }],
-            <Select placeholder="请指派用户"
-              className="edit-input"
-              showSearch
-              labelInValue
-              disabled={checkStatus === 4}
-              filterOption={(input, option) =>
-                option.props && option.props.children && (option.props.children.indexOf(input) > -1 || option.props.children.toLowerCase().indexOf(input.toLowerCase()) > -1)
-              }
-            >
-              {
-                allUsers.map((item, i) => {
-                  return <Option key={item.id} value={item.login}>{item.nickName}</Option>
-                })
-              }
-            </Select>
-          )}
-
-          {helper(
-            "审核意见：",
-            "vertifyComments",
-            [{ required: true, message: "请输入审核意见" }],
-            <TextArea
-              className="edit-input"
-              placeholder="请输入审核意见"
-            />
-          )}
-        </Form>}
-      </Modal>
-
-
-      <Modal
-        title="验收成果"
-        visible={acceptVisible}
-        onOk={acceptItem}
-        onCancel={() => { setAcceptVisible(false) }}
-        className="form-edit-modal"
-      >
-
-        {acceptVisible && <Form  {...formItemLayout}>
-          {helper(
-            "验收结果：",
-            "status",
-            [{ required: true, message: "请选择验收结果" }],
-            <Radio.Group>
-              <Radio className="columsRadio" value={3}>
-                同意
-            </Radio>
-              <Radio className="columsRadio" value={7}>
-                拒绝
-            </Radio>
-            </Radio.Group>
-          )}
-
-          {helper(
-            "验收意见：",
-            "checkComments",
-            [],
-            <TextArea
-              className="edit-input"
-              placeholder="请输入验收意见"
-            />
-          )}
-        </Form>}
-
-      </Modal>
-    </React.Fragment>
-  )
-})
-)
--- a/src/achieveRequirement/requirement/requireMine/index.jsx
+++ b/src/achieveRequirement/requirement/requireMine/index.jsx
@ -1,25 +0,0 @@
-import React from 'react';
-import { Tabs } from 'antd';
-import AllRequire from './allRequire';
-import MyRequire from './myRequire';
-import './index.scss';
-
-const { TabPane } = Tabs;
-export default (props) => {
-
-  return (
-    <div className="centerbox">
-
-      <Tabs className="tabs-style" type="card">
-        <TabPane tab="全部需求" key="1">
-          <AllRequire {...props}/>
-        </TabPane>
-
-        <TabPane tab="我的需求" key="2">
-          <MyRequire {...props}/>
-        </TabPane>
-      </Tabs>
-
-    </div>
-  )
-}
--- a/src/achieveRequirement/requirement/requireMine/index.scss
+++ b/src/achieveRequirement/requirement/requireMine/index.scss
@ -1,54 +0,0 @@
-// Tabs
-.tabs-style{
-  background: #fff;
-  border: 1px solid #dcdfe6;
-  -webkit-box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
-  box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
-  padding-bottom: 1vw;
-  .ant-tabs-tab{
-    margin: 0 !important;
-  }
-  .ant-tabs-tab{
-    border-top:0 !important;
-    border-left:0 !important;
-    border-radius:0 !important;
-  }
-  .ant-tabs-nav .ant-tabs-tab{
-    padding:19px 0px;
-    margin-right: 40px;
-  }
-  .ant-tabs-ink-bar{
-    width:25px!important;
-    bottom: 10px;
-  }
-}
-
-.choose-status{
-  padding: 1em;
-  background: #fff;
-}
-
-.ant-btn-info{
-  color: #fff;
-  background-color: #909399;
-  border-color: #909399;
-}
-
-.ant-btn-success{
-  color: #fff;
-  background-color: #67c23a;
-  border-color: #67c23a;
-}
-
-.mt10{
-  margin-top:10px;
-}
-
-.form-edit-modal{
-  .ant-col{
-    display: inline-block;
-  }
-  .edit-input{
-    width: 300px;
-  }
-}
--- a/src/achieveRequirement/requirement/requireMine/myRequire.jsx
+++ b/src/achieveRequirement/requirement/requireMine/myRequire.jsx
@ -1,80 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import classnames from 'classnames';
-import { Pagination, Button } from 'antd';
-import ItemList from '../../components/itemList';
-import DelModal from '../../components/DelModal';
-import { deleteRequirement, getRequirementList } from '../api';
-
-export default (props) => {
-  const [requirementList, setRequirementList] = useState([]);
-  const [curPage, setCurPage] = useState(1);
-  const [total, setTotal] = useState(0);
-  // const [queryType, setQueryType] = useState("my");
-  const [queryType, setQueryType] = useState("all");
-
-  useEffect(() => {
-    getRequireList();
-  }, [curPage, queryType]);
-
-  function getRequireList() {
-    const params = {
-      curPage,
-      pageSize: 10,
-      status: "",
-      tag: "",
-      title: "",
-      typeName: "",
-      currentUser: "",
-      queryType,  //all:所有  my:我创建的  tome:指派给我的
-    };
-    getRequirementList(params).then(data => {
-      setRequirementList(data.rows);
-      setTotal(data.total);
-    })
-  }
-
-  function detailItem(id) {
-    props.history.push(`/requirement/requireDetail/${id}`);
-  }
-
-  function editItem(id) {
-    props.history.push(`/requirement/requireEdit/${id}`);
-  }
-
-  function deletItem(id) {
-    DelModal(() => {
-      deleteRequirement(id).then(res => {
-        if (res.code === '1') {
-          props.showNotification("删除成功");
-          getRequireList();
-        } else {
-          props.showNotification("删除失败");
-        }
-      })
-    }, '此操作将删除该记录, 是否继续?');
-  }
-
-  return (
-    <React.Fragment>
-      <div className="choose-status">
-        <Button className={classnames({ mr10: true, active: queryType === "my" })} type="dashed" key="my" onClick={() => { setQueryType("my") }}>我创建的</Button>
-        <Button className={classnames({ mr10: true, active: queryType === "tome" })} type="dashed" key="tome" onClick={() => { setQueryType("tome") }}> 指派给我的 </Button>
-      </div>
-      <ItemList
-        list={requirementList}
-        itemClick={detailItem}
-        deletItem={queryType === "my" && deletItem}
-        editItem={queryType === "my" && editItem}
-        activeByStatus={queryType === "my"}
-      />
-      <div className="edu-txt-center mt10">
-        <Pagination
-          showQuickJumper
-          onChange={(page) => { setCurPage(page) }}
-          current={curPage}
-          total={total}
-        />
-      </div>
-    </React.Fragment>
-  )
-}
--- a/src/common/TextUtil.js
+++ b/src/common/TextUtil.js
@ -68,7 +68,7 @@ export function appendFileSizeToUploadFile(item) {
    return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
 }
 export function appendFileSizeToUploadFileAll(fileList) {
-    return fileList && fileList.map(item => {
+    return fileList.map(item => {
        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
            return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
        }
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@ -6,23 +6,23 @@ const { Search } = Input;
 const $ = window.$;
 const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
-export const TEST_HOST = "http://39.105.176.215:49999"
+export const TEST_HOST = "https://testforgeplus.trustie.net/"
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
  // const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
+	const local = 'https://testforgeplus.trustie.net';
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `/${path}`;
+	return `${path}`;
 }

 export function getImage(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
  // const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
+	const local = 'https://testforgeplus.trustie.net/';
 	if(path.indexOf("http://")===-1){
 		if (isDev) {
 			return `${local}/images/${path}`
@ -93,7 +93,7 @@ export function setImagesUrl(path){
 }

 export function getUrl(path, goTest) {
-	const local = 'http://39.105.176.215:49999'
+	const local = 'https://testforgeplus.trustie.net'
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}
@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
 }

 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json`;
+	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
 }

 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
 }

 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }


 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getRandomNumber(type) {
--- a/src/common/components/comment/CommentItem.js
+++ b/src/common/components/comment/CommentItem.js
@ -64,7 +64,7 @@ function CommentItem({
  const commentAvatar = (author) => (
    <img
      className="item-flex flex-image"
-      src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
      alt=""
    />
  );
--- a/src/fetch.js
+++ b/src/fetch.js
@ -1,85 +0,0 @@
-import axios from 'axios';
-import cookie from 'react-cookies';
-
-export const httpUrl='http://117.50.100.12:8001';
-
-const TokenKey = 'autologin_forge_military';
-axios.defaults.withCredentials = true;
-
-// 创建axios实例
-const service = axios.create({
-  // baseURL: process.env.BASE_API, // api的base_url
-  baseURL:httpUrl,
-  timeout: 5000 // 请求超时时间
-  // headers:{'X-Custom-Header': 'foobar'} // 请求头
-});
-
-
-// request拦截器
-service.interceptors.request.use(config => {
-  if (cookie.load(TokenKey)) {
-    config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
-    // config.headers['Authorization'] = 'autologin_forge_military=' + cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config;
-}, error => {
-  // Do something with request error
-  console.log(error); // for debug
-  Promise.reject(error);
-});
-// respone拦截器
-service.interceptors.response.use(
-  response => {
-    /**
-     * 下面的注释为通过response自定义code来标示请求状态，当code返回如下情况为权限有问题，登出并返回到登录页
-     * 如通过xmlhttprequest 状态码标识 逻辑可写在下面error中
-     */
-    const res = response;
-    if (res.status === 400) {
-      // Message({
-      //   message: '请求错误',
-      //   type: 'error',
-      //   duration: 5 * 1000
-      // });
-      // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('error');
-    }
-    if (res.status === 401) {
-      // Message({
-      //   message: '未授权，请登录！',
-      //   type: 'error',
-      //   duration: 5 * 1000
-      // });
-      // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('error');
-    }
-    if (res.status === 40001) {
-      // Message({
-      //   message: '账户或密码错误！',
-      //   type: 'warning'
-      // });
-      // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('error');
-    }
-    if (response.status !== 200 && res.status !== 200) {
-      // Message({
-      //   message: res.message,
-      //   type: 'error',
-      //   duration: 7 * 1000
-      // });
-    } else {
-      return response.data;
-    }
-  },
-  error => {
-    if (error.response&& error.response.status === 401 && !error.config.url.includes('/auth-server/oauth/token')) {
-      return cookie.remove(TokenKey);
-      // that.$router.push('/Login');
-    } else {
-      // that.$router.push('/Login');
-    }
-    return Promise.reject(error);
-  }
-);
-
-export default service;
--- a/src/forge/About/Index.jsx
+++ b/src/forge/About/Index.jsx
@ -67,15 +67,14 @@ function Index(props){
  }
  return(
    <div className="aboutPanels">
-      
      <div className="aboutContent">
-        <AlignCenterBetween style={{padding:"14px 0px"}}>
+        <AlignCenterBetween style={{padding:"14px 20px"}}>
          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
          { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
        </AlignCenterBetween>
        {
          edit ? 
-          <div>
+          <div className="padding20">
            <MDEditor
              placeholder={"请输入描述信息"}
              height={500}
@ -114,7 +113,7 @@ function Index(props){
            </div>
          </div>
          :
-          <div style={{padding:"20px 0px"}}>
+          <div className="padding20">
            {content ? 
              <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
              :
--- a/src/forge/About/index.scss
+++ b/src/forge/About/index.scss
@ -4,7 +4,6 @@
  .aboutContent{
    border-radius: 2px;
    border: 1px solid #EEEEEE;
-    padding:0px 30px;
    width:100%;
    background-color: #fff;
    margin-top:20px;
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@ -33,7 +33,7 @@ class ActivityItem extends Component {
          }
          <p className="itemLine mt10">
            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
              <span className="mr20">{item.user_name}</span>
            </Link>
            {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@ -102,9 +102,10 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
    </div>
  );
  return(
-    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
      <div className="branch-tagBox">
-        <span className="color-grey-9 mr3 ml8">{nav === 0 ?"分支":"标签"}:</span>
+        {/* {nav === 0 ?"分支":"标签"} */}
+        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
        <a className="ant-dropdown-link">
          {showValue}
        </a>
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@ -51,7 +51,7 @@
  display: flex;
  align-items: center;
  cursor: pointer;
-  min-width: 240px;
+  min-width: 140px;
 }
 .branch-tagBox-list .ant-popover-arrow{
  display: none;
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@ -42,7 +42,7 @@ function AddMember({getID,login}){
            className="user_img radius"
            width="28"
            height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
            alt=""
          />
          <span className="ml10" style={{ "vertical-align": "middle" }}>
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@ -6,7 +6,7 @@ import './Component.scss';
 function Cards({img , title, desc , rightBtn , src}){
  return(
    <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`images/${img}`)} alt=""/></div>}
+      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
      <div className="content">
        <p className="titles">
          <Link to={src}>{title}</Link>
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@ -20,6 +20,7 @@ li.ant-menu-item{
  background-color: #fff;
  margin-bottom:18px;
  min-height: 130px;
+  border:1px solid #eee;
  .img{
    margin-right: 20px;
    width: 190px;
@ -61,6 +62,7 @@ li.ant-menu-item{
 }
 // Tabs
 .tabsStyle{
+  border:1px solid #eee;
  .ant-tabs-bar.ant-tabs-top-bar{
    padding-left: 35px;
    margin-bottom: 0px;
@ -110,6 +112,9 @@ li.ant-menu-item{
  right:240px;
  z-index: 10000;
 }
+.laterest{
+  color: #05690d;
+}

@media screen and (max-width: 1800px){
  .handleBox{
@ -135,4 +140,56 @@ li.ant-menu-item{
  .handleBox{
    right:0px;
  }
+}
+.ant-drawer{
+  z-index: 10000!important;
+}
+.ant-drawer-body{
+  padding:0px!important;
+  .drawerHead{
+    background-color: #333;
+    color: #fff;
+    padding:15px 20px;
+  }
+  .ant-tree{
+    margin:0px 20px!important;
+  }
+}
+
+.menuPanels{
+  width: 240px;
+  height: 180px;
+  .ant-popover-content,.ant-popover-inner{
+    height: 100%;
+    width: 100%;
+  }
+}
+.halfs{
+  margin-top: 24px;
+  padding:24px 0px 0px 0px;
+  border-top: 1px solid #e8e8e8;
+  .attrPerson{
+    padding-bottom: 24px;
+  }
+}
+.menuinfos{
+  padding:15px 0px;
+  &>a{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    border-right: 1px solid #eee;
+    flex: 1;
+    & >span:first-child{
+      font-size: 18px;
+      font-weight: 400;
+      color: #333;
+    }
+    & >span:last-child{
+      color: #666;
+    }
+    &:last-child{
+      border-right: none;
+    }
+  }
 }
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@ -0,0 +1,160 @@
+import React, { useEffect, useState } from 'react';
+import { AlignCenter , FlexAJ  } from '../Component/layout';
+import { Link } from 'react-router-dom';
+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}){
+  const [ menuList ,setMenuList ]= useState([]);
+  const [ list , setList ]= useState(undefined);
+  const [ total , setTotal ]= useState(0);
+  const [ menu , setMenu ] = useState("");
+  const [ login , setLogin ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(false);
+
+  useEffect(()=>{
+    if(contributors && contributors.total_count>0){
+      setTotal(contributors.total_count);
+      setList(contributors.list);
+    }
+  },[contributors])
+
+  useEffect(()=>{
+    if(login){
+      getUsers(login);
+    }else{
+      setMenu(undefined);
+    }
+  },[login])
+
+  async function getUsers(login){
+    setIsSpin(true);
+    let a = menuList && menuList.filter(i=>i.login === login);
+    if(a.length === 0){
+      let result = await getUser(login);
+      let arr = menuList;
+      arr.push({...result});
+      setMenuList(arr);
+      setMenusFunc(result);
+      setIsSpin(false);
+    }else{
+      setMenusFunc(a[0]);
+      setIsSpin(false);
+    }
+  }
+
+  function setMenusFunc(data){
+    if(data){
+      let ele = (
+        <Spin spinning={isSpin}>
+          <FlexAJ>
+            <AlignCenter>
+              <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+              <Link to={`/users/${data.login}`} className="ml10">{data.name}</Link>
+            </AlignCenter>
+            {
+              data.is_watch ? <a className="color-grey-9" onClick={()=>FocusFunc(false,data.login)}>取消关注</a>:<a className="color-blue" onClick={()=>FocusFunc(true,data.login)}>关注</a>
+            }
+          </FlexAJ>
+          <AlignCenter className="menuinfos">
+            <a href={data.projects_url}>
+              <span>{data.projects_count}</span>
+              <span>项目数</span>
+            </a>
+            <a href={data.followers_url}>
+              <span>{data.followers_count}</span>
+              <span>粉丝数</span>
+            </a>
+            <a href={data.following_url}>
+              <span>{data.following_count}</span>
+              <span>关注数</span>
+            </a>
+          </AlignCenter>
+          {
+            data.organizations && data.organizations.length > 0 ?
+            <AlignCenter className="font-12 pt4 pb4">
+              <span>所属组织：</span>
+              <div className="task-hide flex1">
+                {renderArray(data.organizations)}
+              </div>
+            </AlignCenter>
+            :""
+          }
+          {
+            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
+          }
+        </Spin>
+      )
+      setMenu(ele);
+    }
+  }
+
+  function FocusFunc(flag,login){
+    axios({
+      method: flag ? 'post' : 'delete',
+      url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
+      params: {target_type: "user",id:login}
+    }).then(result => {
+      if (result && (result.data.status === 0 || result.data.status === 2)) {
+        let a = menuList && menuList.filter(i=>i.login === login);
+        if(a){
+          a[0].is_watch = flag;
+        }
+        setMenusFunc(a[0]);
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    });
+  }
+
+  function renderArray(array){
+    let str = "";
+    for(var i = 0;i<array.length;i++){
+      str += array[i].name +"、";
+    }
+    let substr = str.substr(0,str.length-1);
+    return (<span title={substr}>{substr}</span>)
+  }
+
+  function setVisibleFunc(flag,l,index){
+    if(l !== login){
+      setLogin(l);
+    }
+    var lx = list.concat();
+    lx.map(i=>i.visible =false);
+    if(flag){
+      lx[index].visible = flag;
+    }
+    lx.splice();
+    setList(lx);
+  }
+
+  return(
+    <div className="halfs">
+      <FlexAJ>
+        <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
+        <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</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}`}>
+                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
+                </Link>
+              </Popover>
+            )
+          })
+          :""
+        }
+      </div>
+    </div>
+  )
+}
+export default Contributors;
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@ -0,0 +1,99 @@
+import React, { useEffect, useState } from 'react';
+import { Drawer , Tree , Spin } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+const { TreeNode , DirectoryTree } = Tree;
+
+function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
+  const [ treeData , setTreeData ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(true);
+  const [first , setFirst ] = useState(true);
+  useEffect(()=>{
+    if(visible && first){
+      if(list){
+        setTreeData(list);
+        setIsSpin(false);
+      }else{
+        getMenulist();
+      }
+      setFirst(false);
+    }
+  },[visible])
+
+  function getMenulist(){
+    const url = `/${owner}/${projectsId}/entries.json`;
+    axios.get(url,{ params: { ref: branch } }).then(result=>{
+      if(result){
+        setTreeData(result.data.entries);
+      }
+      setIsSpin(false);
+    }).catch(error=>{})
+  }
+
+  function renderTreeNodes(data) {
+    return data && data.length > 0 && data.map((item) => {
+      return (
+        <TreeNode title={item.name} key={item.key} dataRef={item} isLeaf={item.type === "file"}>
+          {renderTreeNodes(item.children)}
+        </TreeNode>
+      );
+    });
+  }
+
+  function onLoadData(tr){
+    return new Promise((resolve) => {
+      if (tr.props.children) {
+          resolve();
+          return;
+      }
+      let en = [];
+      const url = `/${owner}/${projectsId}/sub_entries.json`;
+      axios.get(url, { 
+        params:{
+          filepath:tr.props.dataRef.path,
+          ref:branch,
+          type:"dir"
+        }
+      }).then((result) => {
+        if(result){
+          en =  result.data.entries;
+        }
+      }).catch(error=>{})
+      setTimeout(() => {
+        tr.props.dataRef.children = en;
+        setTreeData([...treeData]);
+        resolve();
+      }, 2000);
+    });
+  }
+
+  function selectTree(keys,event){
+    let dataref = event.node.props.dataRef;
+    if(dataref.type==="file"){
+      onClose();
+      history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+    }
+  }
+
+  return(
+    <Drawer
+      placement="left"
+      visible={visible}
+      closable={false}
+      onClose={onClose}
+      width={"320px"}
+      maskStyle={{backgroundColor:'rgba(0,0,0,0.09)'}}
+    >
+      <Spin spinning={isSpin}>
+        <div className="drawerHead">
+          <p className="font-20">{name}</p>
+          <p><i class="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>{branch}</p>
+        </div>
+        <DirectoryTree loadData={onLoadData} onSelect={selectTree}>
+          {treeData && renderTreeNodes(treeData)}
+        </DirectoryTree>
+      </Spin>
+    </Drawer>
+  )
+}
+export default DrawerPanel;
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -0,0 +1,9 @@
+.ant-modal-mask{
+  z-index: 10000;
+}
+.ant-modal-wrap{
+  z-index: 10001;
+  .ant-form-explain{
+    position: absolute;
+  }
+}
--- a/src/forge/Component/EducoderAccount.jsx
+++ b/src/forge/Component/EducoderAccount.jsx
@ -0,0 +1,60 @@
+import React , {forwardRef, useEffect} from 'react';
+import { Modal , Form , Input , Button } from 'antd';
+import './EAccount.scss';
+
+function EducoderAccount({form , visible , onOk , email}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    if(email){
+      setFieldsValue({email})
+    }
+  },[email])
+
+  function onSure(){
+    validateFields((error,values)=>{
+      if(!error){
+        onOk(values);
+      }
+    })
+  }
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+  return(
+    <Modal 
+      visible={visible}
+      title="提示"
+      width="500px"
+      closable={false}
+      footer={
+        <Button type="primary" onClick={onSure}>确定</Button>
+      }
+      centered
+    >
+      <div>
+        <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
+        为确保您能正常使用平台功能，请确认以下信息:
+        </p>
+        <Form {...layout}>
+          <Form.Item label="邮箱">
+            {getFieldDecorator("email",{
+              rules:[{required:true,message:"请输入邮箱账号"}]
+            })(
+              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+            )}
+          </Form.Item>
+          <Form.Item label="密码">
+            {getFieldDecorator("password",{
+              rules:[{required:true,message:"请输入邮箱密码"}]
+            })(
+              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(EducoderAccount));
--- a/src/forge/Component/FileLanguage.jsx
+++ b/src/forge/Component/FileLanguage.jsx
@ -1,5 +1,3 @@
-
-
 import React , { useState , useEffect } from 'react';
 import { Select } from 'antd';
 import axios from 'axios';
@ -59,6 +57,7 @@ const LANGUAGE = [

 export default (({ language , select_language })=>{
  const [ languages , setLanguage ] = useState(undefined);
+
  // useEffect(()=>{
  //   const url = '/dev_ops/languages.json';
  //   axios.get(url).then(result=>{
--- a/src/forge/Component/Handbook.jsx
+++ b/src/forge/Component/Handbook.jsx
@ -5,7 +5,7 @@ import './Component.scss';
 export default (()=>{
  return(
    <div className="handleBox">
-      <a href="https://forum.trustie.net/forums/3075/detail" ta  rget="_blank" >
+      <a href="https://forum.trustie.net/forums/3075/detail" target="_blank" >
        <img src={Handbook} alt=""/>
      </a>
    </div>
--- a/src/forge/Component/LanguagePower.jsx
+++ b/src/forge/Component/LanguagePower.jsx
@ -0,0 +1,54 @@
+import React, { useEffect, useState } from 'react';
+import { FlexAJ  } from '../Component/layout';
+
+function LanguagePower({languages}){
+  const [ array , setArray ] = useState(undefined);
+
+  useEffect(()=>{
+    if(languages){
+      let arr = [];
+      Object.keys(languages).map((item,key)=>{
+        arr.push({name:item,percent:languages[item],color:getColor()});
+      })
+      setArray(arr);
+    }
+  },[languages])
+
+   function getColor(){
+      let str = "#";
+      let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"];
+      for(var i=0;i<6;i++){
+        let num = parseInt(Math.random() * 16);
+        str+=arr[num];
+      }
+      return str;
+    }
+  return(
+    <div>
+      <p className="font-16 color-grey-6">开发语言</p>
+      <div className="progress">
+        {
+          array && array.map((item,key)=>{
+            return(
+              <span style={{width:item.percent,backgroundColor:item.color}}></span>
+            )
+          })
+        }
+      </div>
+      {
+        array && array.length > 0 &&
+        <FlexAJ className="progresstip">
+          {
+            array.map((item,key)=>{
+              return(
+                <span><i className="zero" style={{backgroundColor:`${item.color}`}}></i><span>{item.name}</span><span>{item.percent}</span></span>
+              )
+            })
+          }
+        </FlexAJ>
+      }
+      
+    </div>
+  )
+}
+export default LanguagePower;
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@ -45,7 +45,7 @@ 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(`images/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
      <div className="m-infos">
        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
        <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -0,0 +1,41 @@
+import React from 'react';
+import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { Link } from 'react-router-dom';
+
+function Releases({owner,projectsId,releaseVersions}){
+  
+  return(
+    <div>
+      <FlexAJ>
+        <AlignCenter><span className="font-16 color-grey-6">发行版</span>
+          { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+        </AlignCenter>
+        { releaseVersions && releaseVersions.total_count > 0 ? 
+          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
+          : 
+          <Link className="font-12 color-blue" to={`/projects/${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 color-grey-6">
+                  <Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
+                </p>
+                <p className="color-grey-9 font-13">{item.created_at}</p>
+              </div>
+            </AlignTop>
+            )
+          })
+        :""
+      }
+      
+    </div>
+  )
+}
+export default Releases;
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@ -44,7 +44,7 @@ export default ({ getUser })=>{
            className="user_img radius"
            width="28"
            height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
            alt=""
          />
          <span className="ml10" style={{ "vertical-align": "middle" }}>
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
+import { Link } from 'react-router-dom';

-
-export default ({ url , name , column })=>{
+export default ({ url , name , column  , id , login })=>{
  const Img = styled.span`
    display:flex;
    ${column && "flex-direction: column;text-align:center;"}
@ -19,8 +19,16 @@ export default ({ url , name , column })=>{
    }
  `;
  return(
+    id?
+    <Link to={`/users/${login}`}>
+      <Img>
+        { url && <img src={url} alt=""/> }
+        <span>{name}</span>
+      </Img>
+    </Link>
+    :
    <Img>
-      <img src={url} alt=""/>
+      { url && <img src={url} alt=""/> }
      <span>{name}</span>
    </Img>
  )
--- a/src/forge/Component/layout.jsx
+++ b/src/forge/Component/layout.jsx
@ -24,18 +24,33 @@ export const AlignCenter = styled.div`{
  display:flex;
  align-items: center;
 }`
+export const AlignTop = styled.div`{
+  display:flex;
+  align-items: flex-start;
+}`
 // 左右结构
 export const Box = styled.div`{
  display:flex;
-  align-item:flex-start;
+  align-items:flex-start;
+}`
+export const LongWidth = styled.div`{
+  flex:1;
+  width:0;
+  border-radius:5px;
+  margin-bottom:30px;
 }`
 export const Long = styled.div`{
-  width:72%;
+  width:78%;
+  border-radius:5px;
+  margin-bottom:30px;
+}`
+export const ShortWidth = styled.div`{
+  width:300px;
  border-radius:5px;
  margin-bottom:30px;
 }`
 export const Short = styled.div`{
-  width:28%;
+  flex:1;
  border-radius:5px;
  margin-bottom:30px;
 }`
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -36,8 +36,7 @@ function About(props, ref) {
  const [ disabled, setDisabled ] = useState(false);
  const [ typeFlag, setTypeFlag] = useState(false);

-
-  const AuthorLogin = props.author && props.author.login;
+  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
  const CurrentLogin = props.current_user && props.current_user.login;
  useEffect(()=>{
    if(CurrentLogin === AuthorLogin){
@ -56,11 +55,6 @@ function About(props, ref) {
      setIsSpining(false);
      if(result && result.data ){
        setStep(result.data.step);
-        // setStep(0);
-        // setFieldsValue({...result.data.cloud_account});
-        // if(result.data.cloud_account){
-        //   setDisabled(true);
-        // }
      }
    }).catch(error=>{
      setIsSpining(false);
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@ -45,9 +45,9 @@ function Dispose(props){
    }).then(result=>{
      if(result && result.data){
        setList(result.data.pipelines);
-        setSpining(false);
      }
-    }).catch(error=>{})
+      setSpining(false);
+    }).catch(error=>{setSpining(false);})
  }

  useEffect(()=>{
@ -137,13 +137,17 @@ function Dispose(props){
    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
  }

+  // 参数管理
+  function toparameter(){
+    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+  }
+
  const operate = current_user && (permission && permission !== "Reporter");
-  
  return(
    <Spin spinning={spining}>
      <PipelineName branchList={branchList} visible={visible} value={updateInfo} onCancel={()=>setVisible(false)} onOk={onOk}/>
      <div className="disposePanel">
-        <Head manager={ operate ? toModalManage : undefined} />
+        <Head manager={ operate ? toModalManage : undefined} parameter={operate ? toparameter :undefined}/>
        <Div>
          { operate &&  <Blueback onClick={()=>addNew(undefined,undefined)}>新增流水线</Blueback> }
          <div className="mt20 disposeList">
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@ -2,16 +2,50 @@ import React from 'react';
 import { Table , Popconfirm } from 'antd';
 import { Link } from 'react-router-dom';

-const STATUS = {
-  running:"运行中",
-  failure:"未通过",
-  error:"未通过",
-  success:"已通过",
-  killed:"已撤销",
-  pending:"准备中"
+// const STATUS = {
+//   running:"运行中",
+//   failure:"未通过",
+//   error:"未通过",
+//   success:"已通过",
+//   killed:"已撤销",
+//   pending:"准备中"
+// }
+function renderTableStatus(status) {
+  switch (status) {
+    case "running":
+      return (
+        <span className="statusTag running">
+          <i className="iconfont icon-yunhangzhong"></i>运行中
+        </span>
+      );
+    case "failure": case 'error':
+      return (
+        <span className="statusTag failed">
+          <i className="iconfont icon-weitongguo"></i>未通过
+        </span>
+      );
+    case "success":
+      return (
+        <span className="statusTag pass">
+          <i className="iconfont icon-yitongguo"></i>已通过
+        </span>
+      );
+    case 'killed':
+      return (
+        <span className="statusTag killed">
+          <i className="iconfont icon-weitongguo"></i>已撤销
+        </span>
+      );
+    default :
+      return (
+        <span className="statusTag Preparing">
+          <i className="iconfont icon-zhunbeizhong"></i>准备中
+        </span>
+      );
+  }
 }
 function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
-
+  
  const columns = [
    {
      title:"流水线名称",
@ -32,7 +66,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      ellipsis:true,
      render:(value,item)=>{
        return(
-          <Link to={`/projects/${owner}/${projectsId}/branch/${item.branch}/tree/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch}/${value}`} className="color-blue">{value}</Link>
        )
      }
    },
@ -61,10 +95,10 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      title:"最近构建状态",
      dataIndex:"pipeline_status",
      key:1,
-      width:"10%",
+      width:"12%",
      ellipsis:true,
      render:(txt)=>{
-        return(STATUS[txt])
+        return renderTableStatus(txt)
      }
    },
    {
--- a/src/forge/DevOps/Dispose/head.jsx
+++ b/src/forge/DevOps/Dispose/head.jsx
@ -2,15 +2,18 @@ import React from 'react';
 import { AlignCenterBetween , Blueline , FlexAJ } from '../../Component/layout';


-function head({manager}){
+function head({manager , parameter}){
  return(
    <AlignCenterBetween>
      <span className="font-20">工作流配置</span>
      <FlexAJ>
-        <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
+        {
+          parameter && <Blueline onClick={parameter}>参数管理</Blueline>
+        }
        {
          manager && <Blueline style={{marginLeft:"20px"}} onClick={manager}>模板管理</Blueline>
        }
+        <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6 ml20"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
      </FlexAJ>
    </AlignCenterBetween>
  )
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@ -26,6 +26,11 @@ const Mould = Loadable({
  loader: () => import('./Mould'),
  loading: Loading,
 })
+const Params = Loadable({
+  loader: () => import('./Manage/Params'),
+  loading: Loading,
+})
+
 export default ((props)=>{

  return(
@ -36,6 +41,11 @@ export default ((props)=>{
            (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"
          render={
            (p) => (<Mould {...props} {...p}/>)
--- a/src/forge/DevOps/Infos.jsx
+++ b/src/forge/DevOps/Infos.jsx
@ -1,9 +1,8 @@
-import React , { useEffect , useState , useRef } from 'react';
+import React , { useEffect , useState } from 'react';
 import { Banner } from '../Component/layout';
 import { Link } from 'react-router-dom';

 import Dispost from './Dispose';
-import Structure from './Structure';

 import styled from 'styled-components';

@ -11,22 +10,11 @@ const Div = styled.div`{
  padding:24px 30px;
 }`;
 export default ((props)=>{
-  const [ menu , setMenu ] = useState(false);
  const [ permission , setPermission ] = useState("");
-  const childRef = useRef();

-  const path = props.location.pathname;
  const owner = props.match.params.owner;
-  const projectsId = props.match.params.projectsId;

  const projectDetail = props.projectDetail;
-  useEffect(()=>{
-    if(path === `/projects/${owner}/${projectsId}/devops/list`){
-      setMenu(true);
-    }else{
-      setMenu(false);
-    }
-  },[path])

  useEffect(()=>{
    if(projectDetail){
@ -34,22 +22,13 @@ export default ((props)=>{
    }
  },[projectDetail])

-  const updateChildState = () => {
-    // changeVal就是子组件暴露给父组件的方法
-    if (childRef.current) {
-      childRef.current.changeVal();
-    }
-  }

  return(
    <div className="disposePanel">
      <Banner>
        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
-        {/* <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/list`}className={menu===true && "color-blue"}>构建列表</Link> */}
-        {/* { menu===true && <a onClick={updateChildState} style={{float:"right",fontSize:"14px",color:"#FF6E21",marginTop:"5px"}}>刷新</a>} */}
      </Banner>
      <Div>
-        {/* { menu === true && <Structure {...props}  wrappedComponentRef={(form) => childRef.current = form} ref={childRef}/> } */}
        <Dispost {...props}/>
      </Div>
    </div>
--- a/src/forge/DevOps/Manage/Params.jsx
+++ b/src/forge/DevOps/Manage/Params.jsx
@ -0,0 +1,119 @@
+import React , { useEffect , useState , useRef } from 'react';
+import { Banner , Blueback , FlexAJ , AlignCenter } from '../../Component/layout';
+import { Input , Table , Popconfirm , Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import New from './ParamsNew';
+import "./manage.scss";
+import axios from 'axios';
+import { result } from 'lodash';
+
+const Div = styled.div`{
+  padding:24px 30px;
+  min-height:420px;
+}`;
+function Params(props){
+  const [ list ,setList ] = useState(undefined);
+  const [ editList ,setEditList ] = useState(undefined);
+  const [ visible ,setVisible ] = useState(false);
+  
+  let projectsId = props.match.params.projectsId; 
+  let owner = props.match.params.owner; 
+
+  useEffect(()=>{
+    Init()
+  },[])
+
+  function Init(){
+    const url = `/ci/secrets.json`;
+    axios.get(url,{
+      params:{
+        owner,repo:projectsId
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data);
+      }
+    }).catch(error=>{})
+  }
+
+  const columns=[
+    {
+      title:"参数名",
+      dataIndex:"name",
+      key:1,
+      ellipsis:true
+    },
+    {
+      title:"操作",
+      dataIndex:"operation",
+      key:4,
+      render:(txt,item)=>{
+        return(
+          <React.Fragment>
+            <a className="mr10 color-grey-6" onClick={()=>editMouldFunc(item)}><i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</a>
+            <Popconfirm title={"确定要删除此模板？"} onConfirm={()=>deleteMouldFunc(item.id,item.name)} okText="确定" cancelText={"取消"}>
+              <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
+            </Popconfirm>
+          </React.Fragment>
+        )
+      }
+    }
+  ]
+
+  // 编辑
+  function editMouldFunc(item){
+    setEditList(item);
+    setVisible(true);
+  }
+
+  // 删除
+  function deleteMouldFunc(id,name){
+    if(id && name){
+      const url = `/ci/secrets/${id}.json`;
+      axios.delete(url,{
+        params:{owner,repo:projectsId,name}
+      }).then(result=>{
+        if(result){
+          Init();
+          props.showNotification(`参数删除成功！`);
+        }
+      }).catch(error=>{})
+    }
+  }
+
+  function successFunc(values,id){
+    const url = `/ci/secrets.json?owner=${owner}&repo=${projectsId}`;
+    axios.post(url,{
+      ...values,id
+    }).then(result=>{
+      if(result){
+        props.showNotification(`${id ? '参数编辑':"新增参数"}成功！`);
+        Init();
+      }
+    }).catch(error=>{})
+  }
+
+  function CancelFunc(){
+    setVisible(false)
+  }
+
+  return(
+    <div>
+      <New visble={visible} successFunc={successFunc} CancelFunc={CancelFunc} editList={editList}/>
+      <Banner>
+        <FlexAJ>
+          <span className="font-18">工作流 - 参数管理</span>
+          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+        </FlexAJ>
+      </Banner>
+      <Div className="disposeList">
+        <div style={{textAlign:"right"}}>
+          <Blueback onClick={()=>setVisible(true)}>新建</Blueback>
+        </div>
+        <Table className="mt20" size="small" columns={columns} dataSource={list} rowKey={(row)=>row.id} pagination={false}></Table>
+      </Div>
+    </div>
+  )
+}
+export default Params;
--- a/src/forge/DevOps/Manage/ParamsNew.jsx
+++ b/src/forge/DevOps/Manage/ParamsNew.jsx
@ -0,0 +1,73 @@
+import React , { useEffect , useState , useRef , forwardRef } from 'react';
+import { Modal , Input , Form } from 'antd';
+
+const { TextArea } = Input;
+
+function ParamsNew({ form , visble,successFunc,CancelFunc ,editList }){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+
+  useEffect(()=>{
+    if(editList && editList.id){
+      setFieldsValue({
+        name:editList.name,
+        data:editList.data
+      })
+    }else{
+      setFieldsValue({
+        name:undefined,
+        data:undefined
+      })
+    }
+  },[editList])
+
+  // 确定
+  function onConfirmFunc(){
+    validateFields((error,values)=>{
+      if(!error){
+        successFunc(values,editList && editList.id);
+        onCancelFunc();
+      }
+    })
+  }
+  function onCancelFunc(){
+    setFieldsValue({
+      name:undefined,
+      data:undefined
+    })
+    CancelFunc();
+  }
+  return(
+    <Modal
+      visible={visble}
+      okText={"确定"}
+      cancelText={"取消"}
+      onCancel={onCancelFunc}
+      onOk={onConfirmFunc}
+      title={"新建"}
+      closable={false}
+      width="500px"
+    >
+      <Form {...layout}>
+        <Form.Item label="参数名称">
+          {getFieldDecorator("name",{
+            rules:[{required:true,message:"请输入参数名称"}]
+          })(
+            <Input placeholder="请输入参数名称" width="220px"/>
+          )}
+        </Form.Item>
+        <Form.Item label="参数值">
+          {getFieldDecorator("data",{
+            rules:[{required:true,message:"请输入参数值"}]
+          })(
+            <TextArea placeholder="请输入参数值" width="220px" autoSize={{ minRows: 4, maxRows: 4 }}/>
+          )}
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(ParamsNew));
--- a/src/forge/DevOps/Manage/manage.scss
+++ b/src/forge/DevOps/Manage/manage.scss
@ -0,0 +1,4 @@
+.ant-form-explain{
+  position: absolute;
+  bottom: -15px;
+}
--- a/src/forge/DevOps/OpsDetailRightpanel.jsx
+++ b/src/forge/DevOps/OpsDetailRightpanel.jsx
@ -1,7 +1,8 @@
 import React, { useState, useEffect } from "react";
-import { Spin } from "antd";
+import { Spin , Menu } from "antd";
 import { FlexAJ, AlignCenter } from "../Component/layout";
 import axios from "axios";
+import CodeSSH from './ssh/Index';

 export default ({
  data,
@ -17,6 +18,8 @@ export default ({
  const [spining, setSpining] = useState(true);
  const [stage, setStage] = useState(undefined);
  const [step, setStep] = useState(undefined);
+  const [nav, setNav] = useState("0");
+
  useEffect(() => {
    setSpining(rightSpin);
  }, [rightSpin]);
@ -35,6 +38,7 @@ export default ({
          : p[0];

        setStep(sub);
+        setNav("0");
        if (sub && sub.status !== "skipped") {
          getStep(pre.number, sub.number);
        }
@ -65,43 +69,55 @@ export default ({
    }
  }
  return (
-    <Spin spinning={spining}>
-      <div className="rightMainContent">
-        {data && data.status !== "error" ? (
-          <div>
-            <FlexAJ className="items">
-              <span>{step && step.name}</span>
-              <AlignCenter>
-                {step && step.duration_time}
-                <i className="iconfont icon-sanjiaoxing-down"></i>
-              </AlignCenter>
-            </FlexAJ>
-            <div>
-              {coders && coders.length > 0 ? (
-                coders.map((item, key) => {
-                  return (
+    <React.Fragment>
+      {/* <Menu className="devopsNav" onClick={(e)=>{setNav(e.key)}} selectedKeys={[nav]} mode="horizontal">
+        <Menu.Item key={'0'} value="0">开发流水线</Menu.Item>
+        <Menu.Item key={'1'} value="1">命令行</Menu.Item>
+      </Menu> */}
+      {
+        nav === "0" &&
+        <Spin spinning={spining}>
+          <div className="rightMainContent">
+            {data && data.status !== "error" ? (
+              <div>
+                <FlexAJ className="items">
+                  <span>{step && step.name}</span>
+                  <AlignCenter>
+                    {step && step.duration_time}
+                    <i className="iconfont icon-sanjiaoxing-down"></i>
+                  </AlignCenter>
+                </FlexAJ>
+                <div>
+                  {coders && coders.length > 0 ? (
+                    coders.map((item, key) => {
+                      return (
+                        <div className="opsDetailOut">
+                          <span>{key + 1}</span>
+                          <p>{item.out}</p>
+                        </div>
+                      );
+                    })
+                  ) : empty ? (
                    <div className="opsDetailOut">
-                      <span>{key + 1}</span>
-                      <p>{item.out}</p>
+                      <span>1</span>
+                      <p>
+                        {stage && stage.name} – {step && step.name}: Skipped
+                      </p>
                    </div>
-                  );
-                })
-              ) : empty ? (
-                <div className="opsDetailOut">
-                  <span>1</span>
-                  <p>
-                    {stage && stage.name} – {step && step.name}: Skipped
-                  </p>
+                  ) : (
+                    ""
+                  )}
                </div>
-              ) : (
-                ""
-              )}
-            </div>
+              </div>
+            ) : (
+              <div style={{ color: "red" }}>error:{data && data.error}</div>
+            )}
          </div>
-        ) : (
-          <div style={{ color: "red" }}>error:{data && data.error}</div>
-        )}
-      </div>
-    </Spin>
+        </Spin>
+      }
+      {
+        nav === "1" && <CodeSSH />
+      }
+    </React.Fragment>
  );
 };
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -58,6 +58,7 @@ function Structure(props,ref){
          return {
            ...item,
            author:item.author && item.author.name,
+            image_url:item.author && item.author.image_url,
            message: {
              branch: item.branch_target,
              message: item.message,
@ -187,7 +188,7 @@ function Structure(props,ref){
            <i className="iconfont icon-weitongguo"></i>已撤销
          </span>
        );
-      case 'pending':
+      default:
        return (
          <span className="statusTag Preparing">
            <i className="iconfont icon-zhunbeizhong"></i>准备中
@ -244,7 +245,7 @@ function Structure(props,ref){
              {meg.sha && <span className="color-orange">{meg.sha}</span>}
            </div>
            <AlignCenter>
-              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
              <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                {meg.message}
              </div>
--- a/src/forge/DevOps/ops.scss
+++ b/src/forge/DevOps/ops.scss
@ -10,6 +10,7 @@
    padding:60px 0px;
  }
  .disposePanel{
+    border:1px solid #eee;
    .language{
      display: flex;
      margin-bottom: 20px;
@ -81,48 +82,7 @@
  .ant-modal-close{
    top:7px;
  }
-  // 列表
-  .listPart{
-    .statusTag{
-      display: flex;
-      padding:0px 16px;
-      height: 32px;
-      line-height: 32px;
-      border-radius:20px;
-      float: left;
-      i{
-        font-size: 20px!important;
-        margin-right: 7px;
-      }
-      &.running{
-        background:#F1F8FF;
-        border:1px solid #5091FF;
-        color: #5091FF;
-      }
-      &.Preparing{
-        background:rgba(255,248,244,1);
-        border:1px solid rgba(255,110,33,1);
-        color:rgba(255,110,33,1) ;
-      }
-      &.pass{
-        background:#EEFDF5;
-        border:1px solid #28BD6C;
-        color:#28BD6C ;
-      }
-      &.failed{
-        background:#FCEEEE;
-        border:1px solid #F73030;
-        color:#F73030 ;
-      }
-      &.killed{
-        background:#eee;
-        border:1px solid #999;
-        color:#999 ;
-      }
-    }
-
-  }
-
+  
 }
 // ops详情
 .opsDetailPanel{
@ -234,6 +194,18 @@
      &.rightSection{
        width:100%;
        background-color: #081930;
+        .devopsNav{
+          background-color: #111c24;
+          border-bottom: none;
+          .ant-menu-item{
+            color: #ccc;
+            padding:0px;
+            margin:0px 20px!important;
+          }
+          .ant-menu-item.ant-menu-item-selected{
+            color: #1890ff;
+          }
+        }
        .rightMainContent{
          padding:24px 30px;
          height:100vh;
@ -509,4 +481,41 @@
 }
 .hide{
  display: none!important;
+}
+.statusTag{
+  display: flex;
+  padding:0px 16px;
+  height: 32px;
+  line-height: 32px;
+  border-radius:20px;
+  float: left;
+  i{
+    font-size: 20px!important;
+    margin-right: 7px;
+  }
+  &.running{
+    background:#F1F8FF;
+    border:1px solid #5091FF;
+    color: #5091FF;
+  }
+  &.Preparing{
+    background:rgba(255,248,244,1);
+    border:1px solid rgba(255,110,33,1);
+    color:rgba(255,110,33,1) ;
+  }
+  &.pass{
+    background:#EEFDF5;
+    border:1px solid #28BD6C;
+    color:#28BD6C ;
+  }
+  &.failed{
+    background:#FCEEEE;
+    border:1px solid #F73030;
+    color:#F73030 ;
+  }
+  &.killed{
+    background:#eee;
+    border:1px solid #999;
+    color:#999 ;
+  }
 }
--- a/src/forge/DevOps/ssh/Index.jsx
+++ b/src/forge/DevOps/ssh/Index.jsx
@ -0,0 +1,42 @@
+import React, { useState, useEffect } from "react";
+import XmlPanel from "./XmlPanel";
+import mediator from "./mediator";
+import axios from "axios";
+
+// const defaulturl = `http://47.111.130.18:48088`;
+const defaultValue = {
+  host: "106.75.231.63",
+  port: "2021",
+  ws_url: "wss://pre-webssh.educoder.net/ws",
+  username: "root",
+  secret: "Dron_123123",
+};
+function Index() {
+  const [sshConfigData, setSshConfigData] = useState(undefined);
+
+  useEffect(() => {
+    if (!sshConfigData) {
+      init();
+    }
+    setTimeout(() => {
+      mediator.publish("create-socket", 1);
+    }, 300);
+  }, [sshConfigData]);
+
+  // 获取服务器连接信息
+  function init() {
+    const url = `/api/ci/pipelines/ssh_server.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setSshConfigData({...result.data})
+      }
+    }).catch(error=>{})
+  }
+  return (
+    <XmlPanel
+      sshConfigData={sshConfigData||{}}
+      sid={1}
+    />
+  );
+}
+export default Index;
--- a/src/forge/DevOps/ssh/XmlPanel.jsx
+++ b/src/forge/DevOps/ssh/XmlPanel.jsx
@ -0,0 +1,219 @@
+import React, { useRef, useEffect, useState } from 'react';
+import { Base64 } from 'js-base64';
+
+import { Terminal } from 'xterm';
+import 'xterm/css/xterm.css';
+import mediator from './mediator';
+import ResizeObserver from 'resize-observer-polyfill';
+
+function getColsAndRows(width, height, term) {
+  let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+  let h = term._core._renderService.dimensions.actualCellHeight || 18;
+  const rows = Math.floor(height / h);
+  const cols = Math.floor(width / w);
+  return [cols, rows];
+}
+
+function onLayout(term, el) {
+  const ro = new ResizeObserver(entries => {
+    console.log(entries);
+    for (let entry of entries) {
+      if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
+        const [cols, rows] = getColsAndRows(
+          entry.target.offsetWidth,
+          entry.target.offsetHeight,
+          term,
+        );
+        console.log('cols, rows', cols, rows);
+        term.resize(cols, rows);
+        mediator.publish('ssh-xterm-resize', {
+          columns: cols,
+          rows: rows,
+          width: entry.target.offsetWidth,
+          height: entry.target.offsetHeight,
+        });
+      }
+    }
+  });
+  ro.observe(el);
+  return ro;
+}
+
+const TimeTicket = 30000;
+
+//建立 websockt 来交互
+//根据容器大小计算行数和列数并做到自适应
+//socket 与 term 需要分开初始化 因为socket 可能重置连接
+//mediator 监听消息，如果和id匹配，则建立连接，重置，或关闭连接
+
+export default ({ sshConfigData, sid }) => {
+  const [term, setTerm] = useState(null);
+
+  const { ws_url, password, port, secret } = sshConfigData;
+  const el = useRef();
+  const socket = useRef();
+  const isFirstConnected = useRef(false);
+
+  //term init
+  useEffect(() => {
+    if (el.current && ws_url) {
+      const term = new Terminal({ fontSize: 16, rendererType: 'dom' });
+      term.open(el.current);
+
+      term.onData(data => {
+        if (socket.current) {
+          if (socket.current.readyState === 1) {
+            socket.current.send(JSON.stringify({ tp: 'client', data: data }));
+            mediator.publish('on-operating-ssh'); //有操作则自动延时
+          } else {
+            //断开连接后重连
+            // socket.current = null
+            // mediator.publish('create-socket', sid)
+          }
+        }
+      });
+      term.write('Connecting...');
+      setTerm(term);
+      const ro = onLayout(term, el.current);
+      return () => {
+        term.dispose();
+        ro.unobserve(el.current);
+      };
+    }
+  }, [ws_url, el.current]);
+
+  useEffect(() => {
+    if (term && ws_url) {
+      function createSocket() {
+        const socketInstance = new WebSocket(ws_url);
+        socket.current = socketInstance;
+
+        socketInstance.onopen = () => {
+          let container = term.element.parentElement;
+          if (container) {
+            let width = container.offsetWidth;
+            let height = container.offsetHeight;
+            console.log('init', {
+              tp: 'init',
+              data: {
+                ...sshConfigData,
+                secret: secret,
+                width,
+                height,
+                rows: term.rows,
+                columns: term.cols,
+              },
+            });
+            socketInstance.send(
+              JSON.stringify({
+                tp: 'init',
+                data: {
+                  ...sshConfigData,
+                  secret: secret,
+                  width,
+                  height,
+                  rows: term.rows,
+                  columns: term.cols,
+                },
+              }),
+            );
+          }
+          term.focus();
+        };
+        socketInstance.onerror = error => {
+          console.log(
+            '------in socket error----',
+            error,
+            socketInstance,
+            ws_url,
+          );
+          //连接报错后，重新请求资源
+          // mediator.publish('on-recreate-socket')
+        };
+        socketInstance.onmessage = event => {
+          if (!isFirstConnected.current) {
+            term.write('\r');
+            // term.focus()
+            setTimeout(() => {
+              // term.clear();
+            }, 1000);
+          }
+          isFirstConnected.current = true;
+          console.log('event:', event);
+
+          const data = Base64.decode(event.data.toString());
+          let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+
+          console.log('data:', data, w, term);
+          term.write(data);
+        };
+
+        socketInstance.onclose = evt => {
+          if (tid) {
+            clearInterval(tid);
+          }
+          term.write('\r\nconnection closed');
+        };
+      }
+
+      const tid = setInterval(() => {
+        if (socket.current) {
+          socket.current.send(JSON.stringify({ tp: 'h' }));
+        }
+      }, TimeTicket);
+
+      const unSubCreate = mediator.subscribe('create-socket', id => {
+        if (sid === id) {
+          if (socket.current && socket.current.readyState === 1) {
+            term.focus();
+          } else {
+            createSocket();
+          }
+          term.focus();
+        }
+      });
+
+      const unSubClose = mediator.subscribe('close-socket', id => {
+        if (sid === id) {
+          if (socket.current) {
+            socket.current.close();
+            isFirstConnected.current = false;
+            term.clear();
+          }
+          socket.current = null;
+        }
+      });
+
+      const unSubResize = mediator.subscribe('ssh-xterm-resize', option => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(
+            JSON.stringify({ tp: 'resize', data: { ...option } }),
+          );
+        }
+      });
+
+      const unSubAddTime = mediator.subscribe('ssh-add-connect-time', () => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(JSON.stringify({ tp: 'overtime' }));
+        }
+      });
+
+      return () => {
+        unSubClose();
+        unSubCreate();
+        unSubResize();
+        unSubAddTime();
+        if (socket.current) {
+          socket.current.close();
+          isFirstConnected.current = false;
+        }
+      };
+    }
+  }, [term, ws_url, port]);
+
+  return (
+    <div ref={el} className="xterm-panel" style={{height:"100%"}}>
+      {!ws_url ? <p style={{ color: '#fff' }}>正在连接命令行服务...</p> : null}
+    </div>
+  );
+};
--- a/src/forge/DevOps/ssh/mediator.jsx
+++ b/src/forge/DevOps/ssh/mediator.jsx
@ -0,0 +1,46 @@
+function Mediator(obj) {
+  const channels = {};
+
+  const mediator = {
+    subscribe: function(channel, cb) {
+      if (!channels[channel]) {
+        channels[channel] = [];
+      }
+      channels[channel].push(cb);
+      return this.unsubscribe.bind(null, channel, cb);
+    },
+
+    unsubscribe: function(channel, cb) {
+      let rs = channels[channel];
+      let index = -1;
+      if (rs) {
+        for (let i = 0; i < rs.length; i++) {
+          if (rs[i].name === cb.name) {
+            index = i;
+            break;
+          }
+        }
+        if (index >= 0) {
+          channels[channel].splice(index, 1);
+          return true;
+        }
+      }
+      return false;
+    },
+
+    publish: function(channel) {
+      if (!channels[channel]) {
+        return false;
+      }
+      const args = Array.prototype.slice.call(arguments, 1);
+      channels[channel].forEach(subscription => {
+        subscription.apply(null, args);
+      });
+      return this;
+    },
+  };
+
+  return obj ? Object.assign(obj, mediator) : mediator;
+}
+const mediator = new Mediator();
+export default mediator;
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@ -10,4 +10,12 @@ export const getTag = async (id,owner)=>{
 // 获取hooks（仓库设置-管理web钩子）列表
 export const getHooks = async (id,params)=>{
  return (await axios.get(`/projects/${id}/hooks.json`,{params})).data;
+}
+// 获取子目录列表
+export const getSubEntries = async (owner,projectsId,params)=>{
+  return (await axios.get(`/${owner}/${projectsId}/sub_entries.json`,{params})).data;
+}
+// 获取用户信息
+export const getUser = async (login)=>{
+  return (await axios.get(`/users/${login}/hovercard.json`)).data;
 }
--- a/src/forge/Head/Footer.jsx
+++ b/src/forge/Head/Footer.jsx
@ -0,0 +1,66 @@
+import React, { useEffect , useState } from 'react';
+import './header.scss';
+
+function Footer(){
+  const [ value , setValue ] = useState(undefined);
+
+  useEffect(()=>{
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      setValue(chromesettingArray.footer);
+    } catch (e) {
+    }
+  },[])
+
+  function showhtml(htmlString){
+    var html = {__html:htmlString};
+    return <div dangerouslySetInnerHTML={html}></div> ;
+  }
+
+  return(
+    <div>
+      <div style={{height:"483px"}}></div>
+      <div className="newFooter edu-txt-center">
+        {value && showhtml(value)}
+        {/* <div className="footerInfos">
+          <ul>
+            <li>社区</li>
+            <li><a href={`/`} target="_blank">网站首页</a></li>
+            <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
+            <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
+          </ul>
+          <ul>
+            <li>支持与服务</li>
+            <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
+            <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
+            <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
+            <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
+            <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
+            <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
+            <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
+            <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
+            <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
+            <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
+            <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
+            <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><span>热线：</span></li>
+            <li><span>QQ群：1071514693</span></li>
+          </ul>
+        </div>
+        <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
+      </div>
+    </div>
+  )
+}
+export default Footer;
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -0,0 +1,730 @@
+import React, { Component } from 'react';
+import AccountProfile from "../../modules/user/AccountProfile";
+import { getImageUrl } from 'educoder'
+import axios from 'axios';
+import { Modal, Input, message, notification , Dropdown , Menu ,Divider } from 'antd';
+
+import LoginDialog from '../../modules/login/LoginDialog';
+import GotoQQgroup from '../../modal/GotoQQgroup'
+// import 'antd/lib/modal/style/index.css';
+// import 'antd/lib/checkbox/style/index.css';
+// import 'antd/lib/radio/style/index.css';
+// import 'antd/lib/input/style/index.css';
+import '../../modules/tpm/TPMIndex.css';
+import logo from '../../modules/tpm/images/logo.png';
+import './header.scss';
+const $ = window.$
+// TODO 这部分脚本从公共脚本中直接调用
+const { Search } = Input;
+let old_url;
+
+window._header_componentHandler = null;
+// 非trustie链接则新开页跳转
+const str = ['www.trustie.net','forgeplus.trustie.net','forum.trustie.net','testforgeplus.trustie.net']
+class NewHeader extends Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      Addcoursestypes: false,
+      tojoinitemtype: false,
+      tojoinclasstitle: undefined,
+      rolearr: ["", ""],
+      Checkboxteacherchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      code_notice: false,
+      checked_notice: false,
+      RadioGroupvalue: undefined,
+      submitapplications: false,
+      isRender: false,
+      showSearchOpentype: false,
+      showTrial: false,
+      setevaluatinghides: false,
+      occupation: 0,
+      mydisplay: false,
+      headtypesonClickbool: false,
+      headtypess: "/",
+      settings: null,
+      goshowqqgtounp: false,
+      visiblemyss: false,
+      openSearch:false,
+    }
+  }
+  componentDidMount() {
+    // this.getAppdata();
+    this.geturlsdata();
+    window._header_componentHandler = this;
+
+    //下拉框的显示隐藏
+    var hoverTimeout;
+    var hoveredPanel;
+    $(".edu-menu-panel").hover(function () {
+      if (hoverTimeout) { // 一次只显示一个panel
+        if (hoveredPanel && hoveredPanel !== this) {
+          $(hoveredPanel).find(".edu-menu-list").hide()
+        }
+        clearTimeout(hoverTimeout);
+        hoverTimeout = null;
+      }
+      hoveredPanel = this;
+      $(this).find(".edu-menu-list").show();
+    }, function () {
+      var that = this;
+      // 延迟hide
+      hoverTimeout = setTimeout(function () {
+        $(that).find(".edu-menu-list").hide();
+      }, 800)
+
+    });
+    //获取游览器地址
+    try {
+      window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href))
+    } catch (e) {}
+  }
+
+  SearchInput = (open,item)=>{
+    if(open){
+      return(
+        <div
+          onBlur={() => {
+            setTimeout(() => {
+              this.setState({
+                openSearch:false
+              })
+            }, 300)
+          }}
+        >
+          <Search placeholder="实践课程/教学课堂/实践项目/交流问答"
+            className={`search-input mr20`}
+            onSearch={(value)=>this.onGlobalSearch(value,item)}
+            autoFocus={true}
+          />
+        </div>
+      )
+    }else{
+      return <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
+        this.setState({openSearch:true})
+      }} />
+    }
+  }
+
+  onGlobalSearch=(value,item)=>{
+    window.location.href=`${item}?value=` + value;
+  }
+
+  openNotification = (messge) => {
+    notification.open({
+      message: "提示",
+      description:
+        messge,
+    });
+  };
+
+
+
+  componentWillReceiveProps(newProps, oldProps) {
+    this.setState({
+      user: newProps.user
+    })
+    if (newProps.Headertop !== undefined) {
+      old_url = newProps.Headertop.old_url
+    }
+  }
+  getCookie = (key) => {
+    var arr, reg = RegExp('(^| )' + key + '=([^;]+)(;|$)');
+    if (arr === document.cookie.match(reg))
+      return decodeURIComponent(arr[2]);
+    else
+      return null;
+  }
+
+  delCookie = (name) => {
+    var exp = new Date();
+    exp.setTime(exp.getTime() - 1);
+    var cval = this.getCookie(name);
+    if (cval != null) {
+      document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
+    }
+  }
+  onLogout = () => {
+    const url = `/accounts/logout.json`
+    this.delCookie("autologin_trustie")
+    axios.get(url, {
+    }).then((response) => {
+      if (response.data.status === 1) {
+        this.setState({
+          user: undefined
+        })
+        window.location.href = "/login"
+        message.success('退出成功');
+      }
+    });
+  }
+
+  tojoinclass = () => {
+    let { user } = this.state;
+    if (user === undefined) {
+      this.setState({
+        isRender: true
+      })
+      return
+    }
+    if (user && user.login === "") {
+      this.setState({
+        isRender: true
+      })
+      return;
+    }
+    if (user && user.profile_completed === false) {
+      this.setState({
+        AccountProfiletype: true
+      })
+      return;
+    }
+    this.setState({
+      Addcoursestypes: true,
+    })
+  }
+
+  tojoinitem = () => {
+    if (this.props.user && this.props.user.email === undefined || this.props.user && this.props.user.email === null || this.props.user && this.props.user.email === "") {
+      this.openNotification("请先绑定邮箱，谢谢");
+      return
+    }
+    let { user } = this.state;
+    if (user === undefined) {
+      this.setState({
+        isRender: true
+      })
+      return
+    }
+    if (user && user.login === "") {
+      this.setState({
+        isRender: true
+      })
+      return;
+    }
+
+    if (user && user.profile_completed === false) {
+      this.setState({
+        AccountProfiletype: true
+      })
+      return;
+    }
+
+    this.setState({
+      tojoinitemtype: true
+    })
+  }
+
+
+  submitstatevalue = (sum, value, data) => {
+    this.setState({
+      Addcoursestypes: false,
+      tojoinitemtype: false,
+      tojoinclasstitle: undefined,
+      rolearr: ["", ""],
+      Checkboxteacherchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      code_notice: false,
+      checked_notice: false,
+      submitapplicationssum: sum,
+      submitapplications: true,
+      submitapplicationsvalue: value,
+      submitapplicationsvaluedata: data,
+      RadioGroupvalue: undefined
+    })
+  }
+
+  onChangeRadioGroup = (e) => {
+    this.setState({
+      RadioGroupvalue: e.target.value,
+    });
+  }
+
+  submitsubmitapplications = () => {
+    let {
+      submitapplicationssum,
+      submitapplicationsvaluedata
+    } = this.state;
+    this.setState({
+      submitapplications: false,
+      RadioGroupvalue: undefined
+    })
+    if (submitapplicationssum === 0) {
+      if (submitapplicationsvaluedata !== undefined) {
+        window.location.href = "/courses/" + submitapplicationsvaluedata;
+      }
+    } else if (submitapplicationssum === 1) {
+      if (submitapplicationsvaluedata !== undefined) {
+        window.location.href = "/projects/" + submitapplicationsvaluedata;
+      }
+    }
+  }
+
+  hidesubmitapplications = () => {
+    this.setState({
+      Addcoursestypes: false,
+      tojoinitemtype: false,
+      tojoinclasstitle: undefined,
+      rolearr: ["", ""],
+      Checkboxteacherchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      code_notice: false,
+      checked_notice: false,
+      submitapplications: false,
+      RadioGroupvalue: undefined
+    })
+  }
+  educoderlogin = () => {
+    //登录账号
+    this.setState({
+      isRender: true
+    })
+  }
+  educoderloginysl = () => {
+    //退出账号
+    var url = `/accounts/logout.json`;
+    axios.get((url)).then((result) => {
+      if (result !== undefined) {
+        window.location.href = "/";
+      }
+    }).catch((error) => {
+      console.log(error);
+    })
+  }
+
+  hideAddcoursestypes = () => {
+    this.setState({
+      Addcoursestypes: false
+    })
+  };
+  HideAddcoursestypess = (i) => {
+    console.log("调用了");
+    this.setState({
+      Addcoursestypes: false,
+      mydisplay: true,
+      occupation: i,
+    })
+  };
+  ModalCancelsy = () => {
+    this.setState({
+      mydisplay: false,
+    })
+  };
+
+
+  hidetojoinclass = () => {
+    this.setState({
+      tojoinclasstype: false,
+      tojoinitemtype: false,
+      tojoinclasstitle: undefined,
+      rolearr: ["", ""],
+      Checkboxteacherchecked: false,
+      Checkboxstudentchecked: false,
+      Checkboxteachingchecked: false,
+      Checkboxteachertype: false,
+      Checkboxteachingtype: false,
+      code_notice: false,
+      checked_notice: false,
+      RadioGroupvalue: undefined
+    })
+  }
+
+  // 关闭
+  cancelModulationModels = () => {
+    this.setState({ isRenders: false })
+  }
+
+
+  setevaluatinghides = () => {
+    this.setState({
+      setevaluatinghides: true
+    })
+  }
+  //修改登录方法
+  Modifyloginvalue = () => {
+    this.setState({
+      isRender: false,
+    })
+  }
+
+  hideAccountProfile = () => {
+    this.setState({
+      AccountProfiletype: false
+    })
+  };
+  headtypesonClick = (url, bool) => {
+    this.setState({
+      headtypess: url,
+      headtypesonClickbool: bool,
+    })
+  }
+  //获取数据为空的时候
+  gettablogourlnull = () => {
+    this.setState({
+      settings: undefined
+    });
+    var link = document.createElement('link'),
+      oldLink = document.getElementById('dynamic-favicon');
+    link.id = 'dynamic-favicon';
+    link.rel = 'shortcut icon';
+    link.href = "/react/build/./favicon.ico";
+    if (oldLink) {
+      document.head.removeChild(oldLink);
+    }
+    document.head.appendChild(link);
+  };
+
+  //获取数据的时候
+  gettablogourldata = (response) => {
+    document.title = response.data.setting.name;
+    var link = document.createElement('link'),
+      oldLink = document.getElementById('dynamic-favicon');
+    link.id = 'dynamic-favicon';
+    link.rel = 'shortcut icon';
+    link.href = '/' + response.data.setting.tab_logo_url;
+    if (oldLink) {
+      document.head.removeChild(oldLink);
+    }
+    document.head.appendChild(link);
+  }
+
+  handleVisibleChanges = (boll) => {
+    this.setState({
+      visiblemyss: boll,
+    })
+  }
+
+  getAppdata = () => {
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
+      this.setState({
+        settings: chromesettingArray
+      });
+      if (chromesettingArray.tab_logo_url) {
+        this.gettablogourldata(chromesettingresponseArray);
+      } else {
+        this.gettablogourlnull();
+      }
+    } catch (e) {
+      this.geturlsdata();
+    }
+  };
+
+  geturlsdata = () => {
+    let url = "/setting.json";
+    axios.get(url).then((response) => {
+      if (response && response.data) {
+        this.setState({ settings: response.data.setting });
+        // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+        // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
+        try {
+          if (response.data.setting.tab_logo_url) {
+            this.gettablogourldata(response);
+          } else {
+            this.gettablogourlnull();
+          }
+        } catch (e) {
+          this.gettablogourlnull();
+        }
+      } else {
+        this.gettablogourlnull();
+      }
+    }).catch((error) => {
+      this.gettablogourlnull();
+    });
+  }
+
+  matchpaths = (url) => {
+    const { match } = this.props;
+    if(url){
+      if (match.path.indexOf(url) > -1) {
+        return true
+      }else {
+        return false
+      }
+    }
+  }
+
+
+  // 处理弹框
+  setgoshowqqgtounp = (bool) => {
+    this.setState({
+      goshowqqgtounp: bool
+    })
+  }
+
+  addMenu=(list)=>{
+    return(
+      list && list.length >0 && 
+      <div className="dropdownFlex">
+        <Menu> 
+          {
+            list.map((item,key)=>{
+              return(
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item><a href={item.url}>{item.name}</a></Menu.Item>
+              )
+            })
+          }
+        </Menu>
+      </div>
+    )
+  }
+
+  render() {
+    const { match} = this.props;
+    let current_user = this.props.user;
+    let { Addcoursestypes,
+      tojoinitemtype,
+      tojoinclasstitle,
+      code_notice,
+      checked_notice,
+      AccountProfiletype,
+      submitapplications,
+      submitapplicationsvalue,
+      user,
+      isRender,
+      showSearchOpentype,
+      headtypesonClickbool,
+      headtypess,
+      settings,
+      goshowqqgtounp,
+      openSearch,
+    } = this.state;
+    /*用户名称  用户头像url*/
+    let activeIndex = false;
+    let activeForums = false;
+    let activeShixuns = false;
+    let activePaths = false;
+    let coursestype = false;
+    let activePackages = false;
+    let activeMoopCases = false;
+    let activeCompetitions = false;
+
+    if (match.path === '/forums') {
+      activeForums = true;
+    } else if (match.path.startsWith('/shixuns')) {
+      activeShixuns = true;
+    } else if (match.path.startsWith('/paths')) {
+      activePaths = true;
+    } else if (match.path.startsWith('/courses')) {
+      coursestype = true;
+    } else if (match.path.startsWith('/crowdsourcing')) {
+      activePackages = true;
+    } else if (match.path.startsWith('/moop_cases')) {
+      activeMoopCases = true;
+    } else if (match.path.startsWith('/competitions')) {
+      activeCompetitions = true;
+    } else {
+      activeIndex = true;
+    }
+
+    let headtypes = '/';
+    if (settings) {
+      if (settings.navbar) {
+        if (settings.navbar.length > 0) {
+          if (match.path === '/') {
+            if (headtypesonClickbool === false) {
+              headtypes = undefined;
+            } else {
+              headtypes = headtypess;
+            }
+          } else {
+            for (var i = 0; i < settings.navbar.length; i++) {
+              if (match.path === settings.navbar[i].link) {
+                headtypes = settings.navbar[i].link;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+    let shixuntype = false;
+    let pathstype = false;
+    let coursestypes = false;
+    if (this.props && this.props.mygetHelmetapi != null) {
+      let shixun = "/shixuns";
+      let paths = "/paths";
+      let courses = "/courses";
+      this.props.mygetHelmetapi.navbar.map((item, key) => {
+        var reg = RegExp(item.link);
+        if (shixun.match(reg)) {
+          if (item.hidden === true) {
+            shixuntype = true
+          }
+        }
+        if (paths.match(reg)) {
+          if (item.hidden === true) {
+            pathstype = true
+          }
+        }
+        if (courses.match(reg)) {
+          if (item.hidden === true) {
+            coursestypes = true
+          }
+        }
+      })
+    }
+
+    let search_url = settings && settings.common && settings.common.search;
+    let notice_url = settings && settings.common && settings.common.notice;
+    return (
+      <div className="newHeaders" id="nHeader">
+        <div className="headerContent">
+          {isRender === true ?
+            <LoginDialog
+              {...this.props}
+              {...this.state}
+              Modifyloginvalue={() => this.Modifyloginvalue()}
+            /> : ""}
+
+          {AccountProfiletype === true ?
+            <AccountProfile
+              hideAccountProfile={() => this.hideAccountProfile()}
+              {...this.props}
+              {...this.state}
+            /> : ""}
+          {
+            goshowqqgtounp === true ?
+            <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
+            :""
+          }
+          <a href={settings && settings.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
+            {
+              settings && settings.nav_logo_url ?
+              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
+              :
+              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
+            }
+          </a>
+          <div className="head-nav pr" id={"head-navpre1"}>
+            {
+              settings && settings.navbar && settings.navbar.length > 0 ?
+              <ul id="header-nav">
+                {
+                  settings.navbar && settings.navbar.map((item, key) => {
+                    var new_link = item.link;
+                    var user_login = this.props.user && this.props.user.login;
+                    var is_hidden = item.hidden
+                    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")
+                        } else if (new_link.indexOf("contests") > -1) {
+                          new_link = new_link.replace(/contests/g, "users/" + 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")
+                    }
+                    
+                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
+                    var wl = waiLian && waiLian.length>0;
+                    return (
+                      <li key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+                        <a href={new_link} target={wl ? "_self":"_blank"}>{item.name}</a>
+                      </li>
+                    )
+                  })
+                }
+              </ul>
+            : ""
+            }
+          </div>
+          <div className="head-right">
+            {search_url ? this.SearchInput(openSearch,search_url):""}
+            {
+              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">
+                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+              </Dropdown>:""
+            }
+            
+            {this.props.user && this.props.user.login && notice_url ?
+              <div className="ml30 edu-menu-panel">
+                {user && user.login &&
+                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
+                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
+                    <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
+                    </span>
+                  </a>
+                }
+              </div>:""
+            }
+            <Modal
+              keyboard={false}
+              title="提示"
+              visible={submitapplications}
+              closable={false}
+              footer={null}
+            >
+              <div className="task_popup_con ml30">
+                <div className="mr15">
+                  <ul>
+                    <div className="task-popup-content">
+                      <p className="task-popup-text-center font-16">
+                        {submitapplicationsvalue}
+                      </p>
+                    </div>
+                    <li className="clearfix mt10 edu-txt-center">
+                      <a className="task-btn mr10"
+                        onClick={this.hidesubmitapplications}>取消</a>
+                      <a
+                        className="task-btn task-btn-orange ml20"
+                        onClick={this.submitsubmitapplications}>确定</a>
+                    </li>
+                  </ul>
+                </div>
+              </div>
+            </Modal>
+          </div>
+          {!user || (user && !user.login)  ?
+            <span className="font-15 ml30">
+              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              {
+                settings && settings.common && settings.common.register &&
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
+              }
+            </span>
+            :
+            <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
+              <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
+                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
+                </img>
+              </a>
+              <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
+                <li className="bor-bottom-greyE" style={{cursor:"default",background:"#fff"}}>{this.props.current_user.username}</li>
+                {
+                  settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{
+                    return(
+                      <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
+                    )
+                  })
+                }
+                <li className="bor-top-greyE">
+                  <a onClick={() => this.educoderloginysl()}>退出</a>
+                </li>
+              </ul>
+            </div>
+          }
+        </div>
+      </div>
+    );
+  }
+}
+
+export default NewHeader;
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -0,0 +1,62 @@
+
+.dropdownFlex{
+  display:flex;
+  padding:5px;
+  background:#fff;
+  border-radius: 3px;
+  .ant-menu-vertical > .ant-menu-item{
+    border:none
+  }
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  p {
+    margin-top: 0;
+    margin-bottom:0px !important;
+  }
+  .footerInfos{
+    display: flex;
+    max-width: 1200px;
+    margin:0px auto;
+    justify-content: space-around;
+    padding:60px 0px;
+    & >ul{
+      padding:0px 40px;
+      box-sizing: border-box;
+      max-width: 25%;
+      text-align: left;
+      li{
+        color: #fff;
+        font-weight: 300;
+        &:first-child{
+          font-size: 17px;
+        }
+        &>a,&>span{
+          color: #bbb;
+        }
+        &>a:hover{
+          color: #4cacff;
+        }
+      }
+    }
+  }
+  .footerCopy{
+    color: #bbb;
+    border-top: 1px solid #4e4e4e;
+    padding:10px 0px;
+    a{
+      color: #bbb;
+      &:hover{
+        color: #4cacff;
+      }
+    }
+  }
+}
--- a/src/forge/Images/banner_list.jpg
+++ b/src/forge/Images/banner_list.jpg
--- a/src/forge/Images/banner_list.png
+++ b/src/forge/Images/banner_list.png
--- a/src/forge/Images/banner_list_1.png
+++ b/src/forge/Images/banner_list_1.png
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -47,6 +47,12 @@ class Index extends Component {
              <ProjectNew {...this.props} {...props} />
            )}
          ></Route>
+          <Route
+            path="/projects/new"
+            render={(props) => (
+              <ProjectNew {...this.props} {...props} />
+            )}
+          ></Route>
          <Route
            path="/projects/:owner/:projectsId"
            render={(props) => (
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -0,0 +1,449 @@
+import React , { useEffect , useState } from 'react';
+import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ  } from '../Component/layout';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
+import { getImageUrl } from "educoder";
+import { Link } from 'react-router-dom';
+import CloneAddress from '../Branch/CloneAddress';
+
+import SelectBranch from '../Branch/Select';
+import User from '../Component/User';
+import axios from 'axios';
+import Path from './CoderDepotPath';
+import Catalogue from './CoderDepotCatalogue';
+import ReadMe from './CoderDepotReadme';
+import CoderRootFileDetail from './CoderRootFileDetail';
+import './Index.scss';
+import Releases from '../Component/Releases';
+import Contributors from '../Component/Contributors';
+import LanguagePower from '../Component/LanguagePower';
+import DrawerPanel from '../Component/DrawerPanel';
+import UpdateDescModal from './sub/UpdateDescModal';
+import Nodata from '../Nodata';
+
+/**
+ * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
+ */
+function CoderDepot(props){
+  const [ projectDetail , setProjectDetail ]= useState(undefined);
+  const [ treeValue , setTreeValue ] = useState(undefined);
+  const [ treeValuePath , setTreeValuePath ] = useState(undefined);
+  const [ lastCommit,setLastCommit ] = useState(undefined);
+  const [ lastCommitAuthor,setLastCommitAuthor ] = useState(undefined);
+  const [ type ,setType ] = useState('dir');
+  const [ hide , setHide ] = useState(true);
+  const [ hideBtn , setHideBtn ] = useState(false);
+  const [ commitCount ,setCommitCount ] = useState(0);
+  const [ dirInfo ,setDirInfo ] = useState(undefined);//文件夹目录列表
+  const [ fileInfo ,setFileInfo ] = useState(undefined);//文件内容信息
+  const [ zip_url , setZip_url ] = useState(undefined);
+  const [ tar_url , setTar_url ] = useState(undefined);
+  const [ readOnly , setReadOnly] = useState(true);
+  const [ isSpin , setIsSpin] = useState(true);
+  const [ visible ,setVisible ] = useState(false);
+  const [ mainFlag ,setMainFlag ] = useState(false);
+  const [ openModal , setOpenModal ] = useState(false);
+  const [ desc , setDesc ] = useState(undefined);
+  const [ website , setWebsite ] = useState(undefined);
+  const [ lesson_url , setLessonUrl ] = useState(undefined);
+
+  const owner = props.match.params.owner;
+  const projectsId = props.match.params.projectsId;
+  const branchName = props.match.params.branchName;
+  let pathname = props.history.location.pathname;
+  useEffect(()=>{
+    if(props.projectDetail){
+      setProjectDetail(props.projectDetail);
+      setDesc(props.projectDetail.description);
+      setWebsite(props.projectDetail.website);
+      setLessonUrl(props.projectDetail.lesson_url);
+    }
+  },[props])
+
+  useEffect(()=>{
+    if(treeValue){
+      setTreeValuePath(treeValue.split('/'));
+    }else{
+      setTreeValuePath(undefined);
+    }
+  },[treeValue])
+
+  useEffect(()=>{
+    if (pathname && projectDetail){
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
+        let url = pathname.split(`/tree/${branchName}/`)[1];
+        setTreeValue(url);
+        getFileInfo(url,branchName);
+      }else{
+        setTreeValue(undefined);
+        getDirInfo(branchName ||projectDetail.default_branch);
+      }
+    } 
+  },[pathname,projectDetail])
+
+  // 获取主目录列表
+  function getDirInfo(branch){
+    setIsSpin(true);
+    const url = `/${owner}/${projectsId}/entries.json`;
+    axios.get(url, { 
+      params: { ref: branch } 
+    }).then((result) => {
+      if (result) {
+        setCommitCount(result.data.commits_count);
+        setDirInfo(result.data.entries);
+        setFileInfo(undefined);
+        setTar_url(result.data.tar_url);
+        setZip_url(result.data.zip_url);
+        let c = result.data.last_commit
+        setLastCommit(c && c.commit);
+        setLastCommitAuthor(c && c.committer);
+        setMainFlag(true);
+        setReadOnly(true);
+      }
+      setTimeout(function(){setIsSpin(false);},500);
+    }).catch(error=>{setIsSpin(false);})
+  }
+
+  useEffect(()=>{
+    if(projectDetail && lastCommit)
+    {
+      let ele = document.getElementById("ptxt");
+      if(ele){
+        let h = ele.offsetHeight;
+        if( h > 18 ) setHideBtn(true)
+      }
+    }
+  },[projectDetail,lastCommit])
+  // 获取子目录列表
+  function getFileInfo(path, ref){
+    setIsSpin(true);
+    const url = `/${owner}/${projectsId}/sub_entries.json`;
+    axios.get(url, { 
+      params:{
+        filepath:path,
+        ref:ref || branchName,
+        type
+      }
+    }).then((result) => {
+      if (result) {
+        let en = result.data.entries;
+        if(en.type){
+          setDirInfo(undefined);
+          setFileInfo(en);
+          setType(en.type);
+        }else{
+          setFileInfo(undefined);
+          setDirInfo(en);
+          setType("dir");
+        }
+        let c = result.data.last_commit
+        setLastCommit(c && c.commit);
+        setLastCommitAuthor(c && c.committer);
+        setMainFlag(false);
+        setReadOnly(true);
+      }
+      setTimeout(function(){setIsSpin(false);},500)
+    }).catch(error=>{setIsSpin(false);})
+  }
+
+  // 切换分支或者标签
+  function changeBranch(value){
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
+    props.history.push(url);
+  }
+    
+  // 文件相关的下拉项
+  const fileMenu =(
+    <Menu>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+    </Menu>
+  )
+
+  function getPathUrl(array,index){
+    if(array && array.length>0 && index){
+      let str = "";
+      for(let i=0;i<index;i++){
+        str += `/${array[i]}`;
+      }
+      return str.substr(1);
+    }
+  }
+  // 页面地址返回到主目录
+  function returnMain(){
+    setTreeValue(undefined);
+    let branch = branchName || (projectDetail && projectDetail.default_branch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`);
+  };
+  // 子目录路径返回链接
+  function returnUlr(url){
+    props.history.push(`/projects/${owner}/${projectsId}/tree${branchName?`/${branchName}`:""}/${url}`);
+  }
+  // 点击跳转到子目录
+  function goToSubRoot(path,type,filename){
+    setType(type);
+    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || (projectDetail && projectDetail.default_branch)}`}${path?`/${path}`:""}`);
+  }
+
+  function onEdit(readOnly){
+    setReadOnly(readOnly);
+  }
+  function ChangeFile(path, readOnly){
+    //点击直接跳转页面 加载一次路由
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || (projectDetail && projectDetail.default_branch)}/${path}`);
+    setType("file");
+    setReadOnly(readOnly);
+  };
+
+  function changeHide(hide){
+    setHide(!hide);
+  }
+
+  function urlLink(link){
+    if(props.checkIfLogin()===false){
+      props.showLoginDialog()
+      return false;
+    }
+    props.history.push(link);
+  }
+
+  const downloadMenu = (
+    <div className="downMenu">
+      <div style={{padding:"20px",borderBottom:"1px solid #eee"}}>
+        <CloneAddress 
+          http_url={projectDetail && projectDetail.clone_url}
+          showNotification={props.showNotification}/>
+      </div>
+      <Menu className="edu-txt-center">
+        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
+        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
+      </Menu>
+    </div>
+  )
+  // 确认修改简介、website、实践课程链接
+  function okUpdate(d,w,l){
+    const url = `/${owner}/${projectsId}.json`;
+    axios.put(url,{
+      description:d,website:w,lesson_url:l
+    }).then(result=>{
+      if(result && result.data && result.data.id){
+        setDesc(result.data.description);
+        setWebsite(result.data.website);
+        setLessonUrl(result.data.lesson_url);
+      }
+    })
+  }
+
+  let n = fileInfo && fileInfo.name;
+  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
+  
+  return(
+    <WhiteBack>
+      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
+      <Spin spinning={isSpin}>
+        {
+          (dirInfo || fileInfo) && 
+          <React.Fragment>
+            <DrawerPanel 
+              history={props.history} 
+              owner={owner} 
+              projectsId={projectsId} 
+              name={projectDetail && projectDetail.name}
+              branch={branchName || (projectDetail && projectDetail.default_branch)} 
+              visible={visible} 
+              onClose={()=>setVisible(false)}
+              list = {mainFlag ? dirInfo : undefined}
+            />
+            <div className="drawerBtn" onClick={()=>setVisible(true)}>
+              <i className="iconfont icon-youjiantou font-16"></i>
+              <span>目录</span>
+            </div>
+          </React.Fragment>
+        }
+        <div style={{minHeight:"500px"}}>
+          { 
+            projectDetail &&
+            <Box className="Panels">
+              <LongWidth>
+                <div className="panelmenu">
+                  <FlexAJ>
+                    <AlignCenter>
+                      <div className="mr20">
+                        {
+                          props && props.platform ?
+                          <SelectBranch
+                            repo_id={projectDetail && projectDetail.repo_id}
+                            projectsId={projectsId}
+                            branch={branchName || (projectDetail && projectDetail.default_branch)}
+                            changeBranch={changeBranch}
+                            owner={owner}
+                            history={props.history}
+                            branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
+                          ></SelectBranch>
+                          :
+                          <span>分支：<span className="color-grey-6">{branchName || (projectDetail && projectDetail.default_branch)}</span></span>
+                        }
+                      </div>
+                      <AlignCenter className="mr20">
+                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="color-grey-9">
+                          <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
+                        </Link>
+                      </AlignCenter>
+                      <AlignCenter className="mr20">
+                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="color-grey-9">
+                          <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
+                          <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
+                        </Link>
+                      </AlignCenter>
+                    </AlignCenter>
+                    <AlignCenter>
+                      <div className="mr20 addOptionBtn">
+                        {
+                          projectDetail.type !== 2 && 
+                          <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        }
+                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                      </div>
+                      { type === "dir" && projectDetail.type !== 2 &&
+                        <Dropdown overlay={fileMenu} className="mr20">
+                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
+                        </Dropdown>
+                      }
+                      
+                      <Dropdown overlay={downloadMenu} placement="bottomRight">
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
+                      </Dropdown>
+                    </AlignCenter>
+                  </FlexAJ>
+                  {
+                    dirInfo || fileInfo ?
+                    <div className="listtable">
+                      {
+                        lastCommit &&
+                        <div className="listtablehead">
+                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
+                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
+                          { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
+
+                          <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
+                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits`} className="ml12 color-grey-9"><i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交</Link>:"" }
+                        </div>
+                      }
+                      <ul className="listtablebody">
+                        {
+                          treeValuePath && treeValuePath.length > 0 &&
+                          <Path 
+                            identifier={projectDetail && projectDetail.identifier} 
+                            treeValuePath={treeValuePath}
+                            returnUlr={returnUlr}
+                            returnMain={returnMain}
+                            getPathUrl={getPathUrl}
+                          />
+                        }
+                        {
+                          dirInfo && dirInfo.length > 0 &&
+                          dirInfo.map((item,key)=>{
+                            return(
+                              <Catalogue 
+                                owner={owner} 
+                                item={item} 
+                                projectsId={projectsId} 
+                                goToSubRoot={goToSubRoot} 
+                              />
+                            )
+                          })
+                        }
+                        {
+                          fileInfo &&
+                          <CoderRootFileDetail
+                            {...props}
+                            detail={fileInfo}
+                            readOnly={readOnly}
+                            md={mdFlag}
+                            onEdit={onEdit}
+                            currentBranch={branchName || (projectDetail && projectDetail.default_branch)}
+                            type={projectDetail.type}
+                          ></CoderRootFileDetail>
+                        }
+                      </ul>
+                    </div>
+                    : ""
+                  }
+                  {
+                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                  } 
+                  {/* readme文件显示(显示文件详情时不显示readme文件) */}
+                  { dirInfo && (projectDetail && projectDetail.readme) ? <ReadMe ChangeFile={ChangeFile} readme={projectDetail && projectDetail.readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
+                </div>
+              </LongWidth>
+              {
+                !fileInfo && 
+                <ShortWidth>
+                  <Gap style={{paddingLeft:"30px"}}>
+                    <div className="panelmenu">
+                      <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
+                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>}
+                      </FlexAJ>
+                      {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 &&
+                        <p className="color-grey-6 df">
+                          <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>
+                        </p>
+                      }
+                      <p>
+                        <i className="iconfont icon-wenjian4 font-15 mr10 color-grey-9"></i>
+                        <a href="#readme" className="color-grey-6">README.md</a>
+                      </p>
+                      <p className="color-grey-6">
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-9"></i>
+                        <span>{projectDetail && projectDetail.size}</span>
+                      </p>
+                      {
+                        projectDetail && projectDetail.license_name &&
+                        <p className="color-grey-6">
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-9"></i>
+                          <span>{projectDetail.license_name}</span>
+                        </p>
+                      }
+                    </div>
+                    {
+                      lesson_url &&
+                      <div>
+                        <Divider />
+                        <p className="font-16 color-grey-6">实践课程</p>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline"}}>{lesson_url}</a>
+                      </div>
+                    }
+                    {/* 发布 */}
+                    {
+                      projectDetail && projectDetail.release_versions &&
+                      <React.Fragment>
+                        <Divider />
+                        <Releases owner={owner} projectsId={projectsId} releaseVersions={projectDetail.release_versions} history={props.history}/>
+                      </React.Fragment>
+                    }
+                    {/* 贡献者 */}
+                    {
+                      projectDetail && projectDetail.contributors &&
+                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
+                    }
+                    {/* 语言 */}
+                    { projectDetail && projectDetail.languages && 
+                      <React.Fragment>
+                        <Divider />
+                        <LanguagePower languages={projectDetail.languages}/>
+                      </React.Fragment>
+                    }
+                  </Gap>
+                </ShortWidth>
+              }
+            </Box>
+          }
+        </div>
+      </Spin>
+    </WhiteBack>
+  )
+}
+export default CoderDepot;
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@ -0,0 +1,22 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { truncateCommitId } from '../common/util';
+
+function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
+  return(
+    <li>
+      <span>
+        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)}>
+          <i className={item.type === 'dir' ? "iconfont icon-wenjianjia1 color-green-file font-15 mr5":"iconfont icon-wenjia color-green-file font-15 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}>
+          {item.commit && item.commit.message}
+        </Link>
+      </span>
+      <span>{item.commit && item.commit.time_from_now}</span>
+    </li>
+  )
+}
+export default CoderDepotCatalogue;
--- a/src/forge/Main/CoderDepotPath.jsx
+++ b/src/forge/Main/CoderDepotPath.jsx
@ -0,0 +1,30 @@
+import React from 'react';
+
+
+function CoderDepotPath({treeValuePath , returnUlr , returnMain , getPathUrl , identifier}){
+  return(
+    <li className="listtablepath">
+      <p>
+        <a
+          onClick={returnMain}
+          className="color-blue"
+        >
+          {identifier}
+        </a>
+        {treeValuePath.map((item, key) => {
+          return (
+            <React.Fragment>
+              {
+                key === treeValuePath.length-1 ?
+                  <span className="color-grey-6 subFileName" key={key}>{item}</span>
+                  :
+                  <a onClick={()=>returnUlr(`${getPathUrl(treeValuePath,key+1)}`)} className="color-blue subFileName">{item}</a>
+              }
+            </React.Fragment>
+          );
+        })}
+      </p>
+    </li>
+  )
+}
+export default CoderDepotPath;
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@ -0,0 +1,62 @@
+import React, { useEffect, useState } from 'react';
+import RenderHtml from '../../components/render-html';
+import { Dropdown , Menu , Spin } from 'antd';
+import { Link } from 'react-router-dom';
+const $ = window.$;
+
+function CoderDepotReadme({ operate , history , readme , ChangeFile }){
+  const [ menuList ,setMenuList ] = useState(undefined);
+
+  useEffect(()=>{
+    if(readme && readme.content){
+      let path = history.location.pathname;
+      const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
+        const anchor = el.id;
+        const level = el.tagName.replace("H", "");
+        const href = `#${anchor}`;
+        return { href:`${path}${href}`,text:el.textContent , level:level }
+      });
+      setMenuList(items);
+    }
+  },[readme])
+
+  function menu(){
+    if(menuList && menuList.length > 0){
+      let hash = history.location.hash;
+      return(
+        <Menu className="menuslist">
+          {
+            menuList.map((item,key)=>{
+              return(
+                <Menu.Item key={item.id} className={decodeURI(hash).indexOf(item.text)>-1 ?"active":""}><Link to={`${item.href}`} style={{paddingLeft:`${item.level *10}px`}} title={item.text}>{item.text}</Link></Menu.Item>
+              )
+            })
+          }
+        </Menu>
+      )
+    }else{
+      return <Spin />
+    }
+  }
+  return(
+    <div className="commonBox" id="readme">
+      <div className="commonBox-title">
+        <Dropdown overlay={menu()}>
+          <i className="iconfont icon-zhangjie1 font-16 color-grey-3 mr10"></i>
+        </Dropdown>
+        <span className="commonBox-title-read">README.md</span>
+        {
+          operate ?
+            <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
+              <i className="iconfont icon-bianji6 font-16 color-blue"></i>
+            </a>
+          :""
+        }
+      </div>
+      <div className="commonBox-info">
+        <RenderHtml className="break_word_comments imageLayerParent" value={readme && readme.content} url={history.location}/>
+      </div>
+    </div>
+  )
+}
+export default CoderDepotReadme;
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -32,7 +32,7 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/projects/${owner}/${projectsId}/branch/${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${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>
                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
          array.push({
            name:item.author && item.author.name,
            login: item.author && item.author.login,
+            id: item.author && item.author.id,
            image_url:item.author && item.author.image_url,
            sha:item.sha,
            time_from_now:item.time_from_now,
@ -107,7 +108,7 @@ class CoderRootCommit extends Component{
    let branch = branchName || defaultBranch;
    return(
      <React.Fragment>
-        <div className={commit_class}>
+        <div className={"main"}>
          <div className="f-wrap-between">
            <SelectBranch 
              repo_id={projectDetail && projectDetail.repo_id} 
@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
                        </p>
                        <p className="f-wrap-alignCenter mt15">
-                          <Link to={`/users/${item.login}`} className="show-user-link">
-                            {item.image_url?<img src={getImageUrl(`images/${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>
+                          {
+                            item.id ?
+                            <Link to={`/users/${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>:
+                            <span 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>
+                            </span>
+                          }
+                          
                        </p> 
                      </div>
                    )
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@ -1,517 +0,0 @@
-import React, { Component } from "react";
-import { Menu, Spin } from "antd";
-import { getImageUrl } from "educoder";
-import { Link } from "react-router-dom";
-
-import './list.css';
-import SelectBranch from '../Branch/Select';
-import CloneAddress from '../Branch/CloneAddress';
-import RootTable from './RootTable';
-import CoderRootFileDetail from './CoderRootFileDetail';
-import { truncateCommitId } from '../common/util';
-import RenderHtml from '../../components/render-html';
-import Nodata from '../Nodata';
-import { getBranch } from '../GetData/getData';
-
-import axios from "axios";
-/**
- * address:http和SSH，http_url(对应git地址)
- * filePath:点击目录时当前目录的路径
- * subfileType:保存当前点击目录的文件类型（显示目录列表时才显示新建文件，如果点击的是文件就不显示新建文件按钮）
- * readMeContent:根目录下面的readme文件内容
- */
-function getPathUrl(array,index){
-  if(array && array.length>0 && index){
-    let str = "";
-    for(let i=0;i<index;i++){
-      str += `/${array[i]}`;
-    }
-    return str.substr(1);
-  }
-}
-class CoderRootDirectory extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      address: "http",
-      filePath: undefined,
-      subFileType: undefined,
-      readMeContent: undefined,
-      readMeFile: undefined,
-
-      isSpin: true,
-
-      branchList: undefined,
-      fileDetail: undefined,
-      branchLastCommit: undefined,
-      lastCommitAuthor: undefined,
-
-      rootList: undefined,
-      readOnly: true,
-      zip_url:undefined,
-      tar_url:undefined,
-      chooseType:undefined,
-
-      md:false,
-      treeValue:undefined
-    }
-  }
-  changeAddress = (address) => {
-    this.setState({
-      address,
-    });
-  };
-
-  componentDidMount = () => {
-    this.Init();
-    this.getBranchs();
-  };
-  // 获取分支列表
-  getBranchs=()=>{
-    const { projectsId , owner } = this.props.match.params;
-    axios.get(`/${owner}/${projectsId}/branches.json`).then(result=>{
-      this.setState({
-        branchList:result.data
-      })
-    }).catch((error)=>{})
-  }
-
-  componentDidUpdate = (prevState) => {
-    const { location } = this.props;
-    const prevlocation = prevState && prevState.location;
-    if (location !== prevlocation) {
-      this.setState({
-        isSpin: true,
-      });
-      this.Init();
-    }
-  };
-
-  Init = () => {
-    let { pathname } = this.props.history.location;
-    const { branchName , owner , projectsId } = this.props.match.params;
-    const { defaultBranch } = this.props;
-    let branch = branchName || defaultBranch;
-    if (pathname && (pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1)) {
-      let url = pathname.split(`/tree/${branchName}/`)[1];
-      this.setState({treeValue:url})
-      this.getFileDetail(decodeURI(url),branch);
-    } else {
-      this.getProjectRoot(branch);
-    }
-  };
-
-  // 页面地址返回到主目录
-  returnMain = (branch) => {
-    const { projectsId , owner , branchName } = this.props.match.params;
-    this.setState({
-      readOnly:true,
-      treeValue:undefined
-    })
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/tree/${branchName}`:""}`);
-    this.getProjectRoot(branch);
-  };
-
-  // 获取根目录
-  getProjectRoot = (branch) => {
-    const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}/entries.json`;
-    axios.get(url, { params: { ref: branch } })
-    .then((result) => {
-      if (result) {
-        let last_commit = result.data && result.data.last_commit;
-        let entries = result.data && result.data.entries;
-        this.setState({
-          filePath: undefined,
-          fileDetail: [],
-          isSpin: false,
-          branchLastCommit: last_commit && last_commit.commit,
-          lastCommitAuthor:
-            last_commit && (last_commit.author || (last_commit.commit && last_commit.commit.author)),
-          zip_url: result.data.zip_url,
-          tar_url: result.data.tar_url
-        });
-        if (entries && entries.length > 0) {
-          this.renderData(entries);
-        }
-        this.setState({
-          rootList: entries,
-          subFileType: true,
-        });
-      }
-    }).catch((error) => {});
-  };
-
-  ChangeFile = (arr, readOnly) => {
-    const { projectsId , owner } = this.props.match.params;
-    //点击直接跳转页面 加载一次路由
-    this.props.history.push(`/projects/${owner}/${projectsId}/tree/${arr.path}`);
-    this.setState({
-      readOnly: readOnly,
-      chooseType:"file"
-    });
-  };
-
-  // 获取子目录
-  getFileDetail = (path, ref) => {
-    this.setState({
-      filePath: decodeURI(path),
-    });
-    const { projectsId , owner , branchName } = this.props.match.params;
-    const { chooseType } = this.state;
-    const url = `/${owner}/${projectsId}/sub_entries.json`;
-    axios.get(url,{
-      params:{
-        filepath:path,
-        ref:ref || branchName,
-        type:chooseType
-      }
-    }).then((result)=>{
-      let entries = result.data && result.data.entries;
-      this.setState({
-        isSpin:false
-      })
-      if(result){
-        if(entries){
-          // 返回对象entries.type则是文件类型，否则是文件夹
-          if(entries.type){
-            this.setState({
-              fileDetail:[entries],
-              rootList:[],
-              subFileType:false
-            })
-          }else{
-            this.setState({
-              fileDetail:[],
-              rootList:entries,
-              branchLastCommit:result.data.last_commit && result.data.last_commit.commit,
-              lastCommitAuthor:result.data.last_commit && (result.data.last_commit.author || (result.data.last_commit.commit && result.data.last_commit.commit.author))
-            })
-            this.renderData(entries);
-          }
-        }else{
-          this.setState({
-            fileDetail:[],
-            rootList:[],
-            isSpin:false,
-            subFileType:false
-          })
-        }
-      }
-    })
-    .catch((error) => {
-      this.setState({
-        isSpin:false
-      })
-      console.log(error);
-    });
-  };
-
-  renderData = (data) => {
-    const rootList = [];
-    const readMeContent = [];
-    const readMeFile = [];
-    data && data.map((item, key) => {
-      rootList.push({
-        key,
-        message: item.commit && item.commit.message,
-        ...item,
-      });
-      if (item.is_readme_file) {
-        readMeContent.push({ ...item });
-        readMeFile.push({ ...item });
-      }
-    });
-    this.setState({
-      rootList: rootList,
-      readMeContent,
-      readMeFile,
-    });
-  };
-
-  // 点击跳转到子目录
-  goToSubRoot=(path,type,filename)=>{
-    this.setState({
-      chooseType:type
-    })
-    const { projectsId, owner , branchName } = this.props.match.params;
-    const { defaultBranch } = this.props;
-    this.props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
-    if(filename.substring(filename.length - 3) === ".md"){
-      this.setState({
-        md:true
-      })
-    }else{
-      this.setState({
-        md:false
-      })
-    }
-  };
-
-  // readme文件内容
-  renderReadMeContent = (readMeContent, permission) => {
-    const { fileDetail, readMeFile } = this.state;
-    if (fileDetail && fileDetail.length !== 0) {
-      return;
-    }
-    if (readMeContent && readMeContent.length > 0) {
-      return (
-        <div className="commonBox">
-          <div className="commonBox-title">
-            <span className="mr10">
-              <i className="iconfont icon-wenjian1 font-16 color-grey-9 fl mt3"></i>
-            </span>
-            <span className="commonBox-title-read">
-              {readMeContent[0].name}
-            </span>
-            {permission ?
-              <a
-                onClick={() => this.ChangeFile(readMeFile[0], false)}
-                className="ml20 pull-right"
-              >
-                <i className="iconfont icon-bianji6 font-16 color-blue"></i>
-              </a>
-            :
-              ""
-            }
-          </div>
-          <div className="commonBox-info">
-            {readMeContent[0].content ?
-              <RenderHtml className="break_word_comments imageLayerParent" value={readMeContent[0].content} url={this.props.history.location}/>
-            :
-              <span>暂无~</span>
-            }
-          </div>
-        </div>
-      );
-    }
-  };
-
-  // 选择分支
-  changeBranch = (value) => {
-    const { projectsId , owner } = this.props.match.params;
-    const { treeValue } = this.state;
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
-    this.props.history.push(url);
-  }
-
-  // 子目录路径返回链接
-  returnUlr=(url)=>{
-    this.setState({
-      chooseType:"dir",
-      readOnly:true,
-      treeValue:url
-    })
-    const { projectsId , owner , branchName } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}/tree/${url}`);
-  }
-
-  onEdit=(readOnly)=>{
-    this.setState({
-      readOnly
-    })
-  }
-
-  downloadUrl = (zip_url,tar_url) => {
-    return(
-      <Menu>
-        {zip_url && (
-          <Menu.Item>
-            <a href={zip_url}>ZIP</a>
-          </Menu.Item>
-        )}
-        {tar_url && (
-          <Menu.Item>
-            <a href={tar_url}>TAR.GZ</a>
-          </Menu.Item>
-        )}
-      </Menu>
-    )
-  }
-
-  title = (branchLastCommit,lastCommitAuthor) => {
-    if (branchLastCommit) {
-      const { projectsId , owner } = this.props.match.params;
-      return (
-        <div className="f-wrap-alignCenter">
-          {lastCommitAuthor ? (
-            <React.Fragment>
-              {lastCommitAuthor.login ? (
-                <Link
-                  to={`/users/${lastCommitAuthor.login}/projects`}
-                  className="show-user-link"
-                >
-                  <img
-                    src={getImageUrl(`images/${lastCommitAuthor.image_url}`)}
-                    className="radius mr10"
-                    width="32"
-                    height="32"
-                    alt=""
-                  />
-                  <span className="mr15">{lastCommitAuthor.name}</span>
-                </Link>
-              ) : (
-                <span className="mr15">{lastCommitAuthor.name}</span>
-              )}
-            </React.Fragment>
-          ) : (
-            ""
-          )}
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="color-blue flex-1 hide-1">
-            {branchLastCommit.message}
-          </Link>
-          <span>{branchLastCommit.time_from_now}</span>
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${branchLastCommit.sha}`)}`} className="commitKey">
-            {truncateCommitId(branchLastCommit.sha)}
-          </Link>
-        </div>
-      );
-    }else{
-      return false;
-    }
-  }
-
-  
-  render(){
-    const { branchLastCommit , lastCommitAuthor , rootList ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url , branchList} = this.state;
-    const { isManager , isDeveloper , projectDetail , platform , defaultBranch } = this.props;
-
-    const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = branchName || defaultBranch;
-    
-    const columns = [
-      {
-        key:"name",
-        dataIndex: 'name',
-        width:"30%",
-        render: (text,item) => (
-          <a onClick={()=>this.goToSubRoot(item.path,item.type,text)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}>
-            <i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5" : "iconfont icon-wenjianjia1 color-green-file font-15 mr5"}></i>{text}
-          </a>
-        ),
-      },
-      {
-        key:"message",
-        dataIndex: "message",
-        width: "60%",
-        render: (text, item) =>
-          item.commit && item.commit.message ? 
-            <Link  to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit.sha}`)}`} title={item.commit.message} className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
-              {item.commit.message}
-            </Link>
-          : ""
-      },
-      {
-        key:"time_from_now",
-        dataIndex: "time_from_now",
-        width: "10%",
-        className: "edu-txt-right",
-        render: (text, item) =>
-          item.commit && item.commit.time_from_now ? 
-            <a title={item.commit.created_at} className="mr12" style={{ cursor: "default", color: "#888" }} >
-              {item.commit.time_from_now}
-            </a>
-          :""
-      },
-    ];
-    const urlRoot = filePath === undefined ? "" : `/${filePath}`;
-    let array = filePath && filePath.split("/");
-    return (
-      <Spin spinning={isSpin}>
-        <div className="main" style={{minHeight:'400px'}}>
-          <div className="f-wrap-between mb20">
-            <div className="f-wrap-alignCenter">
-              {
-                platform ?
-                <SelectBranch
-                  repo_id={projectDetail && projectDetail.repo_id}
-                  projectsId={projectsId}
-                  branch={branch}
-                  changeBranch={this.changeBranch}
-                  owner={owner}
-                  history={this.props.history}
-                  branchList={branchList}
-                ></SelectBranch>
-                :
-                <span>分支：<span className="color-grey-6">master</span></span>
-              }
-
-              {filePath && (
-                <span className="ml20 font-16">
-                  <a
-                    onClick={() => this.returnMain(branch)}
-                    className="color-blue"
-                  >
-                    {projectDetail && projectDetail.identifier}
-                  </a>
-                  {array &&
-                    array.map((item, key) => {
-                      return (
-                        <React.Fragment>
-                          {
-                            key === array.length-1 ?
-                              <span className="color-grey-6 subFileName" key={key}>{item}</span>
-                              :
-                              <a onClick={()=>this.returnUlr(`${getPathUrl(array,key+1)}`)} className="color-blue subFileName">{item}</a>
-                          }
-                        </React.Fragment>
-                      );
-                    })}
-                </span>
-              )}
-            </div>
-            <div className="f-wrap-alignCenter">
-              {subFileType && (projectDetail && parseInt(projectDetail.type)) !== 2 && (isManager || isDeveloper) && platform && (
-                <div>
-                  <span>
-                    <Link to={`/projects/${owner}/${projectsId}/${branch}/uploadfile${urlRoot}`} >
-                      <span className="color-green mr30">上传文件</span>
-                    </Link>
-                  </span>
-                  <span className="mr30">
-                    <Link
-                      to={`/projects/${owner}/${projectsId}/${branch}/newfile${urlRoot}`}
-                    >
-                      <span className="color-blue">新建文件</span>
-                    </Link>
-                  </span>
-                </div>
-              )}
-              {projectDetail && projectDetail.clone_url && (
-                <CloneAddress
-                  http_url={projectDetail.clone_url}
-                  downloadUrl={this.downloadUrl(zip_url,tar_url)}
-                  showNotification={this.props.showNotification}
-                ></CloneAddress>
-              )}
-            </div>
-          </div>
-          {/* 主目录列表 */}
-          {rootList && rootList.length > 0 && (
-            <RootTable
-              columns={columns}
-              data={rootList}
-              title={() => this.title(branchLastCommit,lastCommitAuthor)}
-            ></RootTable>
-          )}
-          {/* 子目录列表、文件 */}
-          {fileDetail && fileDetail.length > 0 && (
-            <CoderRootFileDetail
-              detail={fileDetail[0]}
-              {...this.props}
-              {...this.state}
-              readOnly={this.state.readOnly}
-              onEdit={this.onEdit}
-              currentBranch={branch}
-            ></CoderRootFileDetail>
-          )}
-          {
-            (rootList && rootList.length === 0) && (fileDetail && fileDetail.length === 0) && <Nodata _html="暂未发现文件！"/>
-          }
-          { rootList && this.renderReadMeContent(readMeContent, isManager || isDeveloper)}
-      </div>
-    </Spin>
-    );
-  }
-}
-export default CoderRootDirectory;
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -24,13 +24,25 @@ class CoderRootFileDetail extends Component {
  }

  componentDidMount = () => {
-    const { detail } = this.props;
+    const { detail , mdFlag } = this.props;
    this.setState({
      value: detail.content,
    });
    this.languages_total();
  };

+  componentDidUpdate=(prevProps)=>{
+    const { content } = this.props && this.props.detail;
+    const prevcontent = prevProps.detail && prevProps.detail.content;
+    if (content && prevcontent) {
+      if (prevcontent !== content){
+        this.setState({
+          description: content
+        });
+      }
+    }
+  }
+
  languages_total = () => {
    const { detail } = this.props;
    const file_name = detail.path.split("/").pop().split(".").pop();
@ -164,15 +176,16 @@ class CoderRootFileDetail extends Component {
      current_user,
      isManager,
      isDeveloper,
-      md,
      currentBranch,
-      platform
+      platform,
+      md,
+      type
    } = this.props;
    const { language, languages, description } = this.state;
    let flag = current_user && current_user.login && (isManager || isDeveloper);
    const Option = Select.Option;
    return (
-      <div className="mb20">
+      <React.Fragment>
        <div className="grid-item branchTitle">
          <div className="grid-item">
            <span className="ml20 color-grey-6 font-16">
@ -185,17 +198,18 @@ class CoderRootFileDetail extends Component {
                {readOnly ? (
                  <span>
                    {
-                      detail.direct_download ?
-                        ""
-                        :
+                      !detail.direct_download?
                        <span>
                          <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
                            <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                          </a>
-                          <a onClick={() => this.EditFile(false)} className="ml20">
-                            <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
-                          </a>
-                        </span>
+                          {
+                            type !==2  &&
+                            <a onClick={() => this.EditFile(false)} className="ml20">
+                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                            </a>
+                          }
+                        </span>:""
                    }
                  </span>
                ) : (
@ -226,18 +240,21 @@ class CoderRootFileDetail extends Component {
                      </button>
                    </React.Fragment>
                  )}
-
-                <Popconfirm
-                  title="确认删除这个文件？"
-                  className="ml20"
-                  okText="确定"
-                  cancelText="取消"
-                  onConfirm={this.deleteFile}
-                >
-                  <a>
-                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                  </a>
-                </Popconfirm>
+                {
+                  type !==2 &&
+                  <Popconfirm
+                    title="确认删除这个文件？"
+                    className="ml20"
+                    okText="确定"
+                    cancelText="取消"
+                    onConfirm={this.deleteFile}
+                  >
+                    <a>
+                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                    </a>
+                  </Popconfirm>
+                }
+                
              </div>
            )}
          </p>
@ -245,11 +262,7 @@ class CoderRootFileDetail extends Component {
        <div>
          {detail.image_type ? (
            <div className="edu-txt-center pt20 pb20">
-              <img
-                alt=""
-                src={detail.download_url}
-                style={{ maxWidth: "80%" }}
-              />
+              <img alt="" src={detail.download_url} style={{ maxWidth: "80%" }} />
            </div>
          ) : detail.direct_download ? (
            <div className="mt20 text-center">
@ -268,14 +281,14 @@ class CoderRootFileDetail extends Component {
                {...this.state}
                language={language ? language : "javascript"}
                filepath={`/${detail.path}`}
-                content={detail.content}
+                content={description}
                readOnly={readOnly}
                editorType="update"
                currentBranch={currentBranch}
              ></Meditor>
            )}
        </div>
-      </div>
+      </React.Fragment>
    );
  }
 }
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -13,10 +13,6 @@ const UploadFile = Loadable({
  loader: () => import('../Newfile/upload_file'),
  loading: Loading,
 })
-const CoderRootDirectory = Loadable({
-	loader: () => import('./CoderRootDirectory'),
-	loading: Loading,
-})
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
 	loading: Loading,
@ -71,6 +67,7 @@ class CoderRootIndex extends Component{
    this.getTopCount(branchName || defaultBranch);
  }

+  // 获取<Top />组件里要显示的数据
  getTopCount=(branch)=>{
    const { projectsId , owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/top_counts.json`;
@ -105,13 +102,6 @@ class CoderRootIndex extends Component{
              (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
            }
          ></Route>
-
-          {/* diff */}
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
-            render={
-              (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
-            }
-          ></Route>
          <Route path="/projects/:owner/:projectsId/commits/:sha"
            render={
              (props) => (<Diff {...this.props} {...props} {...this.state}/>)
@ -122,7 +112,6 @@ class CoderRootIndex extends Component{
              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
            }
          ></Route>
-
          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
            render={
              (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
@ -133,33 +122,21 @@ class CoderRootIndex extends Component{
              () => (<CoderRootVersionNew {...this.props} {...this.state} />)
            }
          ></Route>
-
          <Route path="/projects/:owner/:projectsId/releases"
            render={
              () => (<CoderRootVersion {...this.props} {...this.state} />)
            }
          ></Route>
-
          <Route path="/projects/:owner/:projectsId/tag"
            render={
              () => (<CoderRootTag {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/tree/:branchName"
-            render={
-              (props) => (<CoderRootDirectory {...this.props} {...this.state} getTopCount={this.getTopCount} />)
-            }
-          ></Route>
          <Route path="/projects/:owner/:projectsId/branchs"
            render={
              () => (<CoderRootBranch {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId"
-            render={
-              () => (<CoderRootDirectory {...this.props} {...this.state} getTopCount={this.getTopCount} />)
-            }
-          ></Route>
        </Switch>
      </div>
    )
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -2,9 +2,9 @@ import React, { Component } from 'react';
 import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
 import { Content } from '../Component/layout';
+import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
-import SpecialModal from './SpecialModal';

 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
@ -97,21 +97,33 @@ const ForkUsers = Loadable({
  loader: () => import('../UsersList/fork_users'),
  loading: Loading,
 })
+const Contribute = Loadable({
+  loader: () => import('./sub/Contribute'),
+  loading: Loading,
+})

+const CoderRootCommit = Loadable({
+	loader: () => import('./CoderRootCommit'),
+	loading: Loading,
+})
+const CoderDepot = Loadable({
+	loader: () => import('./CoderDepot'),
+	loading: Loading,
+})

 const TrendsIndex = Loadable({
  loader: () => import('../Activity/Activity'),
  loading: Loading,
 })

-const Source = Loadable({
-  loader: () => import('../Source/Index'),
-  loading: Loading,
-})
 const DevAbout = Loadable({
  loader: () => import('../About/Index'),
  loading: Loading,
 })
+const Source = Loadable({
+  loader: () => import('../Source/Index'),
+  loading: Loading,
+})
 const DevIndex = Loadable({
  loader: () => import('../DevOps/Index'),
  loading: Loading,
@ -158,7 +170,6 @@ class Detail extends Component {
      watched: false,
      praised: false,
      http_url: undefined,
-      author: undefined,
      branchs: undefined,
      branchList: undefined,
      project: null,
@ -169,9 +180,7 @@ class Detail extends Component {
      defaultBranch:undefined,

      // 非本平台项目
-      platform:false,
-      visible:false,
-      user_apply_signatures:[]
+      platform:false
    }
  }

@ -188,7 +197,6 @@ class Detail extends Component {
  }

  getProject = (num) => {
-    const {user} = this.props;
    const { projectsId , owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/simple.json`;
    axios.get(url).then((result) => {
@ -198,24 +206,6 @@ class Detail extends Component {
          open_devops:result.data.open_devops,
          platform:result.data.platform && result.data.platform !== 'educoder'
        })
-        let signa = result.data.user_apply_signatures && result.data.user_apply_signatures[0];
-        if(result.data.is_secret && !result.data.is_member && (!signa || (signa && signa.status !== "passed")) && user.login !== owner){
-          this.setState({
-            visible:true,
-            is_secret:result.data.is_secret,
-            user_apply_signatures:signa
-          })
-        }
-
-        // 工作流：两种状态进入的链接不同
-        const pathname = this.props.history.location.pathname;
-        if(pathname===`/projects/${owner}/${projectsId}/devops`){
-          if(result.data.open_devops && pathname === `/projects/${owner}/${projectsId}/devops`){
-            this.props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
-          }else if(result.data.open_devops===false && pathname !== `/projects/${owner}/${projectsId}/devops`){
-            this.props.history.push(`/projects/${owner}/${projectsId}/devops`);
-          }
-        }

        if (result.data.type !== 0 && result.data.mirror_status === 1) {
          console.log("--------start channel --------");
@ -274,7 +264,8 @@ class Detail extends Component {

  getDetail = () => {
    const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}.json`;
+    this.getBanner();
+    const url = `/${owner}/${projectsId}/detail.json`;
    axios.get(url).then((result) => {
      if (result && result.data) {
        this.setState({
@ -284,7 +275,6 @@ class Detail extends Component {
          isReporter: result.data.permission && result.data.permission === "Reporter",
          isDeveloper: result.data.permission && result.data.permission === "Developer",
          http_url: result.data.clone_url,
-          author: result.data.author,
          praised: result.data.praised,
          watched: result.data.watched,
          watchers_count: result.data.watchers_count,
@ -296,6 +286,19 @@ class Detail extends Component {
    }).catch((error) => { })
  }

+  // 获取动态导航栏菜单
+  getBanner(){
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/${owner}/${projectsId}/menu_list.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        this.setState({
+          bannerList:result.data
+        })
+      }
+    }).catch(error=>{})
+  }
+
  // 关注和取消关注
  focusFunc = (flag) => {
    const { platform } = this.state;
@ -386,24 +389,13 @@ class Detail extends Component {
    })
  }

-  hideModal=()=>{
-    this.setState({
-      visible:false
-    })
-  }
-
-  sureModal=()=>{
-    this.hideModal();
-    this.props.history.push('/projects');
-  }
-
  

  render() {
    const { projectDetail, watchers_count, praises_count, 
      forked_count, firstSync , secondSync , 
      isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , project_id , user_apply_signatures , visible } = this.state;
+      project , open_devops , platform , defaultBranch , bannerList } = this.state;
    const url = this.props.history.location.pathname;
    const urlArr = url.split("/");
    const urlFlag = (urlArr.length === 3);
@ -430,19 +422,18 @@ class Detail extends Component {
    }
    return (
      <div>
-         <SpecialModal {...this.props} visible={visible} hideModal={this.sureModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
        <div className="detailHeader-wrapper">
          <div className="normal">
            <div className="f-wrap-between pb15" style={{ position: "relative" }}>
-              <p className="color-white font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
+              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
                {project && project.author &&
-                  <Link to={`/users/${project.author.login}`} className="show-user-link color-white">
+                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
                    {project.author.name}
                  </Link>
                }
                <span className="ml5 mr5">/</span>
                <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="color-white font-22">{project && project.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
                  {
                    projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
                      <Tooltip placement={'right'} title={text}>
@ -479,14 +470,15 @@ class Detail extends Component {
                      <span>{watched ? '取消关注' : '关注'}</span>
                    </a>
                    {
+                      watchers_count > 0 ?
                      platform ?
                      <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
                        {watchers_count}
                      </Link>
                      :
                      <span className="detail_tag_btn_count">{watchers_count}</span>
+                      :""
                    }
-                   
                  </span>
                  <span className="detail_tag_btn">
                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
@ -494,24 +486,30 @@ class Detail extends Component {
                      <span>{praised ? '取消点赞' : '点赞'}</span>
                    </a>
                    {
+                      praises_count > 0 ?
                      platform ?
                      <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
                        {praises_count}
                      </Link>:
                      <span className="detail_tag_btn_count">{praises_count}</span>
+                      :""
                    }
                  </span>
                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                      <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
-                    </a>
+                    <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: `/projects/${owner}/${projectsId}/fork_users`, state }}>
                        {forked_count}
                      </Link>
                      :
-                      <span className="detail_tag_btn_count">{praises_count}</span>
+                      <span className="detail_tag_btn_count">{forked_count}</span>
+                      :""
                    }
                  </span>
                </span>
@ -519,86 +517,26 @@ class Detail extends Component {
            </div>
            {
              firstSync ? "" :
-              <div className="f-wrap-between pb20">
-                <ul className="headerMenu-wrapper">
-                  <li className={pathname==="about" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                      <i className={ pathname === "about" ? "iconfont icon-zhuye1 color-blue mr5 font-14":"iconfont icon-zhuye1 color-white font-14 mr5"}></i>
-                      <span>主页</span>
-                      </Link>
-                  </li>
-                  <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-blue mr5 font-14":"iconfont icon-daimaku color-white font-14 mr5"}></i>
-                      <span>代码库</span>
-                      </Link>
-                  </li>
-                  <li className={pathname==="issues" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                      <i className={pathname==="issues" ? "iconfont icon-renwu color-blue mr5 font-14":"iconfont icon-renwu color-white font-14 mr5"}></i>
-                      <span>易修 (Issue)</span>
-                      {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
-                    </Link>
-                  </li>
-                  {
-                    projectDetail && parseInt(projectDetail.type) !== 2 && platform &&
-                    <li className={pathname==="pulls" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-blue mr5 font-14":"iconfont icon-hebingqingqiu1 color-white font-14 mr5"}></i>
-                        <span>合并请求</span>
-                        {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
-                      </Link>
-                    </li>
-                  }
-                  <li className={pathname==="source" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
-                        <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-blue mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-white font-14 mr5"}></i>
-                        <span>资源库</span>
-                        {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
-                    </Link>
-                  </li>
-                  {/* {
-                     platform &&
-                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/list`:""}`, state }}>
-                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
-                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
-                      </Link>
-                    </li>
-                  } */}
-                  
-                  <li className={pathname==="milestones" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-blue mr5 font-14":"iconfont icon-lichengbei color-white font-14 mr5"}></i>
-                        <span>里程碑</span>
-                        {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
-                    </Link>
-                  </li>
-                  <li className={pathname==="activity" ? "active" : ""}>
-                    <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-blue mr5 font-14":"iconfont icon-tongzhi color-white font-14 mr5"}></i>
-                      <span>动态</span>
-                    </Link>
-                  </li>
-                  {
-                    isManager && platform &&
-                    <li className={url.indexOf("/setting") > 0 ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-blue mr5 font-14":"iconfont icon-cangku color-white font-14 mr5"}></i>
-                        <span>仓库设置</span>
-                      </Link>
-                    </li>
-                  }
-                </ul>
-              </div>
+              <DetailBanner 
+                history={this.props.history}
+                list={bannerList}
+                owner={owner}
+                projectsId={projectsId}
+                pathname={pathname}
+                state={state}
+                projectDetail={projectDetail}
+                open_devops={open_devops}
+                platform={platform}
+                urlFlag={urlFlag}
+                isManager={isManager}
+              />
            }
          </div>
        </div>
        {
          firstSync ?
          <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large">
-            </Spin>
+            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
          </Content>
          :
          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
@ -699,6 +637,7 @@ class Detail extends Component {
                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
                }
              ></Route>
+              {/* 新建合并请求 */}
              <Route path="/projects/:owner/:projectsId/pulls/new"
                render={
                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
@ -725,11 +664,6 @@ class Detail extends Component {
                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
                }
              ></Route>
-              <Route path="/projects/:owner/:projectsId/coders/filesurl"
-                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
              <Route path="/projects/:owner/:projectsId/watchers"
                render={
                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
@ -745,19 +679,32 @@ class Detail extends Component {
                  (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
                }
              ></Route>
+              {/* 贡献者列表 */}
+              <Route path="/projects/:owner/:projectsId/contribute"
+                render={
+                  () => (<Contribute {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
+
+              {/* 代码库----详情页面 */}
              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
                }
              ></Route>
              <Route path="/projects/:owner/:projectsId/tree/:branchName"
                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/:subIndex"
+                render={
+                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
                }
              ></Route>
              <Route path="/projects/:owner/:projectsId"
                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
                }
              ></Route>
            </Switch>
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -59,13 +59,13 @@ 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}/branch/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
            </div>
          </div>
          <div className="f-wrap-between" style={{ alignItems: "center" }}>
            <ul className="df">
              <User
-                url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                name={committer && committer.name}
              />
              {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Menu, Input , Spin, Pagination , Popover } from 'antd';
+import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
+import { getImageUrl } from 'educoder';
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@ -8,7 +9,7 @@ import ListItem from './IndexItem'
 import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
-import banner from '../Images/banner_list.png';
+import banner from '../Images/banner_list.jpg';
 const Search = Input.Search;

 class Index extends Component {
@ -22,6 +23,7 @@ class Index extends Component {
      sort: undefined,
      total: 0,
      isSpin: true,
+      project_type: undefined,
      category_id: undefined,

      typeList: undefined,
@ -35,8 +37,8 @@ class Index extends Component {
  }

  componentDidMount = () => {
-    const { page,search, sort,category_id , languageId } = this.state;
-    this.getListData(page,search, sort,category_id , languageId);
+    const { page, limit, search, sort, project_type, category_id , languageId } = this.state;
+    this.getListData(page, limit, search, sort, project_type, category_id , languageId);

    this.getType();

@ -71,18 +73,19 @@ class Index extends Component {
  }

  // 获取列表
-  getListData = (page,search, sort,category_id,language_id) => {
+  getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
    const { current_user } = this.props;
    const url = `/projects.json`;
    axios.get(url, {
      params: {
        user_id: current_user && current_user.user_id,
        page,
-        limit:15,
+        limit,
        search,
        sort_by: sort,
+        project_type,
        category_id,
-        language_id
+        language_id:languageId
      }
    }).then((result) => {
      if (result) {
@ -109,7 +112,7 @@ class Index extends Component {
    this.setState({
      typeList: list.map((item, key) => {
        return (
-          <li key={key} className={active_type && parseInt(active_type) === item.id ? 'active' : ''} onClick={() => this.changeType(`${item.id}`, list)}>
+          <li key={key} className={active_type && active_type === item.project_type ? 'active' : ''} onClick={() => this.changeType(`${item.project_type}`, list)}>
            <p>
              <span className="font-16">{item.name}</span>
              <span className="color-blue">{item.projects_count}</span>
@ -121,15 +124,15 @@ class Index extends Component {
  }

  // 切换类型
-  changeType = (id, list) => {
+  changeType = (type, list) => {
    this.setState({
      isSpin: true,
-      languageId: id,
+      project_type: type,
      search: undefined
    })
-    this.setTypeList(list, id)
-    const { page,sort, category_id} = this.state;
-    this.getListData(page,undefined, sort,category_id , id);
+    this.setTypeList(list, type)
+    const { page, limit, sort, category_id , languageId } = this.state;
+    this.getListData(page, limit, undefined, sort, type, category_id , languageId);
  }

  // 获取类型
@ -164,8 +167,8 @@ class Index extends Component {
      page: 1
    });
    this.setCategoryList(list, id)
-    const { sort,languageId } = this.state;
-    this.getListData(1,undefined, sort,id , languageId);
+    const { limit, sort, project_type , languageId } = this.state;
+    this.getListData(1, limit, undefined, sort, project_type, id , languageId);
  }

  // 排序
@ -176,8 +179,8 @@ class Index extends Component {
      search: undefined,
      isSpin: true
    })
-    const {category_id , languageId } = this.state;
-    this.getListData(1,undefined, e.key,category_id , languageId);
+    const { limit, project_type, category_id , languageId } = this.state;
+    this.getListData(1, limit, undefined, e.key, project_type, category_id , languageId);
  }

  // 搜索
@ -189,8 +192,8 @@ class Index extends Component {
      project_type: undefined,
      sort: "updated_on"
    })
-    const {sort, category_id , languageId } = this.state;
-    this.getListData(1,value, sort,category_id , languageId);
+    const { limit, sort, category_id , languageId } = this.state;
+    this.getListData(1, limit, value, sort, undefined, category_id , languageId);
  }
  changeSearchValue = (e) => {
    this.setState({
@ -202,14 +205,23 @@ class Index extends Component {
    this.setState({
      page
    })
-    const {search, sort,category_id , languageId } = this.state;
-    this.getListData(page,search, sort, category_id , languageId);
+    const { limit, search, sort, project_type, category_id , languageId } = this.state;
+    this.getListData(page, limit, search, sort, project_type, category_id , languageId);
  }

  getoDetail=(login,identifier)=>{
    this.props.history.push(`/projects/${login}/${identifier}`);
  }

+  // 选择语言类别
+  changeLanguage=(e)=>{
+    this.setState({
+      isSpin:true,
+      languageId:e === 0 ?undefined:e
+    })
+    const { page, limit, sort , project_type , category_id } = this.state;
+    this.getListData(page, limit, undefined, sort, project_type, category_id ,e === 0 ?undefined:e);
+  }

  menu =()=> { 
    return(
@ -243,14 +255,15 @@ class Index extends Component {
  render() {
    const { current_user } = this.props;

-    const { projectsList , isSpin , total , search , limit , page , typeList , categoryList } = this.state;
+    const { projectsList , recommendList , languageList , languageId , 
+      isSpin, total, search, limit, page, typeList, categoryList } = this.state;

    return (
      <div>
        <p className="t_project_banner">
          <img src={banner} width="100%" alt=""/>
        </p>
-        {/* {
+        {
          recommendList && recommendList.length>0 &&
          <div className="recommandProjects">
            {
@ -258,7 +271,7 @@ class Index extends Component {
                return(
                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                    <div className="mainInfo">
-                      <img src={getUrl(`/images/${item.author && item.author.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
                      <p className="school">{item.name}</p>
                      <p className="name">{item.author && item.author.name}</p>
                    </div>
@ -272,23 +285,44 @@ class Index extends Component {
            }
          </div>
        }
-         */}
+        
        <div className="ProjectListIndex">
          <div className="list-left">
            <ul className="list-l-Menu">
-              <li className="MenuTitle"><i className="iconfont icon-bianchengyuyan color-grey-9 font-15 mr5"></i>
-                语言</li>
-              <div className="list-affix">{typeList}</div>
+              <li className="MenuTitle"><i className="iconfont icon-xiangmuleixing color-grey-9 font-15 mr5"></i>项目类型</li>
+              {typeList}
            </ul>
            <ul className="list-l-Menu">
              <li className="MenuTitle"><i className="iconfont icon-xiangmuleibie color-grey-9 font-15 mr5"></i>项目类别</li>
-              <div className="list-affix">{categoryList}</div>
+              {categoryList}
            </ul>
          </div>
          <div className="list-right boxShandow radius-2" style={{padding:0}}>
            <Spin spinning={isSpin}>
              <div className="list-r-operation">
                <div>
+                  <Select 
+                    showSearch
+                    placeholder="请选择语言"
+                    style={{width:"150px",marginRight:"20px"}}
+                    size={"large"}
+                    onChange={this.changeLanguage}
+                    value={languageId}
+                    allowClear={true}
+                    optionFilterProp="children"
+                    filterOption={(input,option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                  >
+                    <Select.Option key={0} value={0}>请选择语言</Select.Option>
+                    {
+                      languageList && languageList.length>0 && languageList.map((item,key)=>{
+                        return(
+                          <Select.Option key={item.id} value={item.id}>
+                            {item.name}
+                          </Select.Option>
+                        )
+                      })
+                    }
+                  </Select>
                  <Search
                    placeholder="输入项目名称关键字进行搜索"
                    enterButton="搜索"
@ -316,7 +350,7 @@ class Index extends Component {
                  </Popover>
                </div>
              </div>
-              <ListItem {...this.props} {...this.state} projects={projectsList} getListData={this.getListData}></ListItem>
+              <ListItem {...this.props} {...this.state} projects={projectsList}></ListItem>
              {this.pagination(total,limit,page)}
            </Spin>
          </div>
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -10,6 +10,7 @@
  width: 220px;
  margin-right: 25px;
  cursor: pointer;
+  border: 1px solid #eee;
  &:last-child{
    margin-right: 0px;
  }
@ -72,15 +73,243 @@
    }
  }
 }
-.singleBtn{
-  display: inline-block;
-  .ant-upload-list-item{
-    position: absolute;
-    bottom: 0px;
-    width: 100%;
-    left: 0px;
-    .ant-upload-list-item-name{
-      text-align: left;
+
+// coderDepot
+.Panels{
+  max-width: 1200px;
+  margin: 0 auto;
+  .panelmenu{
+    padding-top:30px;
+  }
+  .addOptionBtn{
+    height: 32px;
+    line-height: 30px;
+    display: flex;
+    border:1px solid #d9d9d9;
+    border-radius: 2px;
+    a{
+      padding:0px 13px;
+      color: rgba(0, 0, 0, 0.65);
+      cursor: pointer;
+    }
+    & > a:first-child{
+      border-right: 1px solid #d9d9d9;
+    }
+    & > a:last-child{
+      border-right: none;
    }
  }
+  .infoCount{
+    display: inline-block;
+    padding:0px 5px;
+    height: 16px;
+    line-height: 16px;
+    background-color: #eee;
+    color:#999;
+    border-radius: 12px;
+    margin-left: 10px;
+    font-size: 12px;
+  }
+  .attrPerson{
+    padding-top: 15px;
+    display: flex;
+    flex-wrap: wrap;
+    a{
+      margin: 10px 10px 0px 0px;
+      img{
+        border-radius: 50%;
+        width: 35px;
+        height: 35px;
+      }
+      &:nth-child(6){
+        margin-right: 0px;
+      }
+    }
+  }
+  .progress{
+    display: flex;
+    border-radius: 10px;
+    height: 7px;
+    margin-top: 12px;
+    span{
+      border-left: 1px solid #fff;
+      &:first-child{
+        border-left: none;
+        border-radius: 10px 0px 0px 10px;
+      }
+      &:last-child{
+        border-radius: 0px 10px 10px 0px;
+      }
+    }
+  }
+  .progresstip{
+    margin-top: 15px;
+    flex-wrap: wrap;
+    i.zero{
+      position: absolute;
+      display: block;
+      border-radius: 50%;
+      height: 8px;
+      width: 8px;
+      left: 0px;
+      top:10px
+    }
+    &>span{
+      padding-left: 15px;
+      position: relative;
+      min-width: 33.5%;
+      span{
+        color: #666;
+        &:last-child{
+          color: #999;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+  .listtable{
+    margin-top: 20px;
+    border:1px solid #d9d9d9;
+    border-radius: 4px;
+    .listtablehead{
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      border-bottom: 1px solid #d9d9d9;
+      padding:7px 20px;
+      border-radius: 4px 4px 0px 0px;
+      background-color: #FAFBFC;
+      .ellipsistxt{
+        margin-left: 13px;
+        line-height:18px;
+        margin-top:6px;
+        flex:1;
+        width: 0;
+        color: #666;
+        &>p{
+          word-break:break-all;
+        }
+        &.hide{
+          height: 18px;
+          overflow: hidden;
+          position: relative;
+          padding-right:8px;
+        }
+        &.hide::after{
+          position: absolute;
+          right: 0px;
+          bottom: 0px;
+          content:"...";
+
+        }
+      }
+      .ellipsis{
+        margin-left: 8px;
+        cursor: pointer;
+        border-radius: 2px;
+        background-color: #c1c1c1;
+        padding:0px 4px;
+        height: 14px;
+        line-height: 14px;
+        margin-top: 9px;
+        i{
+          font-size: 15px!important;
+          color: #fff;
+          height: 14px;
+          line-height: 14px;
+        }
+      }
+    }
+    .listtablebody{
+      li.listtablepath{
+        a{color: #40a9ff;}
+        p{
+          margin-bottom: 0px!important;
+        }
+      }
+      li{
+        height: 42px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #d9d9d9;
+        padding:0px 20px 0px 24px;
+        & > span:first-child{
+          width: 30%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        & > span:nth-child(2){
+          width: 60%;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+        & > span:nth-child(3){
+          width: 10%;
+          text-align: right;
+        }
+      }
+      &> li:last-child{
+        border-bottom: none;
+      }
+    }
+  }
+}
+.drawerBtn{
+  position: fixed;
+  left: -13px;
+  border:1px solid rgb(207,205,223);
+  width: 34px;
+  border-radius: 0px 12px 12px 0px;
+  height: 70px;
+  top:50%;
+  margin-top: -35px;
+  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
+  &:hover{
+    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
+  }
+  span{
+    writing-mode: vertical-lr;
+    color: #202429;
+    width: 25px;
+  }
+  i{
+    color: #24292e;
+    height: 18px;
+    line-height: 18px;
+    width: 18px;
+  }
+}
+.downMenu{
+  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
+  background-color: #fff;
+  .ant-menu-vertical .ant-menu-item:hover{
+    background-color: #e6f7ff;
+  }
+}
+
+.menuslist{
+  max-height: 200px;
+  overflow-y: auto;
+  padding:10px 15px;
+  border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .ant-dropdown-menu-item.active{
+    background-color: #e6f7ff;
+  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
caishi	4d652d238d	不能修改组织账号	2021-04-27 17:25:00 +08:00
caishi	6da4dbc165	组织团队-无数据显示错误	2021-04-27 09:45:14 +08:00
caishi	f65f4c273a	组织基本设置-正则和新建的页面不一致	2021-04-26 16:32:12 +08:00
caishi	1af504825c	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 18:00:05 +08:00
caishi	e94cf68cc5	样式覆盖	2021-04-23 18:04:49 +08:00
caishi	5fa2fd99b9	Merge branch 'develop'	2021-04-23 14:51:04 +08:00
caishi	2f6597355c	+上关注后不需要提示	2021-04-23 14:50:52 +08:00
caishi	20ab8a6683	Merge branch 'develop'	2021-04-23 14:47:50 +08:00
caishi	1eb3c20af4	+上贡献者悬浮框里增加的跳转链接不要新开页	2021-04-23 14:47:32 +08:00
caishi	afb599f5be	贡献者-悬浮内容增加跳转链接	2021-04-23 14:46:11 +08:00
caishi	a7f709a663	Merge branch 'develop'	2021-04-23 14:16:30 +08:00
caishi	d6d6df806d	imageUrl + /	2021-04-23 14:14:06 +08:00
caishi	6cc97bd039	个人中心关注-关注或者取消关注未更新状态	2021-04-23 11:49:56 +08:00
caishi	037150a63c	贡献者-悬浮卡片-测试版1	2021-04-23 11:15:14 +08:00
caishi	63c2cfed70	Merge branch 'develop'	2021-04-22 10:58:30 +08:00
caishi	52dc63362b	发布评论者头像路径错误	2021-04-22 10:58:11 +08:00
caishi	29e3f0d59d	新建组织-组织账号正则	2021-04-21 16:55:10 +08:00
caishi	233e6a8226	底部样式+新建组织账号正则	2021-04-21 16:54:47 +08:00
caishi	80cd6fbae0	md文件要用Markdown渲染	2021-04-20 15:33:21 +08:00
caishi	8fa31edaae	md文件要用Markdown渲染	2021-04-20 15:31:49 +08:00
caishi	49d3db6746	合并请求-提出申请者头像显示问题	2021-04-20 11:18:44 +08:00
caishi	ffbb5ba34e	合并请求-提出申请者头像显示问题	2021-04-20 11:17:54 +08:00
caishi	bc11ec68e3	注释	2021-04-20 10:57:46 +08:00
caishi	2d2deec224	Merge branch 'develop'	2021-04-20 10:56:50 +08:00
caishi	a67cabbfb4	团队项目-团队项目管理-显示的name和跳转的login	2021-04-20 10:54:20 +08:00
caishi	ceb1915939	切换左侧目录，选择不同的文件时，文件详情没有更新	2021-04-20 10:30:47 +08:00
caishi	4c65e1981e	all-默认头像（首字母加背景颜色）	2021-04-20 09:36:49 +08:00
caishi	09598d0e2c	个人主页头像url	2021-04-19 19:54:57 +08:00
caishi	e09490d424	上线后的getImageURL也不用在前面加/ + 一些小样式修改	2021-04-19 18:19:21 +08:00
caishi	a42a670146	头像url--接口会返回所有带images的字段值，所以前端不用加固定的内容了	2021-04-19 17:52:01 +08:00
caishi	b8d40259e5	readme-文件增加一个目录下拉icon	2021-04-19 16:58:30 +08:00
caishi	487a2f0495	组织团队-新增一个团队标识	2021-04-19 11:53:19 +08:00
caishi	ab34369642	新建团队板块无边框	2021-04-19 10:54:02 +08:00
caishi	f12228aa51	组织详情显示nickname	2021-04-19 10:35:20 +08:00
caishi	5477c41f78	资源库不需要按引用次数排序	2021-04-14 10:31:33 +08:00
caishi	dc05f9ce35	组织-项目-切换协作者管理和团队管理时会重复调用增加成员接口	2021-04-13 17:12:37 +08:00
caishi	b601582d15	资源库数量显示错误	2021-04-13 11:14:04 +08:00
caishi	832b18e7f5	组织-团队列表的头像login为undefined	2021-04-13 11:06:09 +08:00
caishi	8c58f77afb	去掉右侧悬浮手册按钮	2021-04-09 14:18:44 +08:00
caishi	2c363965dd	去掉悬浮手册按钮	2021-04-09 13:58:58 +08:00
caishi	60a7f39c16	forge项目暂时不显示命令行功能	2021-04-09 11:45:04 +08:00
caishi	9811276a7c	ssh-3(前端固定参数已调通)	2021-04-09 10:12:39 +08:00
caishi	a27c74b9aa	ssh-2	2021-04-08 18:14:19 +08:00
caishi	80cae93045	ssh-初步	2021-04-08 17:44:31 +08:00
caishi	78aba67917	项目详情右侧增加实践课程链接的显示	2021-04-08 15:37:01 +08:00
caishi	43223c7787	为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能	2021-04-08 14:21:35 +08:00
caishi	961587921a	projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不能上传新建文件、下载zip等)	2021-04-08 10:07:55 +08:00
caishi	2f595d750a	entries接口传的branch值为undefined	2021-04-07 18:44:20 +08:00
caishi	bcaec7a2db	新增组织账号，组织名称增加新的check条件	2021-04-06 18:40:01 +08:00
caishi	70ea6259ae	仓库设置页面增加资源库配置项	2021-04-06 17:34:37 +08:00
caishi	5d6953f2b3	资源库模块测试版第一次上线	2021-04-06 17:17:01 +08:00
caishi	c8eda704e5	列表的type字段为头像跳转到个人中心或者组织的判断依据	2021-04-06 11:45:03 +08:00
caishi	5d6b95ab8f	资源库部分接口调试	2021-04-06 11:36:38 +08:00
caishi	426ea3fece	合并请求分页	2021-04-02 18:55:26 +08:00
caishi	ab052ebace	第三方登录-修改邮箱和密码	2021-04-02 18:40:59 +08:00
caishi	648c6e235b	第三方账号密码重置	2021-04-02 17:39:13 +08:00
caishi	96253f3f58	列表接口、上传资源	2021-04-02 17:31:15 +08:00
caishi	101478d924	协作者管理删除按钮没显示	2021-04-02 14:08:59 +08:00
caishi	dccbd6735d	构建列表里的提交信息，作者头像错误	2021-04-02 11:57:48 +08:00
caishi	a0ebba839e	tips	2021-04-01 19:03:56 +08:00
caishi	171f14bd2a	noticeurl	2021-04-01 16:25:53 +08:00
caishi	c3e09f2672	第三方登录-educoder	2021-04-01 15:35:45 +08:00
caishi	6296434527	清理appconfig文件资源库所有页面排版、数据未绑	2021-04-01 14:41:13 +08:00
caishi	e2dbda3083	工作流author	2021-03-31 17:12:31 +08:00
caishi	02f382e6fb	登录框中的找回密码、注册的url	2021-03-31 11:15:41 +08:00
caishi	b568aef34e	issue	2021-03-30 15:01:25 +08:00
caishi	2c83221376	按钮	2021-03-30 11:50:25 +08:00
caishi	6a4fe4d277	左侧抽屉	2021-03-30 10:26:02 +08:00
caishi	99f7aea290	资源	2021-03-29 16:48:23 +08:00
caishi	50f39afffa	style	2021-03-25 22:06:04 +08:00
caishi	d0ccc92cc6	新建项目路由	2021-03-25 22:00:01 +08:00
caishi	2add7911dc	readme	2021-03-25 14:38:52 +08:00
caishi	ec1ff5d479	简介修改	2021-03-24 14:08:10 +08:00
caishi	55f23dea0d	style	2021-03-23 17:58:12 +08:00
caishi	26e74e7ed4	condition	2021-03-23 17:40:23 +08:00
caishi	3384cd2703	style+banner	2021-03-23 09:20:16 +08:00
caishi	0290822ebf	代码库-默认显示	2021-03-22 11:24:07 +08:00
caishi	31edf6ff45	分页	2021-03-22 09:45:30 +08:00
caishi	8a1feed72b	未登录判断	2021-03-19 17:22:02 +08:00
caishi	0c0203a8ef	name	2021-03-19 16:34:41 +08:00
caishi	45e69cb14a	update	2021-03-19 16:29:43 +08:00
caishi	d7f3c766b4	导航栏设置	2021-03-19 15:46:37 +08:00
caishi	a3226dca4e	banner	2021-03-19 12:11:55 +08:00
caishi	d16ee801ec	背景色	2021-03-19 11:35:03 +08:00
caishi	c3eb6edddc	项目详情新版	2021-03-18 17:28:53 +08:00
caishi	ad8a127170	remove	2021-03-11 18:07:19 +08:00
caishi	cbaf72b341	appconfig	2021-03-10 17:32:39 +08:00
caishi	a4b5b67da6	diff-查看文件	2021-03-10 10:41:16 +08:00
caishi	da31875a5a	filedetail	2021-03-09 11:46:41 +08:00
caishi	b7a92b17e7	active	2021-03-08 10:26:39 +08:00
caishi	f4332db4ad	style	2021-03-05 18:35:54 +08:00
caishi	99174c2782	取消上一个commit的修改	2021-03-05 15:59:30 +08:00
caishi	f33f1f3ce5	参数管理-权限（仅创建者）	2021-03-05 14:39:59 +08:00
caishi	5d99d63267	style	2021-03-05 10:47:13 +08:00
caishi	9137b666ea	style	2021-03-05 09:56:07 +08:00
caishi	1250a9b10b	删除	2021-03-04 17:05:27 +08:00
caishi	6ea82be73a	工作流-参数管理	2021-03-04 15:08:58 +08:00
caishi	964427b8fc	工作流-参数	2021-03-03 16:43:02 +08:00
caishi	afd6904349	loading	2021-03-02 15:43:40 +08:00