dai-vue-temp-m
更改列表
main/config/config.dev.js 5(+1 -4)
main/config/config.js 11(+6 -5)
package.json 2(+1 -1)
src/routes.js 2(+1 -1)
详细信息
main/config/config.js 11(+6 -5)
diff --git a/main/config/config.js b/main/config/config.js
index aa559a9..d3d37df 100644
--- a/main/config/config.js
+++ b/main/config/config.js
@@ -1,10 +1,10 @@
import extend from 'extend2';
import configTest from './config.test.js';
-import configPro from './config.pro.js';
-/**默认的开发设置 测试及生产请单独设置 */
+import configDev from './config.dev.js';
+/**默认的生产设置 开发及测试请单独设置 */
var configDefault = {
//是否开发模式
- isDev: true,
+ isDev: false,
domain: 'http://localhost:8080',
//版本
version: '1.0.0',
@@ -18,12 +18,13 @@ var configDefault = {
//根据环境合并
var config = {};
if (process.env.NODE_ENV == 'development') {
- //默认配置就是dev,所以无须导入
+ config = extend(true, {}, configDefault, configDev);
+ config.isDev = true;
} else if (process.env.NODE_ENV == 'test') {
config = extend(true, {}, configDefault, configTest);
config.isDev = true;
} else {
- config = extend(true, {}, configDefault, configPro);
+ config = extend(true, {}, configDefault);
config.isDev = false;
}
export default config;
package.json 2(+1 -1)
diff --git a/package.json b/package.json
index f66b38f..4b515b3 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
"author": "",
"license": "ISC",
"dependencies": {
- "dai-vue": "^1.0.11"
+ "dai-vue": "^1.0.12"
}
}
src/routes.js 2(+1 -1)
diff --git a/src/routes.js b/src/routes.js
index c41e7b5..a37dd1a 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,2 +1,2 @@
-const routes = [{ path: '/', component: () => import('../page/home.vue'), meta: { pageName: '首页' } }];
+const routes = [{ path: '/', component: () => import('./page/home.vue'), meta: { pageName: '首页' } }];
export default routes;