diff --git a/.gitignore b/.gitignore index 8883194..9cc9479 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ build/ d.html npm-debug.log +.idea/ \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a5e949e..0acac18 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,9 +1,13 @@ +<<<<<<< HEAD +======= + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa +<<<<<<< HEAD @@ -144,6 +149,32 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - - + + $USER_HOME$/AppData/Roaming/npm/bower.cmd + + + + true + DEFINITION_ORDER +<<<<<<< HEAD @@ -213,27 +257,27 @@ - - - - - @@ -243,17 +287,23 @@ +<<<<<<< HEAD +======= + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + + @@ -265,14 +315,16 @@ - + + + - + @@ -282,6 +334,7 @@ + project @@ -292,10 +345,12 @@ + + C:/Program Files/nodejs/node.exe $PROJECT_DIR$ true @@ -316,7 +371,9 @@ - + + @@ -325,15 +382,24 @@ 1471498492040 + + +<<<<<<< HEAD +======= + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + @@ -352,6 +418,9 @@ + + +<<<<<<< HEAD @@ -481,15 +551,18 @@ +======= +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + +<<<<<<< HEAD @@ -500,18 +573,25 @@ +======= + + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + +<<<<<<< HEAD @@ -524,10 +604,26 @@ +======= + + + + + + + + + + + + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + @@ -535,7 +631,7 @@ - + @@ -543,14 +639,14 @@ - + - + @@ -558,15 +654,17 @@ - + - + + + - + @@ -574,7 +672,90 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,137 +763,173 @@ - + - + - + - - - - - - - - + - + - + - + - - - - - - - - +<<<<<<< HEAD + + +======= + - + - + - - + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa + + + + + + + - + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + +<<<<<<< HEAD +======= + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa - + - - + + +<<<<<<< HEAD +======= + - - + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa + + + + + + + +<<<<<<< HEAD @@ -766,6 +983,54 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa diff --git a/index.html b/index.html index 8da771a..dd295b1 100644 --- a/index.html +++ b/index.html @@ -3,11 +3,7 @@ - - - 首页 - - +
diff --git a/package.json b/package.json index b5445bd..e030e80 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "learn-webpack", + "name": "vue-spa-webpack", "version": "1.0.0", "main": "index.js", "dependencies": { diff --git a/readme.md b/readme.md index 4160072..c6f026c 100644 --- a/readme.md +++ b/readme.md @@ -1,18 +1,29 @@ -## Setup -``` bash -npm install -npm start -``` -访问 localhost:8080 +# Example VUE-SPA +- 有问题请联系qq：416175716 +- 欢迎提出意见和建议! -如果想在手机上查看 +## How to use +``` bash +$ git clone git@github.com:allan2coder/Vue-SPA.git +$ cd +$ npm install +``` + +launch the project app. +``` bash +$ npm start +``` + +Then, You should see a new browser tap opening and a page of "index.html" in http://127.0.0.1:8080. + +-watch on your mobile ``` npm run ip ``` 访问 你本地的ip:9000 -## 版本控制，打包压缩 +## Release MAC ``` @@ -25,7 +36,7 @@ windows npm run wb ``` -## 目录结构 +## Construction 
 │  .gitignore          # 忽略无需git控制的文件  比如 node_modules
 │  package.json        # 项目配置
@@ -54,5 +65,5 @@ npm run wb
##学习参考： -待续 +待续... diff --git a/src/routers.js b/src/routers.js index 242245b..efc03a9 100644 --- a/src/routers.js +++ b/src/routers.js @@ -21,19 +21,18 @@ module.exports = function(router){ }, '/my_views': { name:'my_views', - component: require('./views/my_views.vue') + component: require('./views/my_views.vue'), }, }); window.routeList=[]; router.beforeEach(function(transition){ - console.log(11111); console.log('before---------------'); //可以通过在路由中的自定义字段来验证用户是否需要登陆 - // if(transition.to.auth){ - // console.log('通过配置路由中自定义的字段验证是否需要登陆'); - // } + if(transition.to.auth){ + console.log('通过配置路由中自定义的字段验证是否需要登陆'); + } // //如果是中止，这里可以判断用户登录 // //if(transition.to.path === '/forbidden'){ @@ -61,9 +60,9 @@ module.exports = function(router){ }); } - setTimeout(function(){ + // setTimeout(function(){ transition.next(); - },00); + // },00); }); //可以记录访问路径 diff --git a/src/views/about.vue b/src/views/about.vue index cc6a800..5a88d20 100644 --- a/src/views/about.vue +++ b/src/views/about.vue @@ -1,6 +1,6 @@ -