bug fixes

src/components/layout/main.vue

@@ -16,18 +16,7 @@ import AppBreadcrumb from './breadcrumb'
 export default {
   name: 'AppMain',
   props: { hasBreadcrumb: { type: Boolean, default: true } },
-  components: { AppBreadcrumb },
-  watch: {
-    $route: {
-      immediate: true,
-      handler() {
-        // 没有shopId
-        if (!this.$store.state.shopId) {
-          this.$router.push({ path: '/shop' })
-        }
-      }
-    }
-  }
+  components: { AppBreadcrumb }
 }
 </script>
 

src/main.js

@@ -13,7 +13,6 @@ Vue.use(ElementUI)
 /* 导航守卫 */
 router.beforeEach((to, from, next) => {
   before.update(to, from, next)
-  next()
 })
 
 Vue.prototype.msgCenter = new Vue()

src/store/index.js

@@ -37,10 +37,16 @@ const store = new Vuex.Store({
     },
     // 获取店铺信息
     getShop({ commit, state }) {
-      getShopList({ shop_id: state.shopId }).then(response => {
-        const [first = {}] = response.data || []
-        commit('setShop', first)
-      })
+      getShopList({ shop_id: state.shopId })
+        .then(response => {
+          const [first = {}] = response.data || []
+          commit('setShop', first)
+        })
+        .catch(() => {
+          commit('setShop', {})
+          commit('setShopId', '')
+          window.localStorage.removeItem('shopId')
+        })
     },
     // 获取商品分组列表
     getGroups({ commit, state }) {

src/utils/axios.js

 import axios from 'axios'
 import qs from 'qs'
 import { Message } from 'element-ui'
+import router from '@/router'
 const httpRequest = axios.create({
   // baseURL: webConf.others.baseUrl,
   timeout: 60000,
@@ -35,6 +36,11 @@ httpRequest.interceptors.response.use(
   function(response) {
     const { data } = response
     if (data.code) {
+      if (data.code === 1002) {
+        window.localStorage.removeItem('shopId')
+        router.replace('/shop')
+        return Promise.reject(data)
+      }
       if (![1010, 1001].includes(data.code)) {
         Message.error(data.msg || data.message)
       }