Merge pull request PowerDos#5 from bitfishxyz/master

将Footer组件提取到App.vue这个页面
ivanchenph · Apr 27, 2019 · abd9223 · abd9223
2 parents 68276da + a5b9b32
commit abd9223
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 52 deletions.
diff --git a/a b/a
diff --git a/src/App.vue b/src/App.vue
@@ -2,15 +2,24 @@
   <div id="app">
     <Header></Header>
     <router-view/>
+    <!-- 部分路由不应该包含这个Footer -->
+    <Footer v-if="excludeRoutes.indexOf($route.name) == -1"></Footer>
   </div>
 </template>
 
 <script>
 import Header from '@/components/header/Header';
+import Footer from '@/components/footer/Footer';
 export default {
   name: 'App',
+  data () {
+    return {
+      excludeRoutes: ['HomeIndex', 'MyAddress', 'AddAddress', 'MyOrder', 'MyShoppingCart']
+    };
+  },
   components: {
-    Header
+    Header,
+    Footer
   }
 };
 </script>
diff --git a/src/components/Freeback.vue b/src/components/Freeback.vue
@@ -29,12 +29,10 @@
         </div>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
-import Footer from '@/components/footer/Footer';
 export default {
   name: 'Freeback',
   data () {
@@ -44,9 +42,6 @@ export default {
         content: ''
       }
     };
-  },
-  components: {
-    Footer
   }
 };
 </script>

diff --git a/src/components/GoodsDetail.vue b/src/components/GoodsDetail.vue
@@ -16,7 +16,6 @@
     <ShowGoods></ShowGoods>
     <!-- 商品详细展示 -->
     <ShowGoodsDetail></ShowGoodsDetail>
-    <Footer></Footer>
     <Spin size="large" fix v-if="isLoading"></Spin>
   </div>
 </template>
@@ -25,7 +24,6 @@
 import Search from '@/components/Search';
 import GoodsDetailNav from '@/components/nav/GoodsDetailNav';
 import ShopHeader from '@/components/header/ShopHeader';
-import Footer from '@/components/footer/Footer';
 import ShowGoods from '@/components/goodsDetail/ShowGoods';
 import ShowGoodsDetail from '@/components/goodsDetail/ShowGoodsDetail';
 import store from '@/vuex/store';
@@ -55,8 +53,7 @@ export default {
     ShopHeader,
     GoodsDetailNav,
     ShowGoods,
-    ShowGoodsDetail,
-    Footer
+    ShowGoodsDetail
   },
   store
 };

diff --git a/src/components/GoodsList.vue b/src/components/GoodsList.vue
@@ -74,7 +74,6 @@
         <Page :total="100" show-sizer></Page>
       </div>
     </div>
-    <Footer></Footer>
     <Spin size="large" fix v-if="isLoading"></Spin>
   </div>
 </template>
@@ -83,7 +82,6 @@
 import Search from '@/components/Search';
 import GoodsListNav from '@/components/nav/GoodsListNav';
 import GoodsClassNav from '@/components/nav/GoodsClassNav';
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapState, mapActions, mapGetters, mapMutations } from 'vuex';
 export default {
@@ -129,8 +127,7 @@ export default {
   components: {
     Search,
     GoodsListNav,
-    GoodsClassNav,
-    Footer
+    GoodsClassNav
   },
   store
 };

diff --git a/src/components/Index.vue b/src/components/Index.vue
@@ -120,14 +120,12 @@
         </div>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
 import Search from '@/components/Search';
 import HomeNav from '@/components/nav/HomeNav';
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapState, mapActions, mapGetters, mapMutations } from 'vuex';
 export default {
@@ -160,8 +158,7 @@ export default {
   },
   components: {
     Search,
-    HomeNav,
-    Footer
+    HomeNav
   },
   destroyed () {
     clearInterval(this.setIntervalObj);

diff --git a/src/components/Login.vue b/src/components/Login.vue
@@ -30,12 +30,10 @@
         </div>
       </i-col>
     </Row>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapMutations, mapActions } from 'vuex';
 export default {
@@ -79,9 +77,6 @@ export default {
       });
     }
   },
-  components: {
-    Footer
-  },
   store
 };
 </script>

diff --git a/src/components/Merchant.vue b/src/components/Merchant.vue
@@ -25,13 +25,11 @@
         <Page :total="100" show-sizer></Page>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
 import ShopHeader from '@/components/header/ShopHeader';
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapGetters, mapActions } from 'vuex';
 export default {
@@ -46,8 +44,7 @@ export default {
     ...mapActions(['loadGoodsList'])
   },
   components: {
-    ShopHeader,
-    Footer
+    ShopHeader
   },
   store
 };

diff --git a/src/components/Order.vue b/src/components/Order.vue
@@ -51,14 +51,12 @@
         </div>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
 import Search from '@/components/Search';
 import GoodsListNav from '@/components/nav/GoodsListNav';
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapState, mapActions } from 'vuex';
 export default {
@@ -158,8 +156,7 @@ export default {
   },
   components: {
     Search,
-    GoodsListNav,
-    Footer
+    GoodsListNav
   },
   store
 };

diff --git a/src/components/Pay.vue b/src/components/Pay.vue
@@ -18,17 +18,12 @@
         </div>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
-import Footer from '@/components/footer/Footer';
 export default {
-  name: 'Pay',
-  components: {
-    Footer
-  }
+  name: 'Pay'
 };
 </script>
 

diff --git a/src/components/PayDone.vue b/src/components/PayDone.vue
@@ -3,17 +3,12 @@
     <div class="pay-done-box">
       <img src="static/img/pay-success.png">
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
-import Footer from '@/components/footer/Footer';
 export default {
-  name: 'PayDone',
-  components: {
-    Footer
-  }
+  name: 'PayDone'
 };
 </script>
 

diff --git a/src/components/ShoppingCart.vue b/src/components/ShoppingCart.vue
@@ -60,14 +60,12 @@
         </div>
       </div>
     </div>
-    <Footer></Footer>
   </div>
 </template>
 
 <script>
 import Search from '@/components/Search';
 import GoodsListNav from '@/components/nav/GoodsListNav';
-import Footer from '@/components/footer/Footer';
 import store from '@/vuex/store';
 import { mapState, mapActions } from 'vuex';
 export default {
@@ -87,8 +85,7 @@ export default {
   },
   components: {
     Search,
-    GoodsListNav,
-    Footer
+    GoodsListNav
   },
   store
 };

diff --git a/src/components/SignUp.vue b/src/components/SignUp.vue
@@ -31,7 +31,7 @@
 <script>
 import store from '@/vuex/store';
 import { mapState, mapMutations } from 'vuex';
-import Footer from '@/components/footer/Footer';
+
 export default {
   name: 'SignUp',
   data () {
@@ -48,9 +48,6 @@ export default {
   store,
   mounted () {
     this.SET_SIGN_UP_SETP(0);
-  },
-  components: {
-    Footer
   }
 };
 </script>

diff --git a/src/router/index.js b/src/router/index.js
@@ -103,7 +103,7 @@ export default new Router({
       children: [
         {
           path: '/',
-          name: 'index',
+          name: 'HomeIndex',
           component: MyOrder
         },
         {