Merge remote-tracking branch 'origin/master'

one_stop_public/libs/UploadCom.js

@@ -26,7 +26,7 @@ export function checkIsImage(path) {
 }
 
 export default function index(props) {
-	if (window.specialImportantSystemConfig.schoolName === '黔南民族职业技术学院' && window.location.href.indexOf('jy/geren/subsidy') > -1) {
+	if (window.specialImportantSystemConfig && window.specialImportantSystemConfig.schoolName === '黔南民族职业技术学院' && window.location.href.indexOf('jy/geren/subsidy') > -1) {
 		return <UploadComDiyForQnZy {...props} />;
 	} else {
 		return <UploadCom {...props} />;

zyd_public/utils/utils.js

@@ -336,12 +336,10 @@ export default function CheckPassWord(password = '', length= 12) {
 }
 
 export function getIsA_Ba() { // 判断当前环境是不是阿坝学校 然后做定制需求. 主要用于定制开发
-  let name = window.specialImportantSystemConfig.schoolName;
-  return name.indexOf('阿坝') > -1;
+  return window.specialImportantSystemConfig?.schoolName &&  window.specialImportantSystemConfig?.schoolName.indexOf('阿坝') > -1;
 }
 
 export function getIsBei_Dian() {  // 判断当前环境是不是北电科学校 然后做定制需求. 主要用于定制开发
-  let name = window.specialImportantSystemConfig.schoolName;
-  return name.indexOf('北京电子科技') > -1;
+  return window.specialImportantSystemConfig?.schoolName &&  window.specialImportantSystemConfig?.schoolName.indexOf('北京电子科技') > -1;
 }