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

public/react/src/AppConfig.js

@@ -21,16 +21,16 @@ let hashTimeout
 
 // TODO 开发期多个身份切换
 let debugType =""
-// if (isDev) {
+if (isDev) {
-//   const _search = window.location.search;
+  const _search = window.location.search;
-//   let parsed = {};
+  let parsed = {};
-//   if (_search) {
+  if (_search) {
-//     parsed = queryString.parse(_search);
+    parsed = queryString.parse(_search);
-//   }
+  }
-//   debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+  debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-//     window.location.search.indexOf('debug=s') != -1 ? 'student' :
+    window.location.search.indexOf('debug=s') != -1 ? 'student' :
-//       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-// }
+}
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
     initOnlineOfflineListener()

public/react/src/modules/login/Otherlogin.js

@@ -194,7 +194,7 @@ class Otherlogin extends Component {
 												}
 											</style>
 											<div className={"textcenter"} >
-													<img className={"ottherimg"} src={getImageUrl(`images/`+data&&data.image_url)}/>
+												{data===undefined?"":data.image_url===undefined||data.image_url===null||data.image_url===""?"":<img className={"ottherimg"} src={getImageUrl(`images/${data&&data.image_url}`)}/>}
 											</div>
 											<div className={"textcenter wechatloginfont"}>
 													为了更好的为您服务，请关联一个EduCoder账号