Merge branch 'master' into feature/search

jydocs-pc/src/assets/style/_mixin.scss

@@ -10,3 +10,13 @@
 @function addFooter($a) {
   @return $footerHeight + $a;
 }
+
+@mixin diy-icon ($name, $size: 24) {
+  .el-icon-jy-#{$name} {
+    background: url("~@/assets/images/icon/#{$name}.png") no-repeat;
+    background-size: cover;
+    display: inline-block;
+    width: #{$size}px;
+    height: #{$size}px;
+  }
+}

jydocs-pc/src/views/Home.vue

@@ -32,7 +32,7 @@
       </div>
 
       <el-button @click="getTest" :loading="fullscreenLoading" type="primary">模拟Ajax</el-button>
-      <el-button  @click="getLoginStatus" type="info">获取登录状态</el-button>
+      <el-button  @click="getLoginStatus" type="info" icon="el-icon-jy-search">获取登录状态</el-button>
   </div>
 </template>
 
@@ -76,6 +76,9 @@ export default {
     .link-item {
         margin: 0 10px;
     }
+
+    @include diy-icon('search', 24);
+
     .new-list-group {
         .flex-c-c {
             padding: 20px;