Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-28 ed2823ccf96675ab29414a588bba85bb8852ef9d

 north-glass-erp/northglass-erp/src/views/LoginView.vue

@@ -54,15 +54,14 @@
    if (valid) {
      loginLoadings.value=true
      userForm.pass = btoa(userForm.pass)
      request.post('/user/login',
      request.post('/userInfo/login',
          userForm).then((res) => {
        if(res['code']==200){
        if(res['code']==200 && res['data']){
          store.$patch({user:res.data})

          router.push('/main')
          ElMessage.success(t('login.loginSuccessful'))
        } else {
          ElMessage.error(res['msg'])
          ElMessage.error(t('login.loginErr'))
          loginLoadings.value=false
          return false
        }