Merge branch 'master' of https://git.trustie.net/hc1913847458/forgeplus-react

package.json

@@ -193,6 +193,7 @@
     "babel-core": "^6.26.0",
     "babel-plugin-import": "^1.13.0",
     "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",

src/forge/Main/sub/DetailBanner.jsx

@@ -85,7 +85,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     </li>
                     :""
                   }
-                  {
+                  {/* {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
@@ -94,7 +94,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                           {projectDetail && projectDetail.source_count ? <span className="num">{numFormat(projectDetail.source_count)}</span> :""}
                       </Link>
                     </li>
-                  }
+                  } */}
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>

src/forge/Main/sub/UpdateDescModal.jsx

@@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
           {getFieldDecorator("lesson_url",{
             rules:[]
           })(
-            <Input placeholder="实践课程链接"/>
+            <Input placeholder="实践课程链接" />
           )}
         </Form.Item>
       </Form>

src/forge/Settings/Setting.js

@@ -16,7 +16,7 @@ const menu = [
   {name:"合并请求",index:"pulls"},
   {name:"Wiki",index:"wiki"},
   {name:"工作流(beta版)",index:"devops"},
-  {name:"资源库",index:"resources"},
+  // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
   {name:"动态",index:"activity"},
 ]

src/modules/search/index.jsx

@@ -13,7 +13,7 @@ const { TabPane } = Tabs;
 // const https = 'http://192.168.0.77:8081';       //曾伟内网后台
 // const https = 'http://192.168.31.104:8081'; //曾伟外网后台
 // const https='http://106.75.31.211:58081';
-const https = 'https://test-statistics.trustie.net';
+const https = "https://statistics.trustie.net";
 
 const GlobalSearch = ({ location, showNotification, history }) => {