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

lyfO_o

2022-05-24 f15b467c2233ba069459c809fffbe994692e3315

 src/views/login/index.vue

@@ -114,7 +114,7 @@
                                    // return
                                }
                            }

                            Cookies.set('token',data.token)
                            _this.$store.commit('SET_ROLES', data.roles)
                            Cookies.set('roles', JSON.stringify(data.roles))
                            setToken(data.token)
@@ -123,6 +123,7 @@
                            Cookies.set('name', data.username)
                            Cookies.set('userId', data.id)
                            Cookies.set('company', data.company)
                            Cookies.set('companyid', data.companyid)
                            let address = '';
                            if (data.city != null && data.city != 'null'){
                                address = data.city
@@ -173,7 +174,7 @@
    .login-container {
        min-height: 100%;
        width: 100%;
        background: url("../../assets/bg_login.png") center no-repeat;
        background: url("../../assets/bg.jpg") center no-repeat;
        //background-size: auto 100%;
        // background-color: #2d3a4b;
        overflow: hidden;