代码格式调整

src/layout/components/Navbar.vue

@@ -67,9 +67,11 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch('user/logout')
       this.$message.success('已退出当前账号')
-      window.location.replace('/#/login')
+      this.$store.dispatch('user/logout')
+      setTimeout(() => {
+        this.$router.replace('/login')
+      }, 500)
     }
   }
 }

src/permission.js

@@ -13,8 +13,9 @@ router.beforeEach(async(to, from, next) => {
   // 设置页面名称
   // eslint-disable-next-line indent
   document.title = getPageTitle(to.meta.title)
-
+  // 获取token
   const hasToken = getToken()
+
   if (hasToken) {
     /**
          * 满足要求则关闭所有标签，防止代理数据冲突
@@ -64,10 +65,8 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
+      Message({ message: '登录失效，请重新登录！' })
       next(`/login`)
-
-      // Message({ message: '登录失效，请重新登录！' })
-      // router.replace('/login')
       return
     }
   }

src/router/index.js

@@ -69,8 +69,8 @@ export const constantRoutes = [
   // 首页显示的页面
   {
     path: '/',
-    component: Layout
-    // redirect: '/supplier/list'
+    component: Layout,
+    redirect: '/login'
   },
   // 修改密码
   {

src/utils/request.js

@@ -49,11 +49,12 @@ service.interceptors.response.use(
     // token失效时
     if (res.code === -99) {
       Message({ message: '登录失效，请重新登录！', duration: 1000 })
-      // debugger
-      // router.push('/login')
-      console.log(router)
+      store.dispatch('user/logout')
+      setTimeout(() => {
+        router.replace('/login')
+      }, 500)
       NProgress.done()
-      return router.replace('/login')
+      return
     // 返回不成功
     } else if (res.code !== 0) {
       Message({

src/views/password/index.vue

@@ -80,7 +80,9 @@ export default {
     },
     async logout() {
       await this.$store.dispatch('user/logout')
-      window.location.replace('/#/login')
+      setTimeout(() => {
+        this.$router.replace('/login')
+      }, 500)
     }
   }
 }

src/views/supplier/product/edit.vue

@@ -60,7 +60,7 @@
           @click="handleAddParam"
         >添加参数</el-button>
       </el-form-item>
-      <el-form-item label="上线状态:">
+      <!-- <el-form-item label="上线状态:">
         <el-select
           v-model="formData.status"
           placeholder="上架状态"
@@ -69,7 +69,7 @@
           <el-option label="上线" :value="1" />
           <el-option label="下线" :value="0" />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
     </el-form>
     <div class="submit-btn">
       <el-button type="primary" @click="submit">保存</el-button>
@@ -100,7 +100,6 @@ export default {
         productImage: '', //	商品图片
         productName: '', //	商品名称
         snCode: '', //	商品SN码
-        status: 1, //	上架状态：0下架，1上架
         brandId: ''
       },
       brandList: [],