From 9a2970e907981b70dc30365b946c1d9dd901c842 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Thu, 30 Apr 2020 17:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E6=A0=87=E9=A1=B5?=
 =?UTF-8?q?=20menu=E5=A2=9E=E5=8A=A0icon=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/{test => about}/index.vue |  0
 web/src/view/iconList/index.vue        | 78 +++++++++++++++++++++++++-
 web/src/view/superAdmin/menu/menu.vue  |  4 +-
 3 files changed, 79 insertions(+), 3 deletions(-)
 rename web/src/view/{test => about}/index.vue (100%)

diff --git a/web/src/view/test/index.vue b/web/src/view/about/index.vue
similarity index 100%
rename from web/src/view/test/index.vue
rename to web/src/view/about/index.vue
diff --git a/web/src/view/iconList/index.vue b/web/src/view/iconList/index.vue
index 6a9a8429..dcb68369 100644
--- a/web/src/view/iconList/index.vue
+++ b/web/src/view/iconList/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <ul class="icon-list">
+    <ul class="icon-list clearfix">
         <li>
     <span>
       <i class="el-icon-platform-eleme"></i>
@@ -1223,6 +1223,7 @@
         <li>
     <span>
       <i class="el-icon-moon"></i>
+      <br/>
       <span class="icon-name">el-icon-moon</span></span>
         </li>
         <li>
@@ -1413,6 +1414,79 @@
     }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+.icon-list{
+  -webkit-tap-highlight-color: transparent;
+  font-family: icomoon!important;
+  font-style: normal;
+  font-weight: 400;
+  font-variant: normal;
+  text-transform: none;
+  -webkit-font-smoothing: antialiased;
+  overflow: hidden;
+  list-style: none;
+  padding: 0!important;
+  border: 1px solid #eaeefb;
+  border-radius: 4px;
+  font-size: 14px;
+  color: #5e6d82;
+  line-height: 2em;
+  li{
+    -webkit-tap-highlight-color: transparent;
+    font-family: icomoon!important;
+    font-style: normal;
+    font-weight: 400;
+    font-variant: normal;
+    text-transform: none;
+    -webkit-font-smoothing: antialiased;
+    list-style: none;
+    float: left;
+    width: 16.66%;
+    text-align: center;
+    height: 120px;
+    line-height: 120px;
+    color: #666;
+    font-size: 13px;
+    border-right: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+    margin-right: -1px;
+    margin-bottom: -1px;
+    span{
+      -webkit-tap-highlight-color: transparent;
+      font-style: normal;
+      font-weight: 400;
+      font-variant: normal;
+      text-transform: none;
+      -webkit-font-smoothing: antialiased;
+      list-style: none;
+      text-align: center;
+      font-size: 13px;
+      display: inline-block;
+      vertical-align: middle;
+      line-height: normal;
+      font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+      color: #99a9bf;
+      transition: color .15s linear;
+      i{
+        -webkit-tap-highlight-color: transparent;
+        list-style: none;
+        text-align: center;
+        font-family: element-icons!important;
+        font-style: normal;
+        font-weight: 400;
+        font-variant: normal;
+        text-transform: none;
+        line-height: 1;
+        vertical-align: baseline;
+        -webkit-font-smoothing: antialiased;
+        display: block;
+        font-size: 32px;
+        margin-bottom: 15px;
+        color: #606266;
+        transition: color .15s linear;
+      }
+    }
+  }
+}
 
 </style>
\ No newline at end of file
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 8dd98a02..d1a05b3d 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -63,7 +63,9 @@
           <el-input autocomplete="off" v-model="form.meta.title"></el-input>
         </el-form-item>
         <el-form-item label="图标" prop="meta.icon">
-          <el-input autocomplete="off" v-model="form.meta.icon"></el-input>
+          <el-input autocomplete="off" v-model="form.meta.icon">
+            <template slot="prepend">el-icon-</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="排序标记" prop="sort">
           <el-input autocomplete="off" v-model.number="form.sort"></el-input>
-- 
GitLab