From a8133a3bfe0ef323b67fcd658d02c6dd36077aea Mon Sep 17 00:00:00 2001
From: xsf <416175716@qq.com>
Date: Mon, 28 Nov 2016 09:01:37 +0800
Subject: [PATCH] =?UTF-8?q?20161128=E5=BC=80=E5=A7=8B=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E8=A6=81=E5=BC=80=E5=A7=8B=E4=BD=BF=E7=94=A8=E4=BA=86=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vueComponent.sublime-snippet | 59 ------------------------------------
 文档.md                      |  2 +-
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 vueComponent.sublime-snippet

diff --git a/vueComponent.sublime-snippet b/vueComponent.sublime-snippet
deleted file mode 100644
index b72ee12..0000000
--- a/vueComponent.sublime-snippet
+++ /dev/null
@@ -1,59 +0,0 @@
-<snippet>
-	<content><![CDATA[
-<template>
-
-</template>
-
-<script>
-	module.exports = {
-		//props: ['父组建传的值'],
-		data:function(){
-			console.log('1-1这里是组建的data,在route的 canActivate之后调用');
-			return {
-				msg:'这里返回数据'
-			}
-		},
-		//这里才是route的生存周期
-		route:{
-			//waitForData: true, //数据加载完毕后再切换试图，也就是 点击之后先没反应，然后数据加载完，再出发过渡效果
-			canActivate:function(transition){
-				//console.log('canActivate阶段，可以做一些用户验证的事情');
-				//return authenticationService.isLoggedIn()
-				console.log('1-canActivate');
-				//debugger;
-				return true;
-			},
-			activate:function(transition){
-				//console.log('active');
-				console.log('2-activate');
-				transition.next();
-				//此方法结束后，api会调用afterActivate 方法
-				//在aftefActivate中 会给组件添加 $loadingRouteData 属性 并设置为true
-			},
-			data: function(transition) {
-				var _this = this;
-				console.log('3-data--在 data 中获取数据比在 activate 中更加合理 见http://vuejs.github.io/vue-router/zh-cn/pipeline/data.html');
-
-					setTimeout(function(){
-						//在 transition.next({a:1}) 之前
-						//这里 _this.$loadingRouteData 是 true  因为此时获取
-						transition.next({a:1}); //这里必须要设置一个值 不能是 transition.next();
-						//这里 _this.$loadingRouteData 就是false了。  vue-router.js :2250 左右
-					},3000);
-			},
-			deactivate: function (transition) {
-				console.log('4');
-				console.log('Bar 销毁!')
-				transition.next()
-			}
-		}
-	}
-</script>
-
-<style>
-
-</style>
-]]></content>
-	<!-- Optional: Set a tabTrigger to define how to trigger the snippet -->
-	<tabTrigger>vueComponent</tabTrigger>
-</snippet>
diff --git a/文档.md b/文档.md
index 4e5a0a0..7ff2b86 100644
--- a/文档.md
+++ b/文档.md
@@ -1,6 +1,6 @@
 #### webpack参数解释
 
-使用配置请参看package.jscon!
+使用配置请参看package.json!
 –inline选项会自动把webpack-dev-server客户端加到webpack的入口文件配置中。
 –progress 显示打包进度
 –colors配置打包输出颜色显示