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

public/react/src/AppConfig.js

@@ -2,7 +2,7 @@ import React from "react";
 
 import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
-import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString} from 'educoder';
+import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
 import {  notification } from 'antd';
 import './index.css'
 broadcastChannelOnmessage('refreshPage', () => {
@@ -18,17 +18,10 @@ function locationurl(list){
 }
 
 // TODO 开发期多个身份切换
-let debugType = ""
-if (isDev) {
-  	const _search = window.location.search;
-    let parsed = {};
-    if (_search) {
-      parsed = queryString.parse(_search);
-  	}
-    debugType = window.location.search.indexOf('debug=t') != -1 ?  "cxt" : ''
-}
-	
-window._debugType = debugType;
+const debugType =""
+// 	window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+//         window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
+// window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
     // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
@@ -119,7 +112,7 @@ export function initAxiosInterceptors(props) {
         // https://github.com/axios/axios/issues/583
             // message.info(response.data.message || '服务端返回status -1，请联系管理员。');
             // props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
-            if (window.location.pathname.startsWith('/tasks/')) {    
+            if (window.location.pathname.startsWith('/tasks/')) {
                 props.showSnackbar( response.data.message || '服务器异常，请联系管理员。' )
             } else {
                 notification.open({
@@ -134,7 +127,7 @@ export function initAxiosInterceptors(props) {
                 //   description: response.data.message || '服务器异常，请联系管理员。',
                 // });
             }
-            
+
             throw new axios.Cancel('Operation canceled by the user.');
         }
         // if(response.data.status === 401){
@@ -142,7 +135,6 @@ export function initAxiosInterceptors(props) {
         // }
         if (response.data.status === 403) {
             // props.history.replace('/403')
-					  debugger
             // 这里会分2个情况，1、刚进入页面发请求返回的403；2、进入页面后，其他用户操作触发请求返回的403；
             // TODO 这里做一个403弹框比较好？
             locationurl('/403');

public/react/src/modules/login/LoginDialog.css

@@ -9,7 +9,7 @@
     /* z-index: 20000; */
 }
     #DialogID .dialogBox {
-        width: 402px;
+        width: 400px;
     }
 .MuiPaper-elevation24-45{
     box-shadow:none !important;

public/react/src/modules/user/Interestpage.js

@@ -188,6 +188,10 @@ class InterestpageComponent extends Component {
 			if (response !== undefined) {
       // this.Jumptotheinterestpage();
 			// 	window.location.href = "/"
+				if(response.data.message!==undefined){
+
+					return;
+				}
 				this.setMyEduCoderModals()
 			}
 

public/react/src/modules/user/InterestpageMax.js

@@ -189,6 +189,11 @@ class InterestpageMax extends Component {
 			if (response !== undefined) {
 				// this.Jumptotheinterestpage();
 				// 	window.location.href = "/"
+
+				if(response.data.message!==undefined){
+
+					return;
+				}
 				this.setMyEduCoderModals()
 			}
 

public/react/src/modules/user/common.css

@@ -262,4 +262,7 @@
 .bth100{
     width: 100px;
     margin: 0 auto;
+}
+.ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
+  background: #ffffff!important;
 }