diff --git a/src/App.js b/src/App.js
index aae03b9de..8926349c9 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 {
}
/>
- {/*项目*/}
+ {/*新建项目等*/}
{
})
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 978498b22..baa5a2cb0 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" ?
- {item.name}
+ {item.name}
{item.trend_type}
:
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 2423f0007..4ccbfe2ed 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 {
)}
>
+
+ (
+
+ )}
+ >
);
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index ec985ecc2..2265ac20d 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -28,7 +28,7 @@ class IndexItem extends Component {
:
-
+
}
diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx
index 96b9e6876..313739089 100644
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@@ -80,9 +80,10 @@ function Notify(props){
{
list.map((i,k)=>{
+ console.log(i);
return(
-
-
+
{i.applied_user && i.applied_user.name}
diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js
index 48bf65c11..d79c66fea 100644
--- a/src/forge/Order/Milepostitem.js
+++ b/src/forge/Order/Milepostitem.js
@@ -31,7 +31,7 @@ class OrderItem extends Component {
- {item.name}
+ {item.name}
@@ -65,7 +65,7 @@ class OrderItem extends Component {
- 编辑
+ 编辑
diff --git a/src/forge/users/GeneralView/Activity.jsx b/src/forge/users/GeneralView/Activity.jsx
index ce09e885f..cefb45847 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(
-
-
+
- {i.user_name}
+ {i.user_name}
{i.action_time}
{i.priority && TagInfo(`${i.priority}`,"")}
{i.issue_status && {i.issue_status} }
diff --git a/src/modules/search/index.jsx b/src/modules/search/index.jsx
index 483309d7f..3afd1ae5f 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('请输入关键字');