合并之后影响的样式、功能等

src/AppConfig.js

@@ -25,7 +25,7 @@ if (isDev) {
   }
   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 || 'a'
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

src/common/UrlTool.js

@@ -6,9 +6,9 @@ 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 = "http://192.168.1.40:3000"
 export function getImageUrl(path) {
-	const local = 'http://192.168.1.40:3000';
+	const local = TEST_HOST;
 
 	if (isDev) {
 		return `${local}/${path}`
@@ -37,7 +37,7 @@ 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 = TEST_HOST;
 	if(path.indexOf("http://")===-1){
 		if (isDev) {
 			return `${local}/images/${path}`
@@ -49,11 +49,8 @@ export function getImage(path) {
 }
 
 export function getTestImage(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
 	const local = 'http://117.50.100.12:49999';
-	if(path.indexOf("http://")===-1){
+	if(path && path.indexOf("http://")===-1){
 		if (isDev) {
 			return `${local}${path}`
 		}
@@ -132,7 +129,7 @@ export function setImagesUrl(path){
 }
 
 export function getUrl(path, goTest) {
-	const local = 'http://39.105.176.215:49999'
+	const local = TEST_HOST;
 	if (isDev) {
 		return `${local}${path?path:''}`
 	}

src/forge/Head/Footer.jsx

@@ -19,6 +19,7 @@ function Footer(){
 
   return(
     <div>
+      <div style={{height:'107px'}}></div>
       {value && showhtml(value)}
     </div>
         // {/* <div className="footEdition"> 

src/forge/Head/Header.js

@@ -182,7 +182,7 @@ class NewHeader extends Component {
   geturlsdata = () => {
     let url = "/setting.json";
     axios.get(url).then((response) => {
-      if (response && response.data) {
+      if (response && response.data && response.data.setting) {
         this.setState({ settings: response.data.setting });
         localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
         localStorage.setItem('chromesettingresponse', JSON.stringify(response));

src/forge/Head/header.scss

@@ -77,6 +77,7 @@
   min-width: 1200px;
   z-index: 8;
   left: 0px;
+  padding-bottom: 15px;
   p {
     margin-top: 0;
     margin-bottom:0px !important;

src/forge/Main/sub/DetailBanner.jsx

@@ -66,17 +66,16 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                       </Link>
                     </li>:""
                   }
-                  {
+                  {/* {
                     item.menu_name === "devops" ? 
                     <li className={pathname==="devops" ? "active" : ""}>
-                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
                       <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
                         <i className="iconfont icon-gongzuoliuicon font-13 mr5 color-grey-3"></i>引擎(Engine)
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
                     </li>
                     :""
-                  }
+                  } */}
                   {/* {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>

src/forge/Main/version/version.scss

@@ -59,6 +59,8 @@
   }
   .body-show{
     padding: 5px 10px 10px 10px;
+    width: 100%;
+    box-sizing: border-box;
   }
   & .version-user>a>span{
     display: inline-block;
@@ -108,6 +110,7 @@
   margin-top: 5px;
   padding-top: 20px;
   border-top: 1px solid #eee;
+  width: 100%;
   // width: 100%;
   a{
     display: block;

src/forge/Order/order_form.js

@@ -81,10 +81,9 @@ class order_form extends Component {
       if (result) {
         let data ={
           branch_name: result.data.branch_name,
-          issue_tag_ids: [
+          issue_tag_ids:result.data.issue_tags && result.data.issue_tags[0].id ? 
-            result.data.issue_tags && result.data.issue_tags[0].id ? 
+              String(result.data.issue_tags[0].id) : []
-              String(result.data.issue_tags[0].id) : "",
+          ,
-          ],
           fixed_version_id: result.data.fixed_version_id ? String(result.data.fixed_version_id) : "",
           tracker_id: result.data.tracker_id ? String(result.data.tracker_id) : "",
           issue_type: result.data.issue_type,

src/forge/Settings/Index.js

@@ -115,10 +115,10 @@ class Index extends Component {
             {
               projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
               <li
-                className={pathname.indexOf("setting/special") > -1 ? "active" : ""}
+                className={pathname.indexOf("settings/special") > -1 ? "active" : ""}
               >
                 <p>
-                  <Link to={`/projects/${owner}/${projectsId}/setting/special`} className="w-100">
+                  <Link to={`/${owner}/${projectsId}/settings/special`} className="w-100">
                     <i className="iconfont icon-jingyan font-18 mr10"></i>
                     特殊开源许可证项目管理
                   </Link>
@@ -172,7 +172,7 @@ class Index extends Component {
               ></Route>
               
               <Route
-                path="/projects/:owner/:projectsId/setting/special"
+                path="/:owner/:projectsId/settings/special"
                 render={(props) => (
                   <Special {...this.props} {...props} {...this.state} />
                 )}

src/forge/Settings/Webhooks/New.jsx

@@ -180,9 +180,12 @@ function New({ form , match , showNotification , history }) {
         subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
       />
       <Banner>
-        <Link to={`/${owner}/${projectsId}/settings/webhooks`} className="color-blue">Webhooks</Link>
+        <Link to={`/${owner}/${projectsId}/settings/webhooks`} className="color-blue">
-        <i className="iconfont icon-youjiantou ml5 mr5 font-12"></i>
+          <i className="iconfont icon-zuojiantou mr5 font-16"></i>
-        <span>{id ? "更新" : "添加"}Webhook</span>
+          Webhooks
+        </Link>
+        
+        {/* <Button type="primary" size="large">{id ? "更新" : "添加"}Webhook</Button> */}
       </Banner>
       <div>
         <p className="deschead mg"><span>当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>。</span></p>

src/modules/tpm/TPMIndexHOC.js

@@ -279,7 +279,10 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
 							}
 						</div>
 					</Spin>
+					{
+						headFoot && headFoot.noFooter ? "" :
 						<NewFooter {...this.state} {...this.props} />
+					}
 				</div>
 			);
 		}