Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 42295ef2ac0a5e78674cf24b62d6834138f0ffdc

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

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