page final

src/App.vue

@@ -1,6 +1,8 @@
 <template>
   <div id="app">
-    <router-view />
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </div>
 </template>
 

src/pages/city/components/list.vue

@@ -41,10 +41,7 @@
 
 <script scoped>
 import BScroll from "better-scroll";
-<<<<<<< HEAD
-=======
 import { mapState } from "vuex";
->>>>>>> city-vuex
 
 export default {
   name: "CityList",

src/pages/home/home.vue

@@ -16,6 +16,7 @@ import HomeIcons from "./components/Icons";
 import HomeRecommend from "./components/Recommend";
 import HomeWeekend from "./components/Weekend";
 import axios from "axios";
+import { mapState } from "vuex";
 
 export default {
   //单页组件名
@@ -30,15 +31,19 @@ export default {
   },
   data: function() {
     return {
+      lastCity: "",
       swiperList: [],
       iconList: [],
       recommendList: [],
       weekendList: []
     };
   },
+  computed: {
+    ...mapState(["city"])
+  },
   methods: {
     getHomeInfo: function() {
-      axios.get("/api/index.json").then(this.getHomeInfoSucc);
+      axios.get("/api/index.json?city=" + this.city).then(this.getHomeInfoSucc);
     },
     getHomeInfoSucc: function(res) {
       res = res.data;
@@ -53,7 +58,14 @@ export default {
     }
   },
   mounted: function() {
+    this.lastCity = this.city;
     this.getHomeInfo();
+  },
+  activated: function() {
+    if (this.lastCity !== this.city) {
+      this.lastCity = this.city;
+      this.getHomeInfo();
+    }
   }
 };
 </script>