From 5ab5755dcf128ffd0da7880c640607c2c862733b Mon Sep 17 00:00:00 2001
From: xsf <416175716@qq.com>
Date: Fri, 26 Aug 2016 18:13:31 +0800
Subject: [PATCH] add mint-ui

---
 package.json              |  1 -
 src/app.js                | 20 ++++------------
 src/app.vue               | 49 ++++++++++++++++++---------------------
 src/components/select.vue |  1 +
 src/css/testInAbout.css   |  4 ----
 src/views/index.vue       |  8 ++-----
 6 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 4a04539..ae6bfda 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,6 @@
     "extract-text-webpack-plugin": "^0.8.2",
     "mint-ui": "^0.2.7",
     "open-browser-webpack-plugin": "^0.0.2",
-    "weui": "^0.4.3"
   },
   "devDependencies": {
     "babel-core": "^6.3.17",
diff --git a/src/app.js b/src/app.js
index 2ed148b..08bfcf2 100644
--- a/src/app.js
+++ b/src/app.js
@@ -5,29 +5,17 @@ require('./css/animate.css');
 
 const Vue = require('vue');
 const VueRouter = require('vue-router');
-const filters = require('./common/filters');// register filters 自定义过滤器
-
-const _config = require('./common/config');// API接口 可以在需要的页面引入,此页面可以不引入!
-
-//console.log(_config.SERVICE.EDU.DETAILS);
-
-//Object.keys(filters).forEach(function(k) {
-//  Vue.filter(k, filters[k]);
-//});
+const filters = require('./common/filters');  // register filters 自定义过滤器
+const _config = require('./common/config');   // API接口 可以在需要的页面引入,此页面可以不引入!
 
 var App = Vue.extend(require('./app.vue'));
     Vue.use(VueRouter);
     
-var router = new VueRouter(
-	{
+var router = new VueRouter({
 	  hashbang: true,  //为true的时候 example.com/#!/foo/bar ， false的时候 example.com/#/foo/bar
 	  //abstract:true,  //地址栏不会有变化
-	  //以下设置需要服务端设置
-	  //history: false,   //当使用 HTML5 history 模式时，服务器需要被正确配置 以防用户在直接访问链接时会遇到404页面。
-	  //saveScrollPosition: false
 	  linkActiveClass:'custom-active-class' //全局设置连接匹配时的类名 参考http://vuejs.github.io/vue-router/en/link.html
-	}
-);
+});
 
 require('./routers')(router);
 
diff --git a/src/app.vue b/src/app.vue
index c63c4f1..d2729f4 100644
--- a/src/app.vue
+++ b/src/app.vue
@@ -10,34 +10,31 @@
 </template>
 
 <script>
-module.exports = {
-    data: function() {
-        return {
-            items:{
-                '/':{
-                    name:'index'
-                },
-                '/news': {
-                    name:'news'
-                },
-                '/search/:viewId': {
-                    name:'search'
-                },
-                '/about':{
-                    name:'about'
+    import 'mint-ui/lib/style.css';
+
+    module.exports = {
+        data: function() {
+            return {
+                items:{
+                    '/':{
+                        name:'index'
+                    },
+                    '/news': {
+                        name:'news'
+                    },
+                    '/search/:viewId': {
+                        name:'search'
+                    },
+                    '/about':{
+                        name:'about'
+                    }
                 }
-            }
 
-        };
-    },
-    components:{
-//      modal:require('./components/modal.vue'),
-    },
-    created:function(){
-
-    },
-    methods:{
+            };
+        },
+        methods:{
+            /* do someThing */
+        }
     }
-}
 
 </script>
diff --git a/src/components/select.vue b/src/components/select.vue
index ebe6d8d..1fa59c8 100644
--- a/src/components/select.vue
+++ b/src/components/select.vue
@@ -49,6 +49,7 @@
 </script>
 
 <style>
+
     .select_components_mask{
       position: fixed;
       left: 0;
diff --git a/src/css/testInAbout.css b/src/css/testInAbout.css
index aba57c8..b41d1e3 100644
--- a/src/css/testInAbout.css
+++ b/src/css/testInAbout.css
@@ -2,10 +2,6 @@ h2{
 	font-size: 28px;
 	text-align: center;
 }
-span{
-	font-size: 15px;
-	color: red;
-}
 p{
 	font-size: 14px;
 	text-align: center;
diff --git a/src/views/index.vue b/src/views/index.vue
index 4a6d424..53b7f7f 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -14,9 +14,6 @@
 	<div class="index">
 		<h2>vue-router 介绍:</h2>
 		<a class="router-link" href="http://router.vuejs.org/zh-cn/" target="_blank">点击这里</a>
-
-		<mt-cell title="标题文字"></mt-cell>
-		<mt-cell title="标题文字" value="说明文字"></mt-cell>
 	</div>
 </template>
 
@@ -24,8 +21,7 @@
 	var lifecycle = []; //为了描述生命周期， 在 canActivate 阶段 还没有 this.lifecycle
 
 	import Vue from 'vue'
-	import { Cell } from 'mint-ui';
-	Vue.component(Cell.name, Cell);
+	import { Toast } from 'mint-ui';
 
 	module.exports = {
 		//props: ['父组建传的值'],
@@ -41,7 +37,7 @@
 			//waitForData: true, //数据加载完毕后再切换试图，也就是 点击之后先没反应，然后数据加载完，再出发过渡效果
 			canActivate:function(transition){
 				//canActivate阶段，可以做一些用户验证的事情
-				console.log(1);
+                Toast('Test toast');
 				return true;
 			},
 			activate:function(transition){