Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
| | |
|---|
| | | 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; |
|---|
| | |
|---|
| | | 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 + ']'; |
|---|
| | |
|---|
| | | <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> |
|---|
