Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/App.js

@@ -288,6 +288,7 @@ class App extends Component {
 			axios.post(url, {
 				url: 'http://pre-newweb.educoder.net',
 			}).then((response) => {
+				console.log('got res')
 				const data = response.data;
 				wx.config({
 					debug: false,
@@ -305,6 +306,7 @@ class App extends Component {
 					]
 				});
 				wx.ready(function () {
+					console.log('wx is ready')
 					var shareData = {
 						title: '这是是分享标题',
 						desc: '这是是摘要',
@@ -322,6 +324,8 @@ class App extends Component {
 			
 				});
 				wx.error(function (res) {
+					console.log('wx is error')
+					console.log(res)
 					//alert(res.errMsg);//错误提示
 			
 				});

public/react/src/modules/courses/coursesPublic/AccessoryModal2.js

@@ -34,6 +34,7 @@ class AccessoryModal2 extends Component{
   }
   // 附件相关 START
   handleChange = (info) => {
+		if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed'){
 			let fileList = info.fileList;
 			console.log(fileList)
 			// for(var list of fileList ){
@@ -42,6 +43,8 @@ class AccessoryModal2 extends Component{
 			this.setState({ fileList });
 		}
 
+  }
+
   onAttachmentRemove = (file) => {
     // confirm({
     //   title: '确定要删除这个附件吗?',

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -253,7 +253,7 @@ class Selectsetting extends Component{
 
 	// 附件相关 START
 	handleChange = (info) => {
-
+		if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			if (info.file.status != "removed") {
 				this.setState({
@@ -265,7 +265,7 @@ class Selectsetting extends Component{
 					fileList: appendFileSizeToUploadFileAll(fileList),
 				});
 			}
-
+		}
 	}
 
 	// onAttachmentRemove = (file) => {

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -86,7 +86,7 @@ class Sendresource extends Component{
 	}
 	// 附件相关 START
 	handleChange = (info) => {
-
+		if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
 			let fileList = info.fileList;
 			if (info.file.status != "removed") {
 				this.setState({
@@ -99,6 +99,7 @@ class Sendresource extends Component{
 				});
 			}
 		}
+	}
 
 	// onAttachmentRemove = (file) => {
 	//

public/react/src/modules/page/component/WebSSHTimer.js

@@ -145,6 +145,9 @@ class WebSSHTimer extends Component {
 	}
 	// 重置命令行的时候调用的接口，会删pod
 	closeWebssh = (callback) => {
+		// 先关socket
+		this.closeWebsshSocket()
+
 		const { game } = this.props;
 		// const url = `/api/v1/games/${game.identifier}/close_webssh`
 		const url = `/tasks/${game.identifier}/close_webssh.json`

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -759,6 +759,7 @@ class Newshixuns extends Component {
 
 	// 附件相关 START
     handleChange = (info) => {
+			if(info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
 				let {fileList} = this.state;
 
 				if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
@@ -768,10 +769,11 @@ class Newshixuns extends Component {
 					this.setState({
 						// fileList:appendFileSizeToUploadFileAll(fileList),
 						fileList: fileLists,
-						deleteisnot:false});
+						deleteisnot: false
+					});
 					// }
 				}
-
+			}
     }
     onAttachmentRemove = (file) => {
 			if(!file.percent || file.percent == 100){