From 8734886da99972a3d6d42a6fd273636f575de407 Mon Sep 17 00:00:00 2001 From: xsf Date: Thu, 18 Aug 2016 18:05:31 +0800 Subject: [PATCH 1/4] Update readme.md --- readme.md | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/readme.md b/readme.md index 4160072..5475cc7 100644 --- a/readme.md +++ b/readme.md @@ -1,18 +1,28 @@ -## 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 +35,7 @@ windows npm run wb ``` -## 目录结构 +## CONSTRUCTION 
 │  .gitignore          # 忽略无需git控制的文件  比如 node_modules
 │  package.json        # 项目配置
@@ -54,5 +64,5 @@ npm run wb
##学习参考： -待续 +待续... From 46986b8c88c9cf8a73ec9cfdba0c8579d25a609e Mon Sep 17 00:00:00 2001 From: xsf Date: Thu, 18 Aug 2016 18:06:19 +0800 Subject: [PATCH 2/4] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 5475cc7..2a87de2 100644 --- a/readme.md +++ b/readme.md @@ -35,7 +35,7 @@ windows npm run wb ``` -## CONSTRUCTION +## Construction 
 │  .gitignore          # 忽略无需git控制的文件  比如 node_modules
 │  package.json        # 项目配置

From e8e37c12fcff32ca18f33a411f645de13a896e9c Mon Sep 17 00:00:00 2001
From: xsf 
Date: Thu, 18 Aug 2016 18:15:46 +0800
Subject: [PATCH 3/4] Update readme.md

---
 readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/readme.md b/readme.md
index 2a87de2..5a9c176 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,7 @@
 # Example VUE-SPA 
 - 有问题请联系qq：416175716
+- 将使用ES6/晚饭后到家搞~
+- 欢饮提出建议
 
 ## How to use
 ``` bash

From 446dbea5d21c3e6eaffa7a2245970b8d1c4c6dfa Mon Sep 17 00:00:00 2001
From: allan91 <416175716@qq.com>
Date: Thu, 18 Aug 2016 23:31:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 626 ++++++++++++++++++++++----------------------
 index.html          |   6 +-
 package.json        |   2 +-
 readme.md           |   3 +-
 src/routers.js      |  13 +-
 src/views/about.vue |   4 +-
 webpack.config.js   |  20 +-
 文档.md             |  10 +
 8 files changed, 340 insertions(+), 344 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 26425d0..242a37a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,7 @@
 
 
   
-    
-      
-      
-      
-    
+    
     
     
     
   
-    
-      
-        
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                    
-                    
-                  
-                  
-                
-              
-              
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                    
-                    
-                  
-                  
-                
-              
-              
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                    
-                    
-                  
-                  
-                
-              
-              
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-        
-      
-      
-        
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-          
-            
-              
-                
-                  
-                  
-                
-              
-            
-          
-        
-      
-    
+    
+      
+        
+          
+            
+              
+              
+                
+              
+            
+          
+        
+      
+      
+        
+          
+            
+              
+              
+            
+          
+        
+      
+    
   
   
     
   
-  
-  
+  
+    $USER_HOME$/AppData/Roaming/npm/bower.cmd
+    
+  
+  
+  
     
   
   
     true
+    DEFINITION_ORDER
   
   
-    
   
     
@@ -237,33 +115,31 @@
       
     
     
-      
-      
       
         
           
             
-              
           
           
             
-              
             
-              
           
           
             
-              
             
-              
             
@@ -273,15 +149,18 @@
           
         
       
+      
+      
     
   
   
-    
+    
     
     
     
     
     
+    
   
   
     
@@ -293,14 +172,16 @@
     
       
     
-    
+    
+      
+      
       
       
     
     
       
     
-    
+    
       
     
     
@@ -310,6 +191,7 @@
       
     
     
+      project
       
       
       
@@ -320,10 +202,12 @@
     
       
       
+      
       
       
     
     
+      C:/Program Files/nodejs/node.exe
       
       $PROJECT_DIR$
       true
@@ -344,7 +228,9 @@
       
     
   
-  
+  
+    
   
     
   
@@ -353,15 +239,20 @@
       
       1471498492040
       
+  
+    
   
-    
+    
     
     
-      
+      
       
       
       
@@ -380,6 +271,9 @@
       
     
   
+  
+    
   
     
   
-    
-      
-        
-          
-          
-        
-      
-    
     
       
-        
+        
           
           
         
       
     
     
-      
-        
-          
-            
-            
-          
-          
+      
+        
+          
+          
         
       
-      
-        
-      
     
     
       
-        
+        
           
           
         
       
     
     
-      
-        
-          
-            
-            
-          
-          
+      
+        
+          
+          
         
       
-      
-        
+    
+    
+      
+        
+          
+          
+        
       
     
     
       
-        
+        
           
           
         
@@ -458,7 +340,7 @@
     
     
       
-        
+        
           
           
         
@@ -466,7 +348,7 @@
     
     
       
-        
+        
           
           
         
@@ -474,7 +356,7 @@
     
     
       
-        
+        
           
           
         
@@ -482,15 +364,17 @@
     
     
       
-        
+        
           
-          
+          
+            
+          
         
       
     
     
       
-        
+        
           
           
         
@@ -498,7 +382,90 @@
     
     
       
-        
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
           
           
         
@@ -506,187 +473,206 @@
     
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
         
       
     
-    
-      
-        
-          
-        
-      
-    
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
-          
-        
-      
-    
-    
-      
-        
-          
-          
         
       
     
     
       
-        
+        
           
         
       
     
     
       
-        
+        
           
         
       
     
-    
+    
       
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-    
-    
-      
-        
-          
+        
+          
           
         
       
     
     
       
-        
+        
           
           
         
       
     
-    
-      
-        
-          
-            
-            
-          
-          
+    
+      
+        
+          
+          
         
       
-      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
         
       
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
     
     
-      
-        
-          
-            
-            
-          
-          
+      
+        
+          
+          
         
       
-      
-        
-      
     
-    
-      
-        
-          
-            
-            
-          
-          
+    
+      
+        
+          
+          
         
       
-      
-        
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+          
+          
+        
       
     
   
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 5a9c176..c6f026c 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,6 @@
 # Example VUE-SPA 
 - 有问题请联系qq：416175716
-- 将使用ES6/晚饭后到家搞~
-- 欢饮提出建议
+- 欢迎提出意见和建议!
 
 ## How to use
 ``` bash
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 @@
-