Merge pull request '工程认证弹框等特殊定制' (#247) from caishi/forgeplus-react:dev_educoder into dev_educoder

# Conflicts:
#	public/css/iconfont.js
#	src/AppConfig.js
#	src/forge/Head/Footer.jsx
#	src/forge/Head/Header.js
#	src/forge/Head/header.scss
#	src/forge/Main/CoderDepot.jsx
#	src/forge/Main/CoderRootCommit.js
#	src/forge/Main/sub/DetailBanner.jsx
#	src/forge/New/Index.js
#	src/forge/Source/Index.jsx
#	src/modules/tpm/TPMIndexHOC.js

LICENSE

@@ -1,124 +0,0 @@
-木兰宽松许可证， 第2版
-
-2020年1月 http://license.coscl.org.cn/MulanPSL2
-
-您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
-
-0.   定义
-
-“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
-
-“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
-
-“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
-
-“法人实体” 是指提交贡献的机构及其“关联实体”。
-
-“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
-
-1.   授予版权许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
-
-2.   授予专利许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
-
-3.   无商标许可
-
-“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
-
-4.   分发限制
-
-您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
-
-5.   免责声明与责任限制
-
-“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
-
-6.   语言
-
-“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
-
-条款结束
-
-如何将木兰宽松许可证，第2版，应用到您的软件
-
-如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
-
-1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
-
-2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
-
-3， 请将如下声明文本放入每个源文件的头部注释中。
-
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.
-Mulan Permissive Software License，Version 2
-Mulan Permissive Software License，Version 2 (Mulan PSL v2)
-
-January 2020 http://license.coscl.org.cn/MulanPSL2
-
-Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
-
-0. Definition
-
-Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
-
-Contribution means the copyrightable work licensed by a particular Contributor under this License.
-
-Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
-
-Legal Entity means the entity making a Contribution and all its Affiliates.
-
-Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
-
-1. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
-
-2. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
-
-3. No Trademark License
-
-No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
-
-4. Distribution Restriction
-
-You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
-
-5. Disclaimer of Warranty and Limitation of Liability
-
-THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-6. Language
-
-THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
-
-END OF THE TERMS AND CONDITIONS
-
-How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
-
-To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
-
-Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
-Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
-Attach the statement to the appropriate annotated syntax at the beginning of each source file.
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.

package-lock.json

@@ -14204,7 +14204,7 @@
     },
     "qr.js": {
       "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/qr.js/-/qr.js-0.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/qr.js/download/qr.js-0.0.0.tgz",
       "integrity": "sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8="
     },
     "qrcode.react": {

public/css/edu-common.css

@@ -25,9 +25,6 @@ html {
   min-width: 1200px
 }
 
-.newFooter {
-  max-height: 110px;
-}
 
 .newFooter {
   position: absolute;

public/css/edu-purge.css

@@ -3604,7 +3604,6 @@ a.user_bluebg_btn {
   margin-right: 5px;
 }
 
-
 /***** loading ******/
 /*****载入中******/
 #ajax-indicator {
@@ -3971,7 +3970,7 @@ html>body #ajax-indicator {
   display: block;
   height: 100%;
   width: 100%;
-  color: #333;
+  color: #fff;
   font-size: 16px;
 }
 

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1634881729644') format('woff2'),
-       url('iconfont.woff?t=1634881729644') format('woff'),
-       url('iconfont.ttf?t=1634881729644') format('truetype');
+  src: url('iconfont.woff2?t=1632964996877') format('woff2'),
+       url('iconfont.woff?t=1632964996877') format('woff'),
+       url('iconfont.ttf?t=1632964996877') format('truetype');
 }
 
 .iconfont {

src/App.js

@@ -84,7 +84,7 @@ const EducoderLogin = Loadable({
 	loading: Loading,
 })
 const Search = Loadable({
-	loader: () => import('./modules/search/'),
+	loader: () => import('./search/SearchPage'),
 	loading: Loading,
 })
 const WikiPreview = Loadable({
@@ -92,6 +92,7 @@ const WikiPreview = Loadable({
 	loading: Loading,
 })
 
+
 const ProjectIndex = Loadable({
 	loader: () => import("./forge/Index"),
 	loading: Loading,
@@ -178,7 +179,6 @@ class App extends Component {
 
 	componentDidMount() {
 		document.title = "loading...";
-
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {

src/AppConfig.js

@@ -11,9 +11,9 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list) {
-  if (window.location.port !== "3007") {
+  // if (window.location.port !== "3007") {
   window.location.href = list
-  }
+  // }
 }
 // TODO 开发期多个身份切换
 let debugType = ""
@@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-  var proxy = "https://testforgeplus.trustie.net";
+  var proxy = "https://testforgeplus.educoder.net";
   //响应前的设置
   axios.interceptors.request.use(
     config => {
@@ -86,7 +86,7 @@ export function initAxiosInterceptors(props) {
 
     if (response.data.status === 404) {
       let responseURL = response.request ? response.request.responseURL:'';
-      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
+      if (responseURL.indexOf('/api/users/') === -1 || responseURL.indexOf('/api/organizations/') === -1 || responseURL.indexOf('/api/owners/') === -1) {
         locationurl('/nopage');
       }
     }

src/common/UrlTool.js

@@ -8,16 +8,34 @@ const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
 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 = 'https://testforgeplus.trustie.net';
-	if (isDev) {
-		return `${local}/${path}`
+	const local = 'https://testforgeplus.educoder.net';
+	const normal = 'https://ali-cdn.educoder.net/images';
+	const normalend = 'https://ali-cdn.educoder.net';
+	if(path.substr(0, 7) !== "/system"){
+		if (isDev) {
+			return `${local}/${path}`
+		}
+		if(path.substr(0, 7) !== "/images"){
+    	return `${normal}${path}`;
+		}else{
+			return `${normalend}${path}`;
+		}
 	}
 	return `${path}`;
 }
 
+
+export function openNewWindow(url) {
+	let link = document.createElement('a')
+	link.target = "_blank"
+	document.body.appendChild(link)
+	link.href = url
+	let evt = document.createEvent("MouseEvents")
+	evt.initEvent("click", false, false)
+	link.dispatchEvent(evt)
+	document.body.removeChild(link);
+}
+
 export function numFormat(num, digits){
 	let d = digits || 1;
   var si = [
@@ -179,7 +197,7 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json`;
 }
 
 export function getUploadLogoActionUrl() {

src/common/educoder.js

@@ -7,6 +7,7 @@ export {
 	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
+	, openNewWindow as openNewWindow 
 } from './UrlTool';
 
 export { setmiyah as setmiyah } from './Component';

src/forge/Component/EAccount.scss

@@ -3,4 +3,9 @@
 }
 .ant-modal-wrap{
   z-index: 1032;
+}
+.ant-modal-wrap{
+  .ant-form-explain{
+    position: absolute;
+  }
 }

src/forge/Component/EducoderAccount.jsx

@@ -1,15 +1,32 @@
 import React , {forwardRef, useEffect} from 'react';
 import { Modal , Form , Input , Button } from 'antd';
 import './EAccount.scss';
+import axios from 'axios';
 
-function EducoderAccount({form , visible , onOk , email}){
+function EducoderAccount({form , visible , current_user , onCancel}){
   const { getFieldDecorator, validateFields , setFieldsValue } = form;
 
   useEffect(()=>{
-    if(email){
-      setFieldsValue({email})
+    if(current_user && current_user.email){
+      setFieldsValue({email:current_user.email})
     }
-  },[email])
+  },[current_user])
+
+  function onOk(values){
+    let url = `/accounts/gitea_register.json`;
+    const { email , is_sync_pwd} = current_user;
+    if(email && !is_sync_pwd){
+      url = `/users/change_password.json`;
+    }
+    axios.post(url,{
+      login:current_user && current_user.login,
+      ...values
+    }).then(result=>{
+      if(result && result.data && result.data.status === 0){
+        window.location.reload();
+      }
+    }).catch(error=>{})
+  }
 
   function onSure(){
     validateFields((error,values)=>{
@@ -27,7 +44,7 @@ function EducoderAccount({form , visible , onOk , email}){
       visible={visible}
       title="提示"
       width="500px"
-      closable={false}
+      onCancel={onCancel}
       footer={
         <Button type="primary" onClick={onSure}>确定</Button>
       }
@@ -35,21 +52,26 @@ function EducoderAccount({form , visible , onOk , email}){
     >
       <div>
         <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
+          { 
+          current_user && current_user.email ? 
+          `平台已检测到您已绑定邮箱${current_user.email},请您确认如下操作`
+          :
+          "平台已检测到您未绑定邮箱，为不影响使用协同开发功能，请先绑定邮箱"
+          }
         </p>
         <Form {...layout}>
           <Form.Item label="邮箱">
             {getFieldDecorator("email",{
               rules:[{required:true,message:"请输入邮箱账号"}]
             })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+              <Input placeholder="请输入您的邮箱账号" width="220px" disabled={current_user && current_user.email}/>
             )}
           </Form.Item>
           <Form.Item label="密码">
             {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
+              rules:[{required:true,message:"请输入您的平台密码"}]
             })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
+              <Input.Password placeholder="请输入您的平台密码" width="220px"/>
             )}
           </Form.Item>
         </Form>

src/forge/Component/ProfileModal/Profile.jsx

@@ -1,17 +1,36 @@
 import React from 'react';
+import { useState } from 'react';
+import EducoderAccount from '../EducoderAccount';
 
-function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
-
+function Profile({
+  children,
+  sureFunc,
+  showCompeleteDialog , 
+  completeProfile, 
+  className , 
+  current_user
+}) {
+  const [ giteaVisible , setGiteaVisible ] = useState(false);
+ 
   function checkProfile() {
-    if(!completeProfile){
-      showCompeleteDialog && showCompeleteDialog();
-    }else{
-      sureFunc();
+    if(current_user && current_user.login){
+      if(!current_user.has_gitea_user || (current_user.has_gitea_user && !current_user.is_sync_pwd)){
+        setGiteaVisible(true);
+      }else{
+        if(!completeProfile){
+          showCompeleteDialog && showCompeleteDialog();
+        }else{
+          sureFunc();
+        }
+      }
     }
   }
 
   return(
-    <a className={className} onClick={checkProfile}>{children}</a>
+    <React.Fragment>
+      <EducoderAccount visible={giteaVisible} onCancel={()=>setGiteaVisible(false)} current_user={current_user}/>
+      <a className={className} onClick={checkProfile}>{children}</a>
+    </React.Fragment>
   )
 }
 export default Profile;

src/forge/DevOps/ServiceModal.jsx

@@ -12,7 +12,7 @@ function ServiceModal({sureModal}){
     <div className="mt30" style={{textAlign:"center"}}>
       <Radio.Group value={type} onChange={changeType}>
         <Radio value={1}>自有服务器</Radio>
-        <Radio value={2}>Trustie服务器</Radio>
+        <Radio value={2}>EduCoder服务器</Radio>
       </Radio.Group>
       <p className="mt30"><Button type="primary" onClick={()=>sureModal(type)}>下一步</Button></p>
     </div>

src/forge/Divert/DivertModal.jsx

@@ -20,13 +20,6 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
     if(owner && repo && visible===true){
       getTeam();
     }
-    if(!visible){
-      setFieldsValue({
-        owner_name:undefined,
-        identifier:undefined
-      })
-      setValue(undefined)
-    }
   },[repo,owner,visible])
 
   function getTeam(){
@@ -127,7 +120,6 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
               {getFieldDecorator("owner_name",{
                 rules:[{required:true,message:"请输入目标用户名"}]
               })(
-                // <Input placeholder="请输入目标用户" autoComplete={"off"}/>
                 <SearchUser getUser={getUser} width={"100%"} placeholder="请输入目标用户" value={value}/>
               )}
             </Form.Item>
@@ -153,11 +145,11 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
             </Form.Item>
           }
           
-          <Form.Item label="仓库标识:" style={{marginBottom:"0px"}}>
+          <Form.Item label="仓库标识:">
             {getFieldDecorator("identifier",
               {
                 rules:[
-                  {required:true,message:"请输入仓库标识！"},
+                  {required:true,message:"请输入仓库标识"},
                   {
                     validator:checkIdentifier
                   }

src/forge/Head/Engineer.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { Modal } from 'antd';
+import { openNewWindow } from 'educoder';
+
+function Engineer({QQVisible,setQQVisible}) {
+
+  return(
+    <Modal
+      centered
+      destroyOnClose={true}
+      visible={QQVisible}
+      title="提示"
+      width="500px"
+      // footer={null}ee
+      okText="立即联系"
+      cancelText="取消"
+      onOk={() => {
+        openNewWindow("https://qm.qq.com/cgi-bin/qm/qr?k=DWdqQHAbbfw7_rqm0d-Q_vDn5H6bMp91&jump_from=webapi")
+      }}
+      onCancel={() => setQQVisible(false)}
+    >
+      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+        <p>您可以在QQ服务群向管理员申请，获得继续操作的权限</p >
+        < img src={require("./teacherQQ.png")} width={200} height={200} alt=""/>
+        <p>群号：693542422 </p >
+      </div>
+    </Modal >
+  )
+}
+export default Engineer

src/forge/Head/Footer.jsx

@@ -19,7 +19,7 @@ function Footer(){
 
   return(
     <div>
-      <div style={{height:"543px"}}></div>
+      <div style={{height:"810px"}}></div>
       <div className="newFooter edu-txt-center">
         {value && showhtml(value)}
         {/* <div className="footerInfos">

src/forge/Head/Header.js

@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import AccountProfile from "../../modules/user/AccountProfile";
-import { getImageUrl } from 'educoder'
+import { getImageUrl , openNewWindow } from 'educoder';
 import axios from 'axios';
-import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
-import { Link } from 'react-router-dom';
+import { Input , notification , Dropdown , Menu } from 'antd';
 
 import LoginDialog from '../../modules/login/LoginDialog';
 import HeadSearch from '../Component/HeadSearch';
@@ -13,13 +12,14 @@ import '../../modules/tpm/TPMIndex.css';
 import CheckProfile from '../Component/ProfileModal/Profile';
 
 import './header.scss';
-import NoticeContent from './NoticeContent';
+import Engineer from './Engineer';
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用
 const { Search } = Input;
 let old_url;
 
 window._header_componentHandler = null;
+const isPath= window.location.hostname ==='code.educoder.net' || window.location.hostname==='testforgeplus.educoder.net';
 // 非trustie链接则新开页跳转
 const str = ['www.trustie.net','forgeplus.trustie.net','forum.trustie.net','testforgeplus.trustie.net']
 class NewHeader extends Component {
@@ -49,6 +49,7 @@ class NewHeader extends Component {
       visiblemyss: false,
       openSearch:false,
       visible:false,  //浮动消息框展示控制
+      QQVisible:false
     }
   }
   componentDidMount() {
@@ -82,6 +83,36 @@ class NewHeader extends Component {
     } 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-white ml30" onClick={() => {
+        this.setState({openSearch:true})
+      }} />
+    }
+  }
+
+  onGlobalSearch=(value,item)=>{
+    window.location.href=`${item}?value=` + value;
+  }
+
   openNotification = (messge) => {
     notification.open({
       message: "提示",
@@ -96,6 +127,26 @@ class NewHeader extends Component {
     })
   }
 
+  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;
+      }
+    }
+  }
+
   educoderlogin = () => {
     //登录账号
     this.setState({
@@ -132,6 +183,24 @@ class NewHeader extends Component {
     })
   };
 
+
+  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 })
@@ -278,10 +347,32 @@ class NewHeader extends Component {
     this.setState({ visible });
   };
 
+  turntoEngineer=(url)=>{
+    const { current_user } = this.props;
+    if(current_user && current_user.login){
+      if(url){
+        window.location.href=url;
+      }else{
+        this.setState({
+          QQVisible:true
+        })
+      }
+    }else{
+      this.educoderlogin();
+    }
+  }
+
+  setQQVisible=()=>{
+    this.setState({
+      QQVisible:false
+    })
+  }
+
   render() {
-    const { match ,resetUserInfo ,showNotification} = this.props;
+    const { match } = this.props;
     let current_user = this.props.user;
     let {
+      QQVisible,
       AccountProfiletype,
       user,
       isRender,
@@ -369,6 +460,7 @@ class NewHeader extends Component {
     let search_url = settings && settings.common && settings.common.search;
     return (
       <div className="newHeaders" id="nHeader">
+        <Engineer QQVisible={QQVisible} setQQVisible={this.setQQVisible}/>
         <div className="headerContent">
           {isRender === true ?
             <LoginDialog
@@ -418,12 +510,19 @@ class NewHeader extends Component {
                     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 key={key} onClick={() => this.headtypesonClick(item.link, true)} className={`${((isPath && item.name === "大学开源") || this.matchpaths(item.link) === true) ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+                        <a href={new_link} target={wl ? "_self":"_blank"}><div dangerouslySetInnerHTML={{ __html: item.name }}></div></a>
                       </li>
                     )
                   })
                 }
+                {
+                  settings && settings.engineer_url !== undefined ?
+                  <li>
+                    <a onClick={()=>this.turntoEngineer(settings.engineer_url)}>工程认证</a>
+                  </li>
+                  :""
+                }
               </ul>
             : ""
             }
@@ -438,29 +537,20 @@ class NewHeader extends Component {
             }
             
             { (settings && settings.common && settings.common.notice) && (current_user && current_user.login)?
-              <Popover
-                overlayClassName="notice-popover"
-                placement={`bottomRight`}
-                content={<NoticeContent visible={visible} current_user={current_user} showNotification={showNotification} resetUserInfo={resetUserInfo}/>}
-                visible={visible}
-                onVisibleChange={this.handleVisibleChange}
-                destroyTooltipOnHide
-              >
-                <Link to={"/settings/notice"} className="message-icon">
-                  {current_user && <Badge count={current_user.message_unread_total}>
-                    <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
-                  </Badge>}
-                </Link>
-              </Popover>
+              <a href={settings.common.notice} className="message-icon">
+                {current_user &&
+                  <i className="iconfont icon-xiaoxilingdang color-grey-6 ml15 mr15"></i>
+                }
+              </a>
               : ""
             }
           </div>
           {!user || (user && !user.login)  ?
             <span className="font-15 ml30">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</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><em className="vertical-line"></em><a className="ml5 color-white" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/forge/Head/NoticeContent.jsx

@@ -184,11 +184,11 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
         className='hoverNotice-body' // 外部添加className加以区分
         onPullRefresh={() => { setNoticePage(noticePage + 1); }} //触发加载ajax的function
         // type={2} // 传送加载组件的状态
-        count={noticeUnreadList.length} // 数据当前的总数量
+        count={noticeUnreadList && noticeUnreadList.length} // 数据当前的总数量
         pageSize={10} // 
       >
         {
-          noticeUnreadList.map(item => {
+          noticeUnreadList && noticeUnreadList.length>0 && noticeUnreadList.map(item => {
             return (
               <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
                 <div className={`noticeCont ${item.notification_url?'pointer':''}`}>

src/forge/Index.js

@@ -79,6 +79,12 @@ class Index extends Component {
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+          <Route
+            path="/"
+            render={(props) => (
+              <ProjectIndex {...this.props} {...props} />
+            )}
+          ></Route>
         </Switch>
       </div>
     );

src/forge/Main/CoderRootBranch.js

@@ -1,92 +0,0 @@
-import React , { useState, useEffect } from 'react';
-import { Link } from "react-router-dom";
-import { Dropdown , Menu , Icon , Tooltip , Spin } from 'antd';
-import { truncateCommitId } from '../common/util';
-import { getBranch } from '../GetData/getData';
-import Nodata from '../Nodata';
-import './list.scss';
-
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-export default ((props)=>{
-  const [ data , setData ] =useState(undefined);
-  const [ isSpin , setIsSpin ] =useState(true);
-
-  const { projectsId , owner } = props.match.params;
-  const { isManager , isDeveloper , projectDetail } = props;
-  useEffect(()=>{
-    getBranchs(projectsId, owner);
-  },[projectsId])
-
-  async function getBranchs(id,owner){
-    let result = await getBranch(id,owner);
-    setData(result);
-    setIsSpin(false);
-  }
-
-  const list =()=>{
-    if(data && data.length>0){
-      return(
-        <React.Fragment>
-        <ul className="branchUl">
-          {
-            data.map((item,key)=>{
-              return(
-                <li key={key}>
-                  <div>
-                    <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
-                    <p className="f-wrap-alignCenter mt15">
-                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
-                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
-                      <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
-                    </p>
-                  </div>
-                  <span>
-                    {
-                      (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                      <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
-                    }
-                    <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
-                      <a className="ant-dropdown-link">
-                        <Tooltip title={`下载分支${item.name}`}><Icon type="cloud-download" className="font-18"/></Tooltip>
-                      </a>
-                    </Dropdown>
-                  </span>
-                </li>
-              )
-            })
-          }
-        </ul>
-        </React.Fragment>
-      )
-    }else if(data && data.length === 0){
-      return ( <Nodata _html="暂无数据"/>)
-    }
-  }
-  const menu =(zip_url,tar_url)=> (
-    <Menu>
-      <Menu.Item key={'0'}><a href={zip_url}>ZIP</a></Menu.Item>
-      <Menu.Item key={'1'}><a href={tar_url}>TAR.GZ</a></Menu.Item>
-    </Menu>
-  )
-
-  return(
-    <React.Fragment>
-      <div className="main">
-        <Spin spinning={isSpin}>
-          <div className="branchTable">
-            <p className="branchTitle bor-bottom-greyE">分支列表</p>
-            <div style={{minHeight:"400px"}}>{list()}</div>
-          </div>
-        </Spin>
-      </div>
-    </React.Fragment>
-  )
-})
-
-
-    

src/forge/Main/Detail.js

@@ -3,7 +3,6 @@ import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
 import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
-import { numFormat } from 'educoder';
 import '../css/index.scss'
 import './list.scss';
 
@@ -576,18 +575,6 @@ class Detail extends Component {
                 }
               </div>
             </AlignTop>
-            {/* <div className="mt6" style={{minHeight:"20px"}}>
-              {
-                projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
-                :""
-              }
-              {
-                projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                <span className="color-grey-9">镜像自 <a className="color-blue hoverLine" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                :""
-              }
-            </div> */}
             {
               firstSync ? "" :
                 <DetailBanner

src/forge/Main/Index.js

@@ -11,8 +11,9 @@ 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.jpg';
+import banner from '../Images/banner.png';
 import CheckProfile from '../Component/ProfileModal/Profile';
+import AddProjectModal from '../Head/AddProjectModal';
 
 const Search = Input.Search;
 
@@ -291,35 +292,33 @@ class Index extends Component {
         arrows:false,
         adaptiveHeight:true
       }
-      const settings={
-        dots: true,
-        infinite: true,
-        speed: 500,
-        slidesToShow: 6,
-        slidesToScroll: 6,
-        autoplay:false,
-        arrows:false,
-        adaptiveHeight:true
-      }
-
     return (
       <div>
-        <p className="t_project_banner">
-          <img src={banner} width="100%" alt=""/>
-        </p>
-        {/* {
-          recommendOriList && recommendOriList.length>0?
-            <Slider {...settings} className="recommandOri">
-              {
-                recommendOriList.map((i,k)=>{
-                  return(
-                    <li><Link to={''}><img src={getImageUrl(`/${i.avatar_url}`)} alt={i.name} title={i.name} width="80px"/></Link></li>
-                  )
-                })
-              }
-            </Slider>
-          :""
-        } */}
+        <div class="subjectBanner">
+          <img src={banner} width="100%" height="100%" alt=""/>
+          <div class="bannerBox">
+            <div class="subjectleft">
+              <span>头歌开源</span>
+              <span>
+                <span>
+                  <span class="words">让大学绽放开源之花</span>
+                  <p class="font-13" style={{color: "rgb(204, 204, 204)"}}>Powered by Trustie</p>
+                  </span>
+                </span>
+              </div>
+              <CheckProfile {...this.props} sureFunc={()=>this.props.history.push("/projects/deposit/new")}>
+                <i class="iconfont icon-xinjianxiangmu"></i>
+                <a>新建项目</a>
+              </CheckProfile>
+              <a>
+                <i class="iconfont icon-jiaruketang1"></i>
+                <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
+              </a>
+              <a href="https://data.educoder.net/api/attachments/1955244?disposition=inline" target="_blank">
+                <i class="iconfont icon-xinshouzhiyin"></i>新手指引
+              </a>
+            </div>
+          </div>
         {
           recommendList && recommendList.length>0 &&
           <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
@@ -345,7 +344,7 @@ class Index extends Component {
         <div className="ProjectListIndex">
           <div className="list-left">
             <ul className="list-l-Menu">
-              <li className="MenuTitle"><i className="iconfont icon-xiangmuleixing color-grey-9 font-15 mr5"></i>项目类型</li>
+              <li className="MenuTitle"><i className="iconfont icson-xiangmuleixing color-grey-9 font-15 mr5"></i>项目类型</li>
               {typeList}
             </ul>
             <ul className="list-l-Menu">

src/forge/Main/list.scss

@@ -1,10 +1,78 @@
 
 .lineH2{line-height:2}
-.t_project_banner {
-  /* height: 260px;
-  background: url(../Images/banner_list.jpg) no-repeat center; */
+.subjectBanner {
+  height: 160px;
+  position: relative;
+  overflow: hidden;
   background-color: #050d34;
 }
+.subjectleft{
+  margin-top: 40px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+  align-items: center;
+}
+.bannerBox{
+  width: 1200px;
+  position: absolute;
+  z-index: 2;
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+.subjectleft>span:first-child{
+  width: 140px;
+  height: 30px;
+  font-size: 30px;
+  font-weight: 600;
+  color: #fff;
+  line-height: 30px;
+  letter-spacing: 4px;
+}
+.subjectleft>span:last-child{
+  height: 16px;
+  font-size: 16px;
+  color: #fff;
+  line-height: 16px;
+  margin-left: 16px;
+}
+.subjectleft>span:last-child .words{
+  letter-spacing: 3px;
+  display: block;
+  margin-top: -6px;
+  margin-bottom: 2px!important;
+}
+.bannerBox > a{
+  display: inline-block;
+  width: 104px;
+  height: 30px;
+  line-height: 28px;
+  text-align: center;
+  border-radius: 4px;
+  border: 1px solid #666;
+  margin-right: 30px;
+  margin-top: 30px;
+  color: #fff;
+  cursor: pointer;
+}
+.bannerBox .ant-btn{
+  margin-top: 30px;
+  height: 40px;
+  font-size: 16px;
+  width: 120px;
+  border-radius: 4px;
+  margin-right: 40px;
+}
+
+.bannerBox > a > i{
+  font-size: 14px!important;
+  display: inline-block;
+  margin-right: 10px;
+}
+.bannerBox > a > a{
+  color: #fff!important;
+}
 .ProjectListIndex{
   width: 1200px;
   margin:20px auto;
@@ -53,8 +121,9 @@
   justify-content: space-between;
   flex-wrap: wrap;
   align-items: center;
-  padding:25px 30px; 
+  padding:0px 30px; 
   border-bottom: 1px solid #E0E0E0;
+  height: 62px;
 }
 .list-r-Search{
   width: 400px;

src/forge/Main/sub/DetailBanner.jsx

@@ -20,7 +20,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
   return(
     <div className="f-wrap-between mt25">
       {
-        menuName && projectDetail ? 
+        menuName && menuName.length> 0 && projectDetail ? 
         <ul className="headerMenu-wrapper">
           {
            Array.isArray(menuName)&& menuName.map((item,key)=>{
@@ -66,7 +66,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                       </Link>
                     </li>:""
                   }
-                  {
+                  {/* {
                     item.menu_name === "wiki" &&
                     <li className={pathname === "wiki" ? "active" : ""}>
                       <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
@@ -74,7 +74,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                         <span>Wiki</span>
                       </Link>
                     </li>
-                  }
+                  } */}
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>

src/forge/Main/tree/Index.jsx

@@ -4,6 +4,7 @@ import { truncateCommitId } from '../../common/util';
 import { Link } from 'react-router-dom';
 import { getImageUrl } from 'educoder';
 import { Dropdown , Menu , Spin } from 'antd';
+import Nodata from '../../Nodata';
 import './Index.scss';
 
 import Tree from '../img/tree.png';
@@ -107,6 +108,9 @@ function Index(props) {
             )
           })
         }
+        {
+          list && list.length === 0 && <Nodata _html="暂无数据"/>
+        }
       </div>
     </Spin>
   )

src/forge/Merge/MergeSubmit.js

@@ -102,7 +102,7 @@ class MergeSubmit extends Component{
           <span className="f-wrap-alignCenter">
             <Link to={`/${item.login}`} className="show-user-link">
                 <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
-          <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
+          <label className="hide-1" style={{maxWidth:"75px",verticalAlign:'middle'}}>{text}</label>
           </Link>
           </span>
         ),

src/forge/Notice/Index.jsx

@@ -18,6 +18,7 @@ function Index(props){
   const username = props.match.params.username;
   const pathname = props.history.location.pathname;
   const user = props.user;
+  const undo_messages = props.undo_messages;
 
   const [ menu , setMenu ] = useState("undo");
   const [ messagesCount , setMessagesCount ] = useState(0);

src/forge/Notice/Notify.jsx

@@ -14,8 +14,24 @@ function Notify(props){
   const [ isSpin , setIsSpin ] = useState(true);
 
   useEffect(()=>{
-    props && props.deleteEvent("notify",0);
-  },[])
+    if(username){
+      getList();
+    }
+  },[username,page])
+
+  function getList(){
+    const url = `/users/${username}/applied_messages.json`;
+    Axios.get(url,{
+      params:{
+        page,per_page:limit
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data.applied_messages);
+        setTotal(result.data.total_count);
+      }
+    }).catch(error=>{})
+  }
 
   useEffect(()=>{
     if(username){
@@ -71,6 +87,20 @@ function Notify(props){
     }
   }
 
+  function renderApplyStatus(status,applied) {
+    let { project } = applied;
+    if(status){
+      switch(status){
+        case 'successed':
+          return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+        default:
+          return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+      }
+    }else{
+      return ""
+    }
+  }
+
   return(
     <div>
       <Spin spinning={isSpin}>

src/forge/Notice/UndoEvent.jsx

@@ -14,6 +14,7 @@ function UndoEvent(props){
   const [ total , setTotal ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
 
+
   useEffect(()=>{
     if(username){
       setIsSpin(true);
@@ -93,7 +94,7 @@ function UndoEvent(props){
                           i.status === "canceled" && <span className="color-grey-9">对方已取消转移</span>
                         }
                         {
-                          i.status === "accepted" && <span className="color-grey-9">已接受</span>
+                          i.status === "accept" && <span className="color-grey-9">已接受</span>
                         }
                         {
                           i.status === "refused" && <span className="color-grey-9">已拒绝</span>

src/forge/Settings/Setting.js

@@ -14,7 +14,7 @@ const menu = [
   {name:"代码库",index:"code"},
   {name:"易修 (Issue)",index:"issues"},
   {name:"合并请求",index:"pulls"},
-  {name:"Wiki",index:"wiki"},
+  // {name:"Wiki",index:"wiki"},
   {name:"工作流(beta版)",index:"devops"},
   // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
@@ -31,7 +31,8 @@ class Setting extends Component {
       project_units:['home',"activity","code"],
       divertVisible:false,
       is_transfering:undefined,
-      projectName:undefined
+      projectName:undefined,
+      permission:undefined
     };
   }
 
@@ -245,6 +246,7 @@ class Setting extends Component {
     let mirror = projectDetail && projectDetail.mirror;
     let type = projectDetail && projectDetail.type;
     const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id;
+
     return (
       <div>
         <DivertModal 

src/forge/Source/Index.jsx

@@ -1,18 +1,17 @@
 import React, { useEffect, useState } from 'react';
 import './Index.scss';
-import { AlignCenter, Blueback , FlexAJ } from '../Component/layout';
-import { Dropdown, Input , Menu , Pagination, Spin , Popconfirm, Button } from 'antd';
+import { Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination } from 'antd';
 import { Link } from 'react-router-dom';
 import UploadSource from './UploadSource';
-import AddTag from './AddTag';
 import { getImageUrl } from 'educoder';
-import Nodata from '../Nodata';
 import axios from 'axios';
 
 const { Search } = Input;
 const sort = [
   "按上传时间排序",
-  "按下载次数排序"
+  "按下载次数排序",
+  "按引用排序"
 ]
 const limit = 15;
 const https = 'https://testfiles.trustie.net';
@@ -22,22 +21,13 @@ function Index(props){
   const [ total , setTotal ] = useState(0);
   const [ search , setSearch ] = useState(undefined);
   const [ data , setData ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(true);
-  const [ error , setError ] = useState(false);
-  const [ attachments , setAttachments ] = useState(undefined);
-  
-  const [ id , setId ] = useState(undefined);
 
   const [ visible , setVisible ] = useState(false);
-  const [ addVisible , setAddVisible ] = useState(false);
-  
   const repo_id = props.projectDetail && props.projectDetail.repo_id;
   const owner = props.match.params.owner;
-  const current_user = props.current_user;
 
   useEffect(()=>{
     if(owner && repo_id){
-      setIsSpin(true);
       getData();
     }
   },[repo_id,owner,search,sortValue,page])
@@ -56,10 +46,8 @@ function Index(props){
       if(result && result.data){
         setData(result.data.data.rows);
         setTotal(result.data.data.total);
-        setIsSpin(false);
-        setError(false);
       }
-    }).catch(error=>{setIsSpin(false);setError(true);})
+    }).catch(error=>{})
   }
 
   // 搜索
@@ -85,52 +73,16 @@ function Index(props){
     </Menu>
   )
 
-  function listmenu(id,attachments,isPublic){
-    return(
-      <Menu>
-        <Menu.Item onClick={()=>{setId(id);setVisible(true);setAttachments(attachments)}}>更新版本</Menu.Item>
-        <Menu.Item onClick={()=>changeStatus(id,isPublic===1?0:1)}>{isPublic === 1 ? "设为私有":"设为公开"}</Menu.Item>
-        <Menu.Item onClick={()=>deleteSourceFunc(id)}>删除资源</Menu.Item>
-      </Menu>
-    )
-  }
-  // 更细私有状态
-  function changeStatus(id,isPublic){
-    const url = https+`/api/project/achievement/updateStatus`;
-    axios.put(url,{
-      id,status:isPublic
-    }).then(result=>{
-      if(result && result.data){
-        props.showNotification(`资源${isPublic === 1 ? "设为公开":"设为私有"}成功！`);
-        setIsSpin(true);
-        getData();
-      }
-    }).catch({})
-  }
-
-  // 删除资源方法
-  function deleteSourceFunc(id){
-    props.confirm({
-      content: "是否确认删除所选资源文件？",
-      onOk: () => {
-        const url = https + `/api/project/achievement/${id}`;
-        axios.delete(url).then(result=>{
-          if(result && result.data && result.data.code === "1"){
-            props.showNotification("资源删除成功");
-            setIsSpin(true);
-            getData();
-          }
-        })
-      }
-    })
-    
-  }
-    
+  const listmenu=(
+    <Menu>
+      <Menu.Item>更新版本</Menu.Item>
+      <Menu.Item>设为私有</Menu.Item>
+      <Menu.Item>删除资源</Menu.Item>
+    </Menu>
+  )
 
   // 上传资源成功
   function onOk(){
-    setVisible(false);
-    setIsSpin(true);
     getData();
   }
 
@@ -142,42 +94,14 @@ function Index(props){
     }).then(result=>{
       if(result && result.data){
         props.showNotification("标记删除成功");
-        setIsSpin(true);
         getData();
       }
     }).then(error=>{})
   }
 
-  function addPanel(id){
-    setAddVisible(true);
-    setId(id);
-  }
-
-  function onCancelAdd(){
-    setId(undefined);
-    setAddVisible(false);
-  }
-
-  // 添加标签
-  function sureAddTag(values){
-    const url = https+`/api/project/achievement/addTag?id=`+id+`&tagName=`+values.tagName;
-    axios.put(url).then(result=>{
-      if(result){
-        setId(undefined);
-        setAddVisible(false);
-        setIsSpin(true);
-        getData();
-      }
-    })
-  }
 
   return(
     <div className="sourcePanel">
-      <AddTag 
-        visible={addVisible}
-        onCancel={onCancelAdd}
-        onOk={sureAddTag}
-      />
       <UploadSource 
         visible={visible} 
         onCancel={()=>setVisible(false)} 
@@ -185,15 +109,11 @@ function Index(props){
         showNotification={props.showNotification}
         owner={owner}
         projectsId={repo_id}
-        id={id}
-        attachments={attachments}
       />
       <div className="headtitle">
         <FlexAJ>
-          <span className="font-18">资源库{total ? <span>({total})</span>:""}</span>
-          { current_user && current_user.login && (props.projectDetail && props.projectDetail.permission) ?
-            <Blueback onClick={()=>{setId(undefined);setVisible(true);}}>上传资源</Blueback>:""
-          }
+          <span className="font-18">资源库(18)</span>
+          <Blueback onClick={()=>setVisible(true)}>上传资源</Blueback>
         </FlexAJ>
       </div>
       <FlexAJ className="subHeadtitle">
@@ -208,65 +128,43 @@ function Index(props){
           <span className="color-grey-9">{sort[sortValue]}<i className="iconfont icon-sanjiaoxing-down font-16 color-grey-9 ml3"></i></span>
         </Dropdown>
       </FlexAJ>
-      <Spin spinning={isSpin}>
-        <div className="bodycontent">
-        {
-          data && data.length> 0 &&
-          <ul className="bodycontentul">
-            {
-              data.map((item,key)=>{
-                return(
-                  <li>
-                    <Link to= {`/${item.login}`} className="infoImg"><img src={getImageUrl(`/${item.imageUrl}`)} alt="" /></Link>
-                    <div style={{flex:'1',width:"0"}}>
-                      <FlexAJ>
-                        <AlignCenter>
-                          <a href={https+`/busiAttachments/download/${item.attachId}`} download className="infoname">{item.fileName}</a>
-                          <a href={https + `/busiAttachments/view/${item.attachId}`}><i className="iconfont icon-shenqinggongkai font-15 ml10 color-grey-9"></i></a>
-                          {item.isPublic === 0 && <span className="privateTip">私有</span>}
-                        </AlignCenter>
-                        { current_user && current_user.login && 
-                          <Dropdown overlay={()=>listmenu(item.id,item.attachments,item.isPublic)} placement={'bottomRight'}>
-                            <i className="iconfont icon-gengduo1 color-grey-6"></i>
-                          </Dropdown>
-                        }
-                      </FlexAJ>
-                      <p className="infos">
-                        <span>上传时间：<span>{item.uploadTime}</span></span>
-                        <span>文件大小：<span>{item.fileSize}</span></span>
-                        <span>下载：<span>{item.download}</span></span>
-                      </p>
-                      <p className="infodesc task-hide-2">{item.remark}</p>
+      <div className="bodycontent">
+        <ul className="bodycontentul">
+          {
+            data && data.length> 0 && data.map((item,key)=>{
+              return(
+                <li>
+                  <Link to= {`/users/${item.login}`} className="infoImg"><img src={getImageUrl(`${item.imageUrl}`)} alt="" /></Link>
+                  <div style={{flex:'1',width:"0"}}>
+                    <FlexAJ>
+                      <a href={``} className="infoname">{item.fileName}</a>
+                      <Dropdown overlay={listmenu} placement={'bottomRight'}>
+                        <i className="iconfont icon-gengduo1 color-grey-6"></i>
+                      </Dropdown>
+                    </FlexAJ>
+                    <p className="infos">
+                      <span>上传时间：<span>{item.uploadTime}</span></span>
+                      <span>文件大小：<span>{item.fileSize}</span></span>
+                      <span>下载：<span>{item.download}</span></span>
+                    </p>
+                    <p className="infodesc task-hide-2">{item.remark}</p>
+                    { item.tags && item.tags.length>0 && 
                       <div className="infotag">
                         {
-                          item.tags && item.tags.length>0 && item.tags.map((i,k)=>{
+                          item.tags.map((i,k)=>{
                             return(
-                              <span>{i}
-                                {
-                                  current_user && (current_user.login === item.login) ?
-                                  <Popconfirm title="确定要删除当前标签？" onConfirm={()=>removeTagFunc(item.id,i)} okText="是" cancelText="否">
-                                    <i className="iconfont icon-guanbi font-12 ml2"></i>
-                                  </Popconfirm>:""
-                                }
-                              </span>
+                              <span>{i}<i className="iconfont icon-guanbi font-12 ml2" onClick={removeTagFunc}></i></span>
                             )
                           })
                         }
-                        {
-                          current_user && (current_user.login === item.login) &&
-                          <a className="color-blue font-12" onClick={()=>addPanel(item.id)} style={{height:"20px",lineHeight:"20px"}}>+新增标签</a>
-                        }
                       </div>
-                    </div>
-                  </li>
-                )
-              })
-            }
-          </ul>
-        }
-        {
-          ((data && data.length === 0) || error) && <Nodata _html="暂无数据"/>
-        }
+                    }
+                  </div>
+                </li>
+              )
+            })
+          }
+        </ul>
         {
           total > limit && 
           <div className="pt20 pb20 edu-txt-center">
@@ -280,7 +178,6 @@ function Index(props){
           </div>
         }
       </div>
-      </Spin>
     </div>
   )
 }

src/forge/Source/Index.scss

@@ -21,7 +21,6 @@
   }
   .bodycontent{
     padding:0px 20px;
-    min-height: 500px;
     & > ul.bodycontentul > li{
       display: flex;
       border-bottom: 1px solid #eee;
@@ -41,16 +40,6 @@
       .infoname{
         font-size: 16px;
       }
-      .privateTip{
-        display: block;
-        font-size: 12px;
-        margin-left: 10px;
-        background-color: orange;
-        height: 18px;
-        line-height: 18px;
-        padding:0px 3px;
-        color: #fff;
-      }
       .infos{
         & > span{
           margin-right: 20px;
@@ -84,26 +73,4 @@
       }
     }
   }
-}
-.versionTable{
-  .currentTip{
-    display: block;
-    padding:0px 3px;
-    border-radius: 2px;
-    border:1px solid #68c7ec;
-    font-size: 12px;
-    color: #68c7ec;
-    height: 18px;
-    line-height: 18px;
-    margin-left: 5px;
-  }
-  .ant-table-body{
-    margin:0px!important;
-    thead{
-      background-color: #eee;
-    }
-    thead >tr >th,tbody > tr > td{
-      padding:4px 5px!important;
-    }
-  }
 }

src/forge/Source/Upload.jsx

@@ -79,4 +79,4 @@ function Uploads({ className , size , actionUrl,fileList,showNotification , load
     </Upload>
   )
 }
-export default Uploads;
+export default Uploads;

src/forge/Source/UploadSource.jsx

@@ -5,18 +5,18 @@ import { AlignCenter } from '../Component/layout';
 import axios from 'axios';
 const { TextArea } = Input;
 
+const data = [
+  {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"},
+  {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"},
+  {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"}
+]
 const https = 'https://testfiles.trustie.net';
-function UploadSource({ form , visible , onCancel , onOk , showNotification , attachments , id ,owner,projectsId}){
-  const [ tableData , setTableData ] = useState(undefined);
+function UploadSource({ form , visible , onCancel , onOk , showNotification ,owner,projectsId}){
+  const [ tableData , setTableData ] = useState(data);
   const [ fileId , setFilesId ] = useState(undefined);
   const [ fileName , setFileName ] = useState(undefined);
   const { getFieldDecorator, validateFields , setFieldsValue } = form;
 
-  useEffect(()=>{
-    if(id && attachments){
-      setTableData(attachments);
-    }
-  },[id,attachments])
   // 上传附件后得到的文件id数组
   function UploadFunc(id,name){
     setFilesId(id);
@@ -25,36 +25,37 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
 
   const columns = [
     {
-      dataIndex:"fileName",
-      key:"fileName",
+      dataIndex:"name",
+      key:"name",
       title:"资源名称",
-      width:"42%",
+      width:"45%",
       ellipsis:true,
       render:(value,item,key)=>{
         return <AlignCenter>
-          <div className="task-hide" style={{maxWidth:key===0 ? "240px":"100%"}}>{value}</div>
+          <div className="task-hide" style={{maxWidth:key===0 ? "250px":"100%"}}>{value}</div>
           { key === 0 && <span className="currentTip">当前版本</span> }
         </AlignCenter>
       }
     },
     {
-      dataIndex:"downloads",
-      key:"downloads",
+      dataIndex:"loadNum",
+      key:"loadNum",
       title:"下载数",
-      width:"14%",
+      width:"15%",
       className:"edu-txt-center"
     },
     {
-      dataIndex:"fileSizeString",
-      key:"fileSizeString",
-      title:"文件大小",
-      width:"16%",
+      dataIndex:"citeNum",
+      key:"citeNum",
+      title:"引用数",
+      width:"15%",
       className:"edu-txt-center"
     },
     {
-      dataIndex:"createdAt",
-      key:"createdAt",
+      dataIndex:"time",
+      key:"time",
       title:"上传时间",
+      width:"25%"
     }
   ]
 
@@ -73,35 +74,22 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
 
   function postInfo(values){
     const url = https+`/api/project/achievement/`;
-    if(id){
-      // 修改
-      axios.put(url,{
-        id,fileName,fileId:`${fileId}`,
-        remark:values.remark
-      }).then(result=>{
-        if(result && result.data){
-          onOk();
-        }
-      }).catch(error=>{})
-    }else{
-      // 上传
-      axios.post(url,{
-        fileId:`${fileId}`,
-        fileName,
-        login:owner,
-        projectId:projectsId,
-        ...values
-      }).then(result=>{
-        if(result && result.data){
-          onOk();
-        }
-      }).catch(error=>{})
-    }
     
+    axios.post(url,{
+      fileId:`${fileId}`,
+      fileName,
+      login:owner,
+      projectId:projectsId,
+      ...values
+    }).then(result=>{
+      if(result && result.data){
+        onOk();
+      }
+    }).catch(error=>{})
   }
   return(
     <Modal 
-      title={id?"更新资源版本":"上传资源"}
+      title={"上传资源"}
       closable={false}
       visible={visible}
       onCancel={onCancel}
@@ -113,8 +101,8 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
     >
       <div>
         <Form>
-          {id && <Table className="versionTable mb20" columns={columns} dataSource={tableData} pagination={false} size={"small"}/> }
-          <Form.Item style={{display:id?"none":"block"}}>
+          <Table className="versionTable" columns={columns} dataSource={tableData} pagination={false} size={"small"}/>
+          <Form.Item>
             {getFieldDecorator("tagNames",{
               rules:[]
             })(
@@ -147,4 +135,4 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
     </Modal>
   )
 }
-export default Form.create()(forwardRef(UploadSource));;
+export default UploadSource;

src/forge/Team/Group/GroupForm.jsx

@@ -218,7 +218,7 @@ export default Form.create()(
                 [],
                 <Checkbox checked={check_box} onChange={change_check_box_status} style={OptionStyle}>新建项目<span className="color-grey-8 ml10">(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限)</span></Checkbox>, false, 20,onwers ? "hide":""
               )}
-              {helper(
+              {/* {helper(
                 '版本库权限：',
                 "authorize",
                 [],
@@ -227,7 +227,7 @@ export default Form.create()(
                   <Radio value="write" style={addStyle}>写入权限<span className="color-grey-8 ml10">(成员可以查看和推送提交到团队项目)</span></Radio>
                   <Radio value="admin" style={OptionStyle}>管理员权限<span className="color-grey-8 ml10">(成员可以拉取和推送到团队项目同时可以添加协作者)</span></Radio>
                 </Radio.Group>, false, 20,onwers ? "hide":""
-              )}
+              )} */}
             </Form>
             {/* <div className={(auth!=="owner" && auth !=="admin") ? "" :"hide"}>
               <p className="required">允许访问项目单元：</p>

src/forge/Wiki/Index.jsx

@@ -217,7 +217,6 @@ export default (props) => {
                 <Button type="default" className="ml10">导出<Icon type="caret-down" /></Button>
               </Dropdown>
               <Button type="default" className="ml10" onClick={preview}>预览</Button>
-
             </div>
           </div>
 

src/forge/Wiki/components/Login/index.scss

@@ -0,0 +1,56 @@
+.delete-modal {
+  .ant-modal-header {
+    padding: 9px 24px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #eee;
+  }
+  .ant-modal-title {
+    text-align: left;
+  }
+  .ant-modal-close {
+    top: 0px !important;
+  }
+  .ant-modal-close-x {
+    font-size: 24px;
+  }
+  .ant-modal-body {
+    text-align: center;
+  }
+  .delete-title {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 2rem 0 1rem !important;
+    font-size: 16px;
+    color: #333;
+    letter-spacing: 0;
+    line-height: 29px;
+    font-weight: 400;
+  }
+  .red-circle {
+    align-self: flex-start;
+    color: #ca0002;
+    font-size: 1.5rem !important;
+  }
+  .delete-descibe {
+    font-size: 14px;
+    color: #666;
+    line-height: 33px;
+    font-weight: 400;
+  }
+  .ant-modal-footer {
+    padding: 2rem 0;
+    text-align: center;
+    border: 0;
+    .ant-btn {
+      width: 6rem;
+    }
+  }
+  .foot-submit {
+    margin-left: 3rem;
+    color: #df0002;
+    &:hover {
+      border-color: #df0002;
+    }
+  }
+}

src/forge/Wiki/fetch.js

@@ -12,7 +12,7 @@ if (window.location.href.indexOf('localhost') > -1) {
   actionUrl = "https://test-search.trustie.net";
   // actionUrl = 'https://testforgeplus.trustie.net';
   axios.defaults.withCredentials = true;
-}else if (window.location.href.indexOf('forgeplus') > -1) {
+}else if (window.location.href.indexOf('wiki-api') > -1) {
   actionUrl = "https://wiki-api.trustie.net";
   axios.defaults.withCredentials = true;
 }

src/forge/users/Echart/Cloud.jsx

@@ -13,8 +13,10 @@ function Cloud({data}) {
     var div = new Js2WordCloud(document.getElementById('cloud'))
     let textList= d.categories;
     let cyList=[]
-    for(let i=0;i<textList.length;i++){
-      cyList.push([textList[i],textList.length-i])
+    if(textList && textList.length > 0){
+      for(let i=0;i<textList.length;i++){
+        cyList.push([textList[i],textList.length-i]);
+      }
     }
     div.setOption({
       backgroundColor:'transparent',

src/forge/users/GeneralView/ConcentrateBox.jsx

@@ -6,7 +6,7 @@ import CheckProfile from '../../Component/ProfileModal/Profile';
 
 const { Search } = Input;
 const limit = 20;
-function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile }) {
+function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile , current_user }) {
   const [ page , setPage ]= useState(1);
   const [ total , setTotal ]= useState(0);
   const [ pageSize , setPageSize ] = useState(false);
@@ -16,12 +16,14 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
   const [ value , setValue ]= useState([]);
   const [ isSpin , setIsSpin ]= useState(true);
   const [ disable , setDisable ] = useState(false);
+  const [ loadCount , setLoadCount ] = useState(0);
 
   const [ copyList , setCopyList ] = useState([]);
   const [ copyAllList , setCopyAllList ] = useState([]);
   
   useEffect(()=>{
-    if(visible){
+    if(visible && loadCount === 0){
+      setLoadCount(loadCount+1);
       setIsSpin(true);
       getProjectList();
     }else{
@@ -169,6 +171,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
           (list && list.length === 0) && (copyList && copyList.length === 0) && 
           <div style={{textAlign:"center"}}>您还没有公开的{search && `“${search}”`}项目，先去
             <CheckProfile 
+              current_user={current_user}
               showCompeleteDialog={showCompeleteDialog}
               completeProfile={completeProfile}
               sureFunc={()=>{history.push(`/projects/deposit/new`)}} 

src/forge/users/Infos.js

@@ -133,12 +133,7 @@ class Infos extends Component {
         undo_events:e
       });
     })
-    .catch((error) => {
-      this.setState({
-        isSpin: false,
-      });
-    });
-  };
+  }
 
   change_devops_type=(type)=>{
     const {user} = this.state;
@@ -194,7 +189,7 @@ class Infos extends Component {
   render() {
     const { current_user } = this.props;
     const { username } = this.props.match.params;
-    const { user, isSpin, route_type , undo_events , menuKey } = this.state;
+    const { user, isSpin, route_type , undo_events , menuKey , project_type } = this.state;
     return (
       <div className="newMain clearfix">
         <Spin spinning={isSpin}>
@@ -207,14 +202,14 @@ class Infos extends Component {
                     <span>
                       {
                         user && user.gender===1?
-                        <i className="iconfont icon-nan1"></i>
+                        <i className="iconfont icon-nan"></i>
                         :
-                        <i className="iconfont icon-nv1"></i>
+                        <i className="iconfont icon-nv"></i>
                       }
                     </span>
                   </span>
                   
-                  <div className="text-center mt15 font-24 task-hide" title={user && user.username}>
+                  <div className="text-center mt15 font-16 fwb">
                     {user && user.username}
                   </div>
                   <div className="userDescription">

src/forge/users/Statistics/Index.jsx

@@ -143,18 +143,18 @@ function Index(props) {
             topThree && topThree.length > 0 && 
             <div className="roundBox">
               <Round num={topThree[0][1]} color="#FF7F69" name={topThree[0][0]}/>
-              { topThree[1] && <Round num={topThree[1][1]} color="#99dfff" name={topThree[1][0]}/> }
-              { topThree[2] && <Round num={topThree[2][1]} color="#ff9e48" name={topThree[2][0]}/> }
+              <Round num={topThree[1][1]} color="#99dfff" name={topThree[1][0]}/>
+              <Round num={topThree[2][1]} color="#ff9e48" name={topThree[2][0]}/>
             </div>
           }
           {
             percentData &&
             <div className="pBox">
-              <div className="progress">
+              <div class="progress">
                 {
                   percentData.map((i,k)=>{
                     return(
-                      <span key={i.name} style={{width: `${i.p}%`, backgroundColor:`${i.color}`}}></span>
+                      <span style={{width: `${i.p}%`, backgroundColor:`${i.color}`}}></span>
                     )
                   })
                 }
@@ -163,8 +163,8 @@ function Index(props) {
                 {
                   percentData.map((i,k)=>{
                     return(
-                      <span key={i.name}>
-                        <i className="zero" style={{backgroundColor: `${i.color}`}}></i><span>{i.name}</span>
+                      <span>
+                        <i class="zero" style={{backgroundColor: `${i.color}`}}></i><span>{i.name}</span>
                         <span>{`${i.p}%`}</span>
                       </span>
                     )

src/modules/login/EducoderLogin.js

@@ -1,11 +1,11 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
 import moment from 'moment';
 import { getImageUrl } from 'educoder';
 import '../courses/css/members.css';
 import "../courses/common/formCommon.css";
 import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
-import educodernet from '../../../src/images/login/educodernet.png';
+import educodernet from '../../../src/images/login/logo.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
 import FindPasswordComponent from '../user/FindPasswordComponent';
 //educoder登入页面
@@ -94,84 +94,39 @@ class EducoderLogin extends Component {
 
 
     render() {
-        let {showbool,loginstatus,logini} = this.state;
+        let { showbool } = this.state;
+        const { settings } = this.props;
         return (
             <div style={newContainer} className=" clearfix" >
-
-                <div >
-                    <div style={{
-                        "display": "flex",
-                        "justify-content": "center",
-                        "align-items": "center",
-                        "width": "100%"
-                    }}>
-                        <div style={{cursor:"pointer"}}>
-                            {this.props.mygetHelmetapi === null ? ""
-                              :
-                                this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
-                                  :
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
-                            }
-
-                        </div>
-
-
+                <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
+                    <div style={{cursor:"pointer"}}>
+                        {
+                            settings && settings.login_logo_url ?
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/>
+                            :
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
+                        }
                     </div>
                     {
                         showbool === 1 ?
-                            <div style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                width: "100%",
-                                marginTop: "25px",
-                            }}>
-                                <div>
-
-                                    <LoginRegisterComponent {...this.props} {...this.state}
-                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
-
-                                </div>
-
+                        <div style={{
+                            display: "flex",
+                            justifyContent: "center",
+                            width: "100%",
+                            marginTop: "25px",
+                        }}>
+                            <div>
+                                <LoginRegisterComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
                             </div>
+                        </div>
                         :
-                          <div style={{
-                              display: "flex",
-                              justifyContent: "center",
-                              width: "100%",
-                              marginTop: "25px",
-                          }}>
-                              <div >
-                                  <FindPasswordComponent {...this.props} {...this.state}
-                                                         Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
-
-                              </div>
-                          </div>
+                        <div style={{display: "flex",justifyContent: "center",width: "100%",marginTop: "25px",}}>
+                            <div>
+                                <FindPasswordComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
+                            </div>
+                        </div>
                     }
-									{this.props.mygetHelmetapi === null ? 	<div style={{
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:
-									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:this.props.mygetHelmetapi.main_site===true?
-										<div style={{
-											display: "flex",
-											justifyContent: "center",
-											width: "100%",
-										}}>
-											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-										</div>
-										:""
-									}
-
+                    <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                 </div>
             </div>
         )

src/modules/login/LoginDialog.js

@@ -321,8 +321,8 @@ class LoginDialog extends Component {
     return flag;
   }
   componentDidMount() {
-    //true为PC端，false为手机端
-    let flag = this.IsPC();
+
+    let flag = this.IsPC(); //true为PC端，false为手机端
     this.setState({
       isphone: flag
     })
@@ -455,9 +455,10 @@ class LoginDialog extends Component {
   }
 
   render() {
-    let { login, isGoing, isGoingValue, disabled , Phonenumberisnotco , dialogBox, isRender, weixinlogin } = this.state;
-    let { settings } = this.props;
+    let { login, isGoing, isGoingValue, disabled, Phonenumberisnotco,
+      dialogBox, isRender, weixinlogin } = this.state;
 
+    let { settings } = this.props;
     if (isRender === undefined) {
       isRender = false
     }

src/modules/question/NewMyShixunModel.js

@@ -1068,11 +1068,6 @@ class NewMyShixunModel extends Component {
 						<style>
 							{
 								`
-						.newHeaders{
-						position: fixed;
-						top: 0px;
-						z-index:  999 !important;
-						}
 						.ant-drawer {
 								z-index: 800 !important;
 						}

src/modules/tpm/TPMIndex.css

@@ -28,12 +28,12 @@ body>.-task-title {
   height:70px;
   min-width: 1200px;
   z-index: 1000;
-  background:rgba(255,255,255,1);
+  background:#001529;
   position: fixed;
   box-shadow: 0px 0px 14px rgb(0 0 0 / 10%);
 }
 .headerContent{
-  width:1200px;
+  padding:0px 25px;
   margin:0px auto;
   display: flex;
   align-items: center;
@@ -135,7 +135,6 @@ body>.-task-title {
   height: 60px !important;
 }
 
-
 .HeaderSearch {
   margin-top: 18px;
   margin-right: 20px;
@@ -328,4 +327,137 @@ body>.-task-title {
 .progress-container {
   flex: 1 0 0;
   margin-left: 20px;
+}
+.newFooter > div{
+  padding: 90px 20px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -ms-flex-align: start;
+  align-items: flex-start;
+  background: #242424;
+  min-width: 1200px;
+}
+
+.newFooter .module-list{
+  width: 200px;
+  text-align: left;
+}
+.newFooter .module-list>.title{
+  font-size: 16px;
+  color: #ddd;
+  margin-bottom: 20px;
+  font-weight: 400;
+  background-color: transparent;
+  border: none;
+  padding: 0px;
+}
+.newFooter .module-list a {
+  display: block;
+  color: #bbb;
+  line-height: 34px;
+  font-weight: 300;
+  font-size: 12px;
+}
+.newFooter .module-list a:hover {
+  color: #fff;
+}
+.newFooter .module-introduce{
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -ms-flex-align: center;
+  align-items: center;
+  width: 290px;
+  margin-top: -12px;
+}
+.newFooter .module-introduce p {
+  font-size: 12px;
+  color: #bbb;
+  line-height: 32px;
+  margin-top: 12px;
+  font-weight: 300;
+  text-align: justify;
+}
+.module-introduce ul {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-pack: distribute;
+  justify-content: space-around;
+  padding: 0;
+  margin-top: 20px;
+}
+.module-introduce ul {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-pack: distribute;
+  justify-content: space-around;
+  padding: 0;
+  margin-top: 20px;
+}
+.module-introduce ul li:first-child {
+  margin-right: 50px;
+}
+.module-introduce ul li {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -ms-flex-align: center;
+  align-items: center;
+}
+.module-introduce ul li>span {
+  font-size: 12px;
+  color: #bbb;
+  padding-top: 10px;
+}
+.module-introduce ol {
+  margin-top: 16px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-pack: distribute;
+  justify-content: space-around;
+  padding: 0;
+  height: 108px;
+  width: 100%;
+}
+.module-introduce ol li {
+  height: 100%;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  -ms-flex-align: center;
+  align-items: center;
+}
+.module-introduce ol li a {
+  font-size: 14px;
+  color: #bbb;
+  margin-top: 20px;
+}
+.module-introduce section {
+  width: 100%;
+  height: 115px;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  -ms-flex-align: start;
+  align-items: flex-start;
+  font-size: 14px;
+  color: #bbb;
+  font-weight: 300;
+}
+.module-introduce .footer-line {
+  width: 310px;
+  height: 1px;
+  background-color: #3e4042;
+  margin: 32px 0;
 }

src/modules/tpm/TPMIndexHOC.js

@@ -25,7 +25,6 @@ export function TPMIndexHOC(WrappedComponent) {
 				dataquerys: {},
 				isloginCancel: undefined,
 				mygetHelmetapi: null,
-				giteaVisible:false,
 				email:undefined,
 				completeProfile:false,
 				showCP:false,
@@ -68,6 +67,7 @@ export function TPMIndexHOC(WrappedComponent) {
 
 			///请求定制化的信息
 			this.getAppdata();
+			window.scrollTo(0,0);
 		}
 
 
@@ -161,14 +161,6 @@ export function TPMIndexHOC(WrappedComponent) {
 					if (this.props.match.path === "/" && response.data.login) {
 						this.props.history.push(`/${response.data.login}`);
 					}
-					if(response.data && response.data.login){
-						if(response.data.need_edit_info){
-							this.setState({
-								giteaVisible:true,
-								email:response.data.email
-							})
-						}
-					}
 				}
 			}).catch((error) => {
 				console.log(error)
@@ -192,23 +184,6 @@ export function TPMIndexHOC(WrappedComponent) {
 			return this.state.current_user && this.state.current_user.login != ''
 		}
 
-		onOk =(values)=>{
-			let url = `/users/sync_user_info.json`;
-			const { current_user } = this.state;
-			axios.post(url,{
-				login:current_user && current_user.login,
-				...values
-			}).then(result=>{
-				if(result && result.data && result.data.status === 0){
-					this.setState({
-						giteaVisible:false,
-						email:undefined
-					})
-					window.location.reload();
-				}
-			}).catch(error=>{})
-		}
-
 		showCompeleteDialog=()=>{
 			this.setState({
 				showCP:true
@@ -247,12 +222,14 @@ export function TPMIndexHOC(WrappedComponent) {
 					>
 						<div className="newContainer newContainers">
 							<div style={{height:"70px"}}></div>
+							<div style={{minHeight:"60vh"}}>
 							{
 								current_user &&
 								<WrappedComponent initCommonState={(user) => this.initCommonState(user)}
 									{...this.props} {...this.state} {...common} >
 								</WrappedComponent>
 							}
+							</div>
 						</div>
 					</Spin>
 					<NewFooter {...this.state} {...this.props} />