diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index 7d401864d..2d181d186 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -17,10 +17,10 @@
- {{nickname}}
+ {{nickname}}
- {{nickname}}
+ {{nickname}}
{{user.nickname}}
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index c1c017fcd..97fb26b5f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -35,7 +35,7 @@ export default {
params.success = (result, status, xhr) => {
if (!$A.isJson(result)) {
console.log(result, status, xhr);
- reject({data: {}, msg: "Return error"})
+ reject({ret: -1, data: {}, msg: "Return error"})
return;
}
const {ret, data, msg} = result;
@@ -56,14 +56,14 @@ export default {
checkNick: false
})).then(resolve).catch(reject);
}).catch(() => {
- reject({data, msg: $A.L('请设置昵称!')})
+ reject({ret: -1, data, msg: $A.L('请设置昵称!')})
});
return;
}
if (ret === 1) {
resolve({data, msg});
} else {
- reject({data, msg: msg || "Unknown error"})
+ reject({ret, data, msg: msg || "Unknown error"})
//
if (ret === -4001) {
dispatch("forgetProject", data.project_id);
@@ -76,9 +76,9 @@ export default {
};
params.error = (xhr, status) => {
if (window.navigator.onLine === false || (status === 0 && xhr.readyState === 4)) {
- reject({data: {}, msg: $A.L('网络异常,请稍后再试!')})
+ reject({ret: -1, data: {}, msg: $A.L('网络异常,请稍后再试!')})
} else {
- reject({data: {}, msg: "System error"})
+ reject({ret: -1, data: {}, msg: "System error"})
}
};
//
diff --git a/resources/assets/sass/components/user-avatar.scss b/resources/assets/sass/components/user-avatar.scss
index 93d872a48..640bf42e3 100755
--- a/resources/assets/sass/components/user-avatar.scss
+++ b/resources/assets/sass/components/user-avatar.scss
@@ -13,11 +13,11 @@
}
.avatar-text {
background-color: $primary-color;
- > span {
- display: inline-block;
- font-size: 15px;
- line-height: 1;
- }
+ }
+ .avatar-char {
+ display: inline-block;
+ font-size: 15px;
+ line-height: inherit;
}
> em {
position: absolute;
diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss
index bcd9f5f36..c93e78629 100644
--- a/resources/assets/sass/pages/page-file.scss
+++ b/resources/assets/sass/pages/page-file.scss
@@ -308,12 +308,8 @@
margin-right: 8px;
}
}
- .common-avatar {
- .el-avatar {
- > span {
- font-size: 12px;
- }
- }
+ .avatar-char {
+ font-size: 18px;
}
.permission {
padding-left: 6px;
@@ -438,7 +434,9 @@
color: #ffffff;
}
}
-
+ .avatar-char {
+ font-size: 18px;
+ }
}
&.shear {
opacity: 0.38;
@@ -615,7 +613,7 @@
}
.page-file-share-list {
max-height: 500px;
- margin-bottom: 24px;
+ margin-bottom: 26px;
> li {
display: flex;
align-items: center;