Merge branch 'master' into net6.0

ZR.Vue/src/utils/request.js

@@ -57,12 +57,12 @@ service.interceptors.response.use(res => {
       })
 
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 103 || code == 403 || code == 500 || code == 429) {
+    } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) {
       Message({
         message: msg,
         type: 'error'
       })
-      return Promise.reject(msg)
+      return Promise.reject(res.data)
     } else {
       //返回标准 code/msg/data字段
       return res.data;

ZR.Vue/src/views/login.vue

@@ -134,7 +134,8 @@ export default {
               this.msgSuccess('登录成功')
               this.$router.push({ path: this.redirect || '/' })
             })
-            .catch(() => {
+            .catch((error) => {
+							this.msgError(error.msg);
               this.loading = false
               this.getCode()
               this.$refs.codeTxt.focus()