Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-04-08 94142f596da828c8903e05b02e4b1a13d97e7e74

 src/views/login/index.vue

@@ -95,6 +95,7 @@
                        const res = response.data
                        if (res.code == 200) {
                            localStorage.setItem('loginForm',JSON.stringify(loginForm))
                            // this.$store.dispatch('user/getClassifyOne',1)
                            _this.loading = false
                            const data = res.result
                            if (data.type != 1 && data.type != 2) {