Merge branch 'bugfix/修复生产环境跳转到测试环境的bug' into dev

# Conflicts:
#	dist/static/js/manifest.b6239e839c8627d701f8.js.map

src/common/js/error.js

@@ -6,7 +6,7 @@ import { Message } from 'element-ui';
 export default {
   errorMsg: function(response) {
     var local = window.location.origin;
-    if (local.indexOf('localhost')) {
+    if (local.indexOf('localhost') != -1) {
       local = 'http://gicdev.demogic.com';
     }
     if (response.errorCode != 0) {