diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index d2b1c1850..230b5cf78 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -189,9 +189,9 @@ class order_form extends Component {
issue_type: issue_type,
})
.then((result) => {
- if (result) {
+ if (result && result.data.id) {
this.props.showNotification("任务创建成功！");
- this.props.history.push(`/projects/${projectsId}/orders`);
+ this.props.history.push(`/projects/${projectsId}/orders/${result.data.id}/detail`);
this.setState({
description: "",
isSpin: false,
diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx
index 561cf3c9f..e92e5429c 100644
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@@ -6,6 +6,7 @@ import { withRouter } from "react-router";
import { SnackbarHOC } from "educoder";
import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+import Handbook from '../Component/Handbook';
const Infos = Loadable({
loader: () => import("./Infos"),
loading: Loading,
@@ -13,14 +14,17 @@ const Infos = Loadable({
export default withRouter(
(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props)=>{
return(
-
- (
-
- )}
- >
-
+
+
+
+ (
+
+ )}
+ >
+
+
)
}))))
)
\ No newline at end of file
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 237bdb928..1b9e0e054 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -57,7 +57,6 @@ class NewHeader extends Component {
componentDidMount() {
this.getAppdata();
window._header_componentHandler = this;
-
//下拉框的显示隐藏
var hoverTimeout;
var hoveredPanel;
@@ -79,13 +78,10 @@ class NewHeader extends Component {
}, 800)
});
-
//获取游览器地址
try {
window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href))
- } catch (e) {
-
- }
+ } catch (e) {}
}
openNotification = (messge) => {
@@ -125,16 +121,15 @@ class NewHeader extends Component {
const url = `/accounts/logout.json`
this.delCookie("autologin_trustie")
axios.get(url, {
- })
- .then((response) => {
- if (response.data.status === 1) {
- this.setState({
- user: undefined
- })
- window.location.href = "/login"
- message.success('退出成功');
- }
- });
+ }).then((response) => {
+ if (response.data.status === 1) {
+ this.setState({
+ user: undefined
+ })
+ window.location.href = "/login"
+ message.success('退出成功');
+ }
+ });
}
tojoinclass = () => {
@@ -151,14 +146,12 @@ class NewHeader extends Component {
})
return;
}
-
if (user && user.profile_completed === false) {
this.setState({
AccountProfiletype: true
})
return;
}
-
this.setState({
Addcoursestypes: true,
})
@@ -345,7 +338,7 @@ class NewHeader extends Component {
let pamst = [];
let num = 0;
for (var i = 0; i < newrolearr.length; i++) {
- if (newrolearr[i] != "") {
+ if (newrolearr[i] !== "") {
pamst.push(newrolearr[i])
} else {
num = num + 1
@@ -416,7 +409,6 @@ class NewHeader extends Component {
this.setState({
showSearchOpentype: true
})
-
}
hideshowSearchOpen = (e) => {
@@ -426,7 +418,6 @@ class NewHeader extends Component {
showSearchOpentype: false,
setevaluatinghides: false
})
-
}
}
@@ -436,19 +427,15 @@ class NewHeader extends Component {
}
onKeywordSearchKeyDowns = () => {
- this.setState(
- {
- setevaluatinghides: false
- }
- )
+ this.setState({
+ setevaluatinghides: false
+ })
}
setevaluatinghides = () => {
- this.setState(
- {
- setevaluatinghides: true
- }
- )
+ this.setState({
+ setevaluatinghides: true
+ })
}
//头部获取是否已经登录了
getUser = (url, type) => {
@@ -538,15 +525,12 @@ class NewHeader extends Component {
document.head.appendChild(link);
}
-
handleVisibleChanges = (boll) => {
this.setState({
visiblemyss: boll,
})
-
}
-
getAppdata = () => {
try {
var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
@@ -583,19 +567,12 @@ class NewHeader extends Component {
} catch (e) {
this.gettablogourlnull();
}
-
-
} else {
-
this.gettablogourlnull();
-
}
-
} else {
this.gettablogourlnull();
-
}
-
}).catch((error) => {
this.gettablogourlnull();
@@ -683,7 +660,6 @@ class NewHeader extends Component {
}
let headtypes = '/';
-
if (mygetHelmetapi2) {
if (mygetHelmetapi2.navbar) {
if (mygetHelmetapi2.navbar.length > 0) {
@@ -747,78 +723,52 @@ class NewHeader extends Component {
{...this.props}
{...this.state}
/> : ""}
-
{
goshowqqgtounp === true ?
-
this.setgoshowqqgtounp(bool)}>
- :
- ""
+
this.setgoshowqqgtounp(bool)}>
+ :
+ ""
}
-
this.headtypesonClick("/", false)} className={"fl mr30"}>
{
mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url && mygetHelmetapi2.nav_logo_url ?
- })
- :
- ![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
+
+ :
+
}
{
mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ?
-
-
+
+ : ""
}
@@ -914,7 +864,7 @@ class NewHeader extends Component {
-
- 个人中心
+ 个人中心
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses &&