From 1d4cbcbcc092b0d85d3b17f826b45bf478b75c88 Mon Sep 17 00:00:00 2001
From: klausY <emosick@qq.com>
Date: Sun, 10 May 2020 20:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=8F=9C=E5=8D=95-icon?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/superAdmin/menu/icon.vue | 12 ++++++------
 web/src/view/superAdmin/menu/menu.vue | 12 ++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/web/src/view/superAdmin/menu/icon.vue b/web/src/view/superAdmin/menu/icon.vue
index cfa4b9f9..6db497b2 100644
--- a/web/src/view/superAdmin/menu/icon.vue
+++ b/web/src/view/superAdmin/menu/icon.vue
@@ -317,17 +317,17 @@
           }
         },
         props:{
-            getIcon:{
+            icon:{
                     default: function() {
                         return {}
                     },
-                    type: Function
-            }
+                    type: Object
+            },
+        },
+        created() {
+            this.value = this.icon.icon
         },
         methods:{
-            propIcon(icon){
-                this.getIcon(icon)
-            }
         }
     }
 </script>
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 1986e326..3c22e311 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -70,7 +70,7 @@
           <el-input autocomplete="off" v-model="form.meta.title"></el-input>
         </el-form-item>
         <el-form-item label="图标" prop="meta.icon" style="width:30%">
-          <icon :getIcon="getIcon">
+          <icon :icon="icon">
             <template slot="prepend" >el-icon-</template>
           </icon>
         </el-form-item>
@@ -142,19 +142,14 @@ export default {
           { required: true, message: "请输入菜单展示名称", trigger: "blur" }
         ]
       },
-      isEdit: false
+      isEdit: false,
+      test:''
     };
   },
   components:{
     icon
   },
-  props:[
-      'getIcon'
-  ],
   methods: {
-    getIcon(icon){
-      this.form.meta.icon = icon
-    },
     setOptions() {
       this.menuOption = [
         {
@@ -294,6 +289,7 @@ export default {
       this.dialogTitle = "编辑菜单";
       const res = await getBaseMenuById({ id });
       this.form = res.data.menu;
+      this.icon = this.form.meta;
       this.isEdit = true;
       this.setOptions();
       this.dialogFormVisible = true;