Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2021-10-25 42a3117e2ac087f5c2c28ca07a1c4443e2c38ca3

 ruoyi-ui/src/layout/components/Navbar.vue

@@ -102,7 +102,7 @@
        type: 'warning'
      }).then(() => {
        this.$store.dispatch('LogOut').then(() => {
          this.$router.push({ path: "/login" })
          location.href = this.$router.options.base + '/index';
        })
      }).catch(() => {});
    }