From 5d5f955a3427b5e29162cf0fae3113d7668d22fe Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 24 Jun 2020 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=88=90=E5=8A=9F=E4=BA=8C=E6=AC=A1=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=94=B9=E5=8F=98=E8=A3=81=E5=89=AA=E6=A1=86?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=92=8C=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/user/profile/userAvatar.vue     | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 8ffe25e31..8f60085d4 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 @@ export default {
     return {
       // 是否显示弹出层
       open: false,
+      // 是否显示cropper
+      visible: false,
       // 弹出层标题
       title: "修改头像",
       options: {
@@ -84,6 +87,10 @@ export default {
     editCropper() {
       this.open = true;
     },
+    // 打开弹出层结束时的回调
+    modalOpened() {
+      this.visible = true;
+    },
     // 覆盖默认的上传行为
     requestUpload() {
     },
@@ -121,9 +128,10 @@ export default {
           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;
         });
       });
     },