From 9d8da28f2ed526dfd14d58d5c79b856cf79cd274 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 04 Jun 2020 16:00:06 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/yangzongzhuan/RuoYi-Vue
---
ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index bca0493..8ffe25e 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
<template>
<div>
<img v-bind:src="options.img" @click="editCropper()" title="点击上传头像" class="img-circle img-lg" />
- <el-dialog :title="title" :visible.sync="open" width="800px">
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper
@@ -24,7 +24,7 @@
<br />
<el-row>
<el-col :lg="2" :md="2">
- <el-upload :show-file-list="false" :before-upload="beforeUpload">
+ <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>
@@ -44,7 +44,7 @@
<el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()"></el-button>
</el-col>
<el-col :lg="{span: 2, offset: 6}" :md="2">
- <el-button type="primary" size="small" @click="uploadImg()">上 传</el-button>
+ <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
</el-col>
</el-row>
</el-dialog>
@@ -84,6 +84,9 @@
editCropper() {
this.open = true;
},
+ // 覆盖默认的上传行为
+ requestUpload() {
+ },
// 向左旋转
rotateLeft() {
this.$refs.cropper.rotateLeft();
@@ -119,8 +122,6 @@
this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
this.msgSuccess("修改成功");
- } else {
- this.msgError(response.msg);
}
this.$refs.cropper.clearCrop();
});
--
Gitblit v1.9.2