Merge remote-tracking branch 'origin/master'

public/react/public/index.html

@@ -31,7 +31,7 @@
           location.pathname.indexOf("/compatibility") == -1) {
 
         // location.href = './compatibility'
-        location.href = './compatibility.html'
+        location.href = '/compatibility.html'
         
       }
     </script>

public/react/src/common/UrlTool.js

@@ -36,6 +36,13 @@ export function getUrl(path, goTest) {
 	}
 	return `${path ? path: ''}`;
 }
+export function getUrl2(path, goTest) {
+  	const local = 'http://localhost:3000'
+	if (isDev) {
+		return `${local}${path?path:''}`
+	}
+	return `${path ? path: ''}`;
+}
 export function getUploadActionUrl(path, goTest) {
 	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
 }

public/react/src/common/educoder.js

@@ -2,7 +2,7 @@ import { from } from '_array-flatten@2.1.2@array-flatten';
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl, getUrl as getUrl,setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from                './UrlTool';
+export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl, getUploadActionUrl as getUploadActionUrl } from                './UrlTool';
 export { default as queryString } from                './UrlTool2';
  
 export { SnackbarHOC as SnackbarHOC } from                './SnackbarHOC';

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

@@ -434,7 +434,7 @@ class LoginDialog extends Component {
 
                             <div className={disabled===false?"bluebutton  edu-back-blue":"bluebutton"}
                                  onClick={disabled===false?
-                                   this.loginEDU:""
+                                   this.loginEDU: () => {}
                                    // console.log(1)
                                  }
                             >