调整返回

public/react/src/modules/courses/poll/PollNewQuestbank.js

@@ -2434,6 +2434,11 @@ class PollNewQuestbank extends Component {
 		// }
 	}
 	//试图
+	toWorkDetail = () => {
+		this.props.history.push(`/banks/poll/${this.props.match.params.workId}`);
+		this.props.initPublic(undefined);
+	}
+
 	render() {
 		let {
 			addonAfter,
@@ -3525,7 +3530,7 @@ class PollNewQuestbank extends Component {
 						}}
 					>
 						<li className="clearfix mt30 mb50 fr">
-							<a   className="defalutCancelbtn fl mr20"onClick={() => this.props.history.goBack()}>取消</a>
+							<a   className="defalutCancelbtn fl mr20"onClick={() => this.toWorkDetail()}>取消</a>
 							<a type="primary" className="  defalutSubmitbtn fl"
 								 onClick={() => this.submitQuestionnaire()}>提交</a>
 						</li>

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -100,7 +100,7 @@ class BanksIndex extends Component{
             </Breadcrumb>
           }
           
-          <p className="clearfix mt20 mb20">
+          <p className="clearfix mt30">
             <span className="fl font-24 color-grey-3 task-hide lineh-30" style={{maxWidth:'800px'}}>{crumbData && crumbData.title}</span>
             {
               crumbData && <span className="bank_is_public">{crumbData.is_public == true ? '公开':'私有'}</span>
@@ -117,6 +117,7 @@ class BanksIndex extends Component{
                   />)
                 }
             }></Route>
+
             <Route path='/banks/group/:workId/edit'
               render={
                 (props) => {
@@ -180,6 +181,7 @@ class BanksIndex extends Component{
                      (props) => (<Generaljobbankdetails {...this.props} {...props}  {...this.state} {...common} />)
                    }
             ></Route>
+
           </Switch>
 
         </div>

public/react/src/modules/user/usersInfo/banks/GtaskBanksEditEdit.js

@@ -1,7 +1,5 @@
 import React, { Component } from 'react';
 import axios from 'axios'
-
-
 import NewWorkForm from '../../../courses/busyWork/NewWorkForm';
 
 class GtaskBanksEditEdit extends Component {
@@ -61,7 +59,8 @@ class GtaskBanksEditEdit extends Component {
 			});
 	}
 	toWorkDetail = () => {
-		this.props.history.push(`/banks/task/${this.props.match.params.workId}`)
+		this.props.history.push(`/banks/gtask/${this.props.match.params.workId}`);
+		this.props.initPublic(undefined);
 	}
 	onCancel = () => {
 		this.toWorkDetail()

public/react/src/modules/user/usersInfo/banks/GtopicBanksEdit.js

@@ -57,6 +57,7 @@ class GtopicBanksEdit extends Component{
   // 取消
   editCancel = () =>{
     this.props.history.push(`/banks/gtopic/${this.props.match.params.bankId}`);
+		this.props.initPublic(undefined);
   }
 
   render(){

public/react/src/modules/user/usersInfo/banks/HomeworkBanksEdit.js

@@ -65,6 +65,7 @@ class HomeworkBanksEdit extends Component {
   }
   toWorkDetail = () => {
     this.props.history.push(`/banks/${this.getModuleName()}/${this.props.match.params.workId}?tab=0`)
+		this.props.initPublic(undefined);
   }
   onCancel = () => {
     this.toWorkDetail()