From 4f39f03b1993d7d8020493443280c45978d85f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 2 Sep 2021 17:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1=E7=9A=84is?=
 =?UTF-8?q?sue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                               |  5 ++---
 src/AppConfig.js                         |  4 ++--
 src/forge/Activity/ActivityItem.js       |  2 +-
 src/forge/Index.js                       | 18 +++++++++++++++---
 src/forge/Main/IndexItem.js              |  2 +-
 src/forge/Notice/Notify.jsx              |  3 ++-
 src/forge/Order/Milepostitem.js          |  4 ++--
 src/forge/users/GeneralView/Activity.jsx |  4 ++--
 src/modules/search/index.jsx             |  7 ++-----
 9 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/App.js b/src/App.js
index aae03b9d..8926349c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -105,7 +105,7 @@ class App extends Component {
 			occupation: 0,
 			mygetHelmetapi: null,
 			pathType: null,
-			pathName: '',
+			pathName: null,
 		}
 	}
 
@@ -175,7 +175,6 @@ class App extends Component {
 			const msg = `${event.type}: ${event.message}`;
 		});
 
-
 	}
 
 	componentWillUnmount() {
@@ -317,7 +316,7 @@ class App extends Component {
 								}
 							/>
 
-							{/*项目*/}
+							{/*新建项目等*/}
 							<Route
 								path={"/projects"}
 								render={
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 5849a85f..825a2a3b 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -11,9 +11,9 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list) {
-  if (window.location.port !== "3007") {
+  // if (window.location.port !== "3007") {
   window.location.href = list
-  }
+  // }
 }
 // TODO 开发期多个身份切换
 let debugType = ""
diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js
index 978498b2..baa5a2cb 100644
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@@ -14,7 +14,7 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 2423f000..4ccbfe2e 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -12,8 +12,13 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 
+//404页面
+const Shixunnopage = Loadable({
+  loader: () => import('./modules/404/Shixunnopage'),
+  loading: Loading,
+})
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
   loading: Loading,
 });
 const ProjectIndex = Loadable({
@@ -29,8 +34,8 @@ const ProjectIndex = Loadable({
 
 class Index extends Component {
 
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
+  componentDidUpdate = () => {
+    this.props.history.listen(() => {
       if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
         window.scrollTo(0, 0)
       }
@@ -70,6 +75,13 @@ class Index extends Component {
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+          <Route path="/projects" component={Shixunnopage} />
+          <Route
+            path="/"
+            render={(props) => (
+              <ProjectIndex {...this.props} {...props} />
+            )}
+          ></Route>
         </Switch>
       </div>
     );
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index ec985ecc..2265ac20 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -28,7 +28,7 @@ class IndexItem extends Component {
                   <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
                 :
-                <Link to={item.author && item.author.login} className="show-user-link">
+                <Link to={`/${item.author && item.author.login}`} className="show-user-link">
                   <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                 </Link>
               }
diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx
index 96b9e687..31373908 100644
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@@ -80,9 +80,10 @@ function Notify(props){
             <ul className="notifyList">
               {
                 list.map((i,k)=>{
+                  console.log(i);
                   return(
                     <li i={k}>
-                      <Link to={`/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
+                      <Link to={`/${i.applied_user && i.applied_user.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg" /></Link>
                       <div className="notifyFlex">
                         <p className="notifyInfos">
                           <Link to={`/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js
index 48bf65c1..d79c66fe 100644
--- a/src/forge/Order/Milepostitem.js
+++ b/src/forge/Order/Milepostitem.js
@@ -31,7 +31,7 @@ class OrderItem extends Component {
                   <div className="milepostwidth">
                     <div className="grid-item width100">
                       <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
-                      <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                      <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
                     </div>
                   </div>
                 </div>
@@ -65,7 +65,7 @@ class OrderItem extends Component {
                     <div className="milepostleft">
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                        <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                        <Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                       </div>
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
diff --git a/src/forge/users/GeneralView/Activity.jsx b/src/forge/users/GeneralView/Activity.jsx
index ce09e885..cefb4584 100644
--- a/src/forge/users/GeneralView/Activity.jsx
+++ b/src/forge/users/GeneralView/Activity.jsx
@@ -11,10 +11,10 @@ function Activity({list}) {
         list.map((i,k)=>{
           return(
             <li>
-              <Link to={``}><img src={getImageUrl(`/system/lets/letter_avatars/2/D/169_162_140/120.png`)} alt="" className="aImg"/></Link>
+              <Link to={`/${i.user_login}`}><img src={getImageUrl(`/system/lets/letter_avatars/2/D/169_162_140/120.png`)} alt="" className="aImg"/></Link>
               <div className="aInfos">
                 <AlignCenter>
-                  <Link to={``} className="name">{i.user_name}</Link>
+                  <Link to={`/${i.user_login}`} className="name">{i.user_name}</Link>
                   <span className="time">{i.action_time}</span>
                   {i.priority && TagInfo(`${i.priority}`,"")}
                   {i.issue_status && <span className="status">{i.issue_status}</span> }
diff --git a/src/modules/search/index.jsx b/src/modules/search/index.jsx
index 483309d7..3afd1ae5 100644
--- a/src/modules/search/index.jsx
+++ b/src/modules/search/index.jsx
@@ -10,11 +10,6 @@ import './index.scss';
 const { Search } = Input;
 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 GlobalSearch = ({ location, showNotification, history }) => {
 
   const size = 10;
@@ -58,6 +53,8 @@ const GlobalSearch = ({ location, showNotification, history }) => {
   }
 
   function searchDataList() {
+    let chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+    let https = chromesettingArray.common.search || 'https://statistics.trustie.net';
     const url = https + '/search';
     if (!term) {
       // showNotification('请输入关键字');