From f0bee6af6358e07b5426df16aab37f4259de52f6 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 六月 2020 09:08:18 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 9bb5d4a..334cc11 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" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper
@@ -13,6 +13,7 @@
:autoCropHeight="options.autoCropHeight"
:fixedBox="options.fixedBox"
@realTime="realTime"
+ v-if="visible"
/>
</el-col>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
@@ -67,6 +68,8 @@
return {
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ // 鏄惁鏄剧ずcropper
+ visible: false,
// 寮瑰嚭灞傛爣棰�
title: "淇敼澶村儚",
options: {
@@ -83,6 +86,10 @@
// 缂栬緫澶村儚
editCropper() {
this.open = true;
+ },
+ // 鎵撳紑寮瑰嚭灞傜粨鏉熸椂鐨勫洖璋�
+ modalOpened() {
+ this.visible = true;
},
// 瑕嗙洊榛樿鐨勪笂浼犺涓�
requestUpload() {
@@ -121,9 +128,10 @@
if (response.code === 200) {
this.open = false;
this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
+ store.commit('SET_AVATAR', this.options.img);
this.msgSuccess("淇敼鎴愬姛");
}
- this.$refs.cropper.clearCrop();
+ this.visible = false;
});
});
},
@@ -133,4 +141,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
--
Gitblit v1.9.3