Merge remote-tracking branch 'origin/topic_bank' into topic_bank

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -49,9 +49,7 @@ class GraduationTasksnew extends Component {
 	}
 
 	Commoninterface =(fileList)=>{
-
 		let listid = []
-
 		for (var list of fileList) {
 			listid.push(list.response.id)
 		}
@@ -59,7 +57,8 @@ class GraduationTasksnew extends Component {
 		this.props.form.validateFields((err, values) => {
 			if (!err) {
 				if (values.tasktype === undefined) {
-						this.scrollToAnchors("tasktypes");
+					this.ifHasAnchorJustScorll("tasktypes");
+					// this.scrollToAnchors("tasktypes");
 					return
 				}
 
@@ -203,10 +202,10 @@ class GraduationTasksnew extends Component {
 	}
 
 	//滚动
-	ifHasAnchorJustScorll() {
+	ifHasAnchorJustScorll(anchor) {
 		// let anchor = this.getURLStuff("anchor");
 
-		let anchor = this.state.anchor;
+		// let anchor = this.state.anchor;
 		// console.log("anchor ", anchor);
 		// 对应id的话, 滚动到相应位置
 		if (!!anchor) {
@@ -361,7 +360,7 @@ class GraduationTasksnew extends Component {
 											`
 										}
 									</style>
-									<Form.Item label="类型" className={"tasktype"}>
+									<Form.Item label="类型" id="tasktype" className={"tasktype"}>
 										{getFieldDecorator('tasktype', {
 											rules: [{required: true, message: "请选择任务类型"}],
 										})(<Select className={"greyInput mb20"}

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

@@ -22,7 +22,7 @@ class GtopicBanksEdit extends Component{
       if(result){
         const crumbData={
           title:'编辑',
-          is_public:result && result.selected_data && result.selected_data.is_public,
+          is_public:result && result.data.selected_data && result.data.selected_data.is_public,
           crumbArray:[
             {to:`/banks/gtopic/${bankId}/edit`,content:'详情'},
             {content:'编辑'}