dai-vue-temp-m

diff --git a/main/config/config.js b/main/config/config.js
index d3d37df..466867b 100644
--- a/main/config/config.js
+++ b/main/config/config.js
@@ -1,30 +1,33 @@
 import extend from 'extend2';
-import configTest from './config.test.js';
-import configDev from './config.dev.js';
-/**默认的生产设置 开发及测试请单独设置 */
-var configDefault = {
-    //是否开发模式
-    isDev: false,
-    domain: 'http://localhost:8080',
-    //版本
-    version: '1.0.0',
-    //服务器配置
-    server: {},
-    //接口服务配置
-    service: {
-        default: 'http://192.168.88.88:8010'
-    }
-};
-//根据环境合并
+import configTest from './configTest.js';
+import configDev from './configDev.js';
+import configPro from './configPro.js';
+
 var config = {};
-if (process.env.NODE_ENV == 'development') {
-    config = extend(true, {}, configDefault, configDev);
+var env = process.env.NODE_ENV;
+var hostname = window.location.hostname.toLowerCase();
+
+//根据域名判断
+if (
+    hostname.indexOf('127.0.0.1') === 0 ||
+    hostname.indexOf('192.168') === 0 ||
+    hostname.indexOf('dev.') === 0 ||
+    hostname == 'localhost'
+) {
+    env = 'development';
+} else if (hostname.indexOf('test.') === 0) {
+    env = 'test';
+}
+
+//合并配置
+if (env == 'development') {
+    config = extend(true, {}, configPro, configDev);
     config.isDev = true;
-} else if (process.env.NODE_ENV == 'test') {
-    config = extend(true, {}, configDefault, configTest);
+} else if (env == 'test') {
+    config = extend(true, {}, configPro, configTest);
     config.isDev = true;
 } else {
-    config = extend(true, {}, configDefault);
+    config = extend(true, {}, configPro);
     config.isDev = false;
 }
 export default config;

diff --git a/main/config/configPro.js b/main/config/configPro.js
new file mode 100644
index 0000000..05f5aff
--- /dev/null
+++ b/main/config/configPro.js
@@ -0,0 +1,12 @@
+var config = {
+    //是否开发模式
+    isDev: false,
+    domain: 'http://localhost:8080',
+    //版本
+    version: '1.0.0',
+    //接口服务配置
+    service: {
+        default: 'http://192.168.88.88:8010'
+    }
+};
+export default config;
\ No newline at end of file