From 69f30760f81594d79961ef61036795ad5efc7c26 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 07 十二月 2020 12:59:35 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/utils/request.js | 2 +-
ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 4 ++--
ruoyi-ui/src/assets/styles/ruoyi.scss | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index c4b9b7c..d8c6d61 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -220,8 +220,8 @@
position: absolute;
top: 50%;
transform: translate(50%, -50%);
- width: 180px;
- height: 180px;
+ width: 200px;
+ height: 200px;
border-radius: 50%;
box-shadow: 0 0 4px #ccc;
overflow: hidden;
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 0cc7b0a..e7e6519 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -25,7 +25,7 @@
for (const propName of Object.keys(config.params)) {
const value = config.params[propName];
var part = encodeURIComponent(propName) + "=";
- if (typeof(value) !== "undefined") {
+ if (value && typeof(value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
let params = propName + '[' + key + ']';
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index b456094..edc15e3 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -27,7 +27,7 @@
<el-col :lg="2" :md="2">
<el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
<el-button size="small">
- 涓婁紶
+ 閫夋嫨
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</el-upload>
@@ -164,4 +164,4 @@
line-height: 110px;
border-radius: 50%;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3