From 33a8d27ef6f273a850bbb790287a3c1d65327679 Mon Sep 17 00:00:00 2001
From: maguohua <1264889788@qq.com>
Date: Mon, 26 Dec 2016 21:20:22 +0800
Subject: [PATCH] updata

---
 src/page/home/index.vue       |  5 ++-
 src/page/msite/food/index.vue | 18 +++++++++++
 src/page/msite/index.vue      | 29 ++++++++++--------
 src/router/router.js          | 57 ++++++++++++-----------------------
 4 files changed, 58 insertions(+), 51 deletions(-)
 create mode 100644 src/page/msite/food/index.vue

diff --git a/src/page/home/index.vue b/src/page/home/index.vue
index 4b31cf6..e5cdc82 100644
--- a/src/page/home/index.vue
+++ b/src/page/home/index.vue
@@ -2,7 +2,10 @@
   	<ul>
     	<router-link tag='li' to='home'>首页</router-link>
     	<router-link tag='li' to='city'>城市页面</router-link>
-    	<router-link tag='li' to='msite'>商店列表</router-link>
+    	<router-link tag='li' to='msite'>
+            商店列表
+            <router-link tag='span' to='msite/food'>food</router-link>
+        </router-link>
     	<router-link tag='li' to='shop'>商铺详情</router-link>
     	<router-link tag='li' to='search'>搜索</router-link>
     	<router-link tag='li' to='login'>登陆</router-link>
diff --git a/src/page/msite/food/index.vue b/src/page/msite/food/index.vue
new file mode 100644
index 0000000..d599010
--- /dev/null
+++ b/src/page/msite/food/index.vue
@@ -0,0 +1,18 @@
+<template>
+	<div>
+	    <router-link tag='div' to='home'>food</router-link>
+	</div>
+</template>
+
+<script>
+
+export default {
+	
+}
+
+</script>
+
+<style lang="scss" scoped>
+    
+</style>
+
diff --git a/src/page/msite/index.vue b/src/page/msite/index.vue
index 9250c43..85f535e 100644
--- a/src/page/msite/index.vue
+++ b/src/page/msite/index.vue
@@ -1,17 +1,20 @@
 <template>
-  	<ul>
-    	<router-link tag='li' to='home'>首页</router-link>
-    	<router-link tag='li' to='city'>城市页面</router-link>
-    	<router-link tag='li' to='msite'>商店列表</router-link>
-    	<router-link tag='li' to='shop'>商铺详情</router-link>
-    	<router-link tag='li' to='search'>搜索</router-link>
-    	<router-link tag='li' to='login'>登陆</router-link>
-    	<router-link tag='li' to='checkout'>确认订单</router-link>
-    	<router-link tag='li' to='forget'>忘记密码</router-link>
-    	<router-link tag='li' to='profile'>个人信息</router-link>
-    	<router-link tag='li' to='order'>订单列表</router-link>
-    	<router-link tag='li' to='vipcard'>会员卡</router-link>
-  	</ul>
+    <div>
+      	<ul>
+        	<router-link tag='li' to='/home'>首页</router-link>
+        	<router-link tag='li' to='city'>城市页面</router-link>
+        	<router-link tag='li' to='msite'>商店列表</router-link>
+        	<router-link tag='li' to='shop'>商铺详情</router-link>
+        	<router-link tag='li' to='search'>搜索</router-link>
+        	<router-link tag='li' to='login'>登陆</router-link>
+        	<router-link tag='li' to='checkout'>确认订单</router-link>
+        	<router-link tag='li' to='forget'>忘记密码</router-link>
+        	<router-link tag='li' to='profile'>个人信息</router-link>
+        	<router-link tag='li' to='order'>订单列表</router-link>
+        	<router-link tag='li' to='vipcard'>会员卡</router-link>
+      	</ul>
+        <router-view></router-view>
+    </div>
 </template>
 
 <script>
diff --git a/src/router/router.js b/src/router/router.js
index ce5fb54..79551ab 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -11,46 +11,29 @@ const forget = r => require.ensure([], () => r(require('../page/forget')), 'forg
 const checkout = r => require.ensure([], () => r(require('../page/checkout')), 'checkout')
 const order = r => require.ensure([], () => r(require('../page/order')), 'order')
 const vipcard = r => require.ensure([], () => r(require('../page/vipcard')), 'vipcard')
-
+const food = r => require.ensure([], () => r(require('../page/msite/food')), 'food')
 
 
 export default [{
     path: '/',   
     component: App,  //顶层路由，对应index.html
-    children: [{    //二级路由。对应App.vue
-        path: '', redirect: '/home' //地址为空时跳转home页面
-    }, {
-        path: '/home',
-        component: home  //首页城市列表页
-    }, {
-        path: '/city',
-        component: city  //当前选择城市页
-    }, {
-        path: '/msite',
-        component: msite  //所有商铺列表页
-    }, {
-        path: '/search',
-        component: search  //搜索页
-    }, {
-        path: '/shop',
-        component: shop  //商铺详情页
-    }, {
-        path: '/login',
-        component: login  //登陆注册页
-    }, {
-        path: '/profile',
-        component: profile  //个人信息页
-    }, {
-        path: '/forget',
-        component: forget  //修改密码页
-    }, {
-        path: '/checkout',
-        component: checkout  //确认订单页
-    }, {
-        path: '/order',
-        component: order  //订单列表页
-    }, {
-        path: '/vipcard',
-        component: vipcard  //vip卡页
-    }]
+    children: [      //二级路由。对应App.vue
+        { path: '', redirect: '/home' },               //地址为空时跳转home页面 
+        { path: '/home', component: home },            //首页城市列表页
+        { path: '/city', component: city },            //当前选择城市页
+        { path: '/msite', component: msite,            //所有商铺列表页
+            children:[ 
+                { path: 'food', component: food },     //特色商铺列表页
+                { path: '*', component: food }         //特色商铺列表页
+            ]
+        }, 
+        { path: '/search', component: search },        //搜索页
+        { path: '/shop', component: shop },            //商铺详情页
+        { path: '/login', component: login },          //登陆注册页
+        { path: '/profile', component: profile },      //个人信息页
+        { path: '/forget', component: forget },        //修改密码页
+        { path: '/checkout', component: checkout },    //确认订单页
+        { path: '/order', component: order },          //订单列表页
+        { path: '/vipcard', component: vipcard }       //vip卡页
+    ]
 }]
\ No newline at end of file
-- 
GitLab