Merge remote-tracking branch 'origin/master'
This commit is contained in:
zhy committed
commit
1bca584178
13 files changed
+237
-58
No files matched your search
@@ -15,6 +15,7 @@
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #2c3e50;
|
color: #2c3e50;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nav {
|
nav {
|
||||||
@@ -29,4 +30,7 @@ nav a {
|
|||||||
nav a.router-link-exact-active {
|
nav a.router-link-exact-active {
|
||||||
color: #42b983;
|
color: #42b983;
|
||||||
}
|
}
|
||||||
|
::-webkit-scrollbar{
|
||||||
|
display:none;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -54,6 +54,30 @@
|
|||||||
<div class="content unicode" style="display: block;">
|
<div class="content unicode" style="display: block;">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont"></span>
|
||||||
|
<div class="name">php</div>
|
||||||
|
<div class="code-name">&#xec50;</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont"></span>
|
||||||
|
<div class="name">机器学习</div>
|
||||||
|
<div class="code-name">&#xe601;</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont"></span>
|
||||||
|
<div class="name">css3</div>
|
||||||
|
<div class="code-name">&#xeb76;</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont"></span>
|
||||||
|
<div class="name">Ruby语言</div>
|
||||||
|
<div class="code-name">&#xe61d;</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<span class="icon iconfont"></span>
|
<span class="icon iconfont"></span>
|
||||||
<div class="name">rust</div>
|
<div class="name">rust</div>
|
||||||
@@ -228,9 +252,9 @@
|
|||||||
<pre><code class="language-css"
|
<pre><code class="language-css"
|
||||||
>@font-face {
|
>@font-face {
|
||||||
font-family: 'iconfont';
|
font-family: 'iconfont';
|
||||||
src: url('iconfont.woff2?t=1688142699712') format('woff2'),
|
src: url('iconfont.woff2?t=1688227003995') format('woff2'),
|
||||||
url('iconfont.woff?t=1688142699712') format('woff'),
|
url('iconfont.woff?t=1688227003995') format('woff'),
|
||||||
url('iconfont.ttf?t=1688142699712') format('truetype');
|
url('iconfont.ttf?t=1688227003995') format('truetype');
|
||||||
}
|
}
|
||||||
</code></pre>
|
</code></pre>
|
||||||
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
|
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
|
||||||
@@ -256,6 +280,42 @@
|
|||||||
<div class="content font-class">
|
<div class="content font-class">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont el-ico-aliphp"></span>
|
||||||
|
<div class="name">
|
||||||
|
php
|
||||||
|
</div>
|
||||||
|
<div class="code-name">.el-ico-aliphp
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont el-ico-alijiqixuexi___"></span>
|
||||||
|
<div class="name">
|
||||||
|
机器学习
|
||||||
|
</div>
|
||||||
|
<div class="code-name">.el-ico-alijiqixuexi___
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont el-ico-alicss3"></span>
|
||||||
|
<div class="name">
|
||||||
|
css3
|
||||||
|
</div>
|
||||||
|
<div class="code-name">.el-ico-alicss3
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<span class="icon iconfont el-ico-aliRubyyuyan"></span>
|
||||||
|
<div class="name">
|
||||||
|
Ruby语言
|
||||||
|
</div>
|
||||||
|
<div class="code-name">.el-ico-aliRubyyuyan
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<span class="icon iconfont el-ico-alirust"></span>
|
<span class="icon iconfont el-ico-alirust"></span>
|
||||||
<div class="name">
|
<div class="name">
|
||||||
@@ -517,6 +577,38 @@
|
|||||||
<div class="content symbol">
|
<div class="content symbol">
|
||||||
<ul class="icon_lists dib-box">
|
<ul class="icon_lists dib-box">
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
|
<use xlink:href="#el-ico-aliphp"></use>
|
||||||
|
</svg>
|
||||||
|
<div class="name">php</div>
|
||||||
|
<div class="code-name">#el-ico-aliphp</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
|
<use xlink:href="#el-ico-alijiqixuexi___"></use>
|
||||||
|
</svg>
|
||||||
|
<div class="name">机器学习</div>
|
||||||
|
<div class="code-name">#el-ico-alijiqixuexi___</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
|
<use xlink:href="#el-ico-alicss3"></use>
|
||||||
|
</svg>
|
||||||
|
<div class="name">css3</div>
|
||||||
|
<div class="code-name">#el-ico-alicss3</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li class="dib">
|
||||||
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
|
<use xlink:href="#el-ico-aliRubyyuyan"></use>
|
||||||
|
</svg>
|
||||||
|
<div class="name">Ruby语言</div>
|
||||||
|
<div class="code-name">#el-ico-aliRubyyuyan</div>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li class="dib">
|
<li class="dib">
|
||||||
<svg class="icon svg-icon" aria-hidden="true">
|
<svg class="icon svg-icon" aria-hidden="true">
|
||||||
<use xlink:href="#el-ico-alirust"></use>
|
<use xlink:href="#el-ico-alirust"></use>
|
||||||
|
|||||||
@@ -1,8 +1,18 @@
|
|||||||
@font-face {
|
@font-face {
|
||||||
font-family: "iconfont"; /* Project id 4146468 */
|
font-family: "iconfont"; /* Project id 4146468 */
|
||||||
src: url('iconfont.woff2?t=1688142699712') format('woff2'),
|
src: url('iconfont.woff2?t=1688227003995') format('woff2'),
|
||||||
url('iconfont.woff?t=1688142699712') format('woff'),
|
url('iconfont.woff?t=1688227003995') format('woff'),
|
||||||
url('iconfont.ttf?t=1688142699712') format('truetype');
|
url('iconfont.ttf?t=1688227003995') format('truetype');
|
||||||
|
}
|
||||||
|
|
||||||
|
[class^="el-ico-ali"], [class*=" el-ico-ali"]/*这里有空格*/
|
||||||
|
|
||||||
|
{
|
||||||
|
font-family: "iconfont" !important;
|
||||||
|
font-size: 16px;
|
||||||
|
font-style: normal;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
.iconfont {
|
.iconfont {
|
||||||
@@ -12,14 +22,21 @@
|
|||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
[class^="el-ico-ali"], [class*=" el-ico-ali"]/*这里有空格*/
|
|
||||||
|
|
||||||
{
|
.el-ico-aliphp:before {
|
||||||
font-family: "iconfont" !important;
|
content: "\ec50";
|
||||||
font-size: 16px;
|
}
|
||||||
font-style: normal;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
.el-ico-alijiqixuexi___:before {
|
||||||
-moz-osx-font-smoothing: grayscale;
|
content: "\e601";
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-ico-alicss3:before {
|
||||||
|
content: "\eb76";
|
||||||
|
}
|
||||||
|
|
||||||
|
.el-ico-aliRubyyuyan:before {
|
||||||
|
content: "\e61d";
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-ico-alirust:before {
|
.el-ico-alirust:before {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
window._iconfont_svg_string_4146468='<svg><symbol id="el-ico-alirust" viewBox="0 0 1024 1024"><path d="M1017.04003 499.502233l-43.639815-27.019885c-0.339999-3.999983-0.679997-7.859967-1.099995-11.75995l37.439841-34.999851a14.699937 14.699937 0 0 0-4.879979-24.499895l-47.999796-17.999924c-1.079995-3.759984-2.159991-7.559968-3.339986-11.279952l29.999872-41.659822a14.699937 14.699937 0 0 0-9.579959-23.079902l-50.839783-8.299965c-1.799992-3.459985-3.579985-6.899971-5.459977-10.299956l21.359909-46.8398a14.699937 14.699937 0 0 0-13.899941-20.779912l-51.63978 1.819992q-3.579985-4.439981-7.219969-8.799962L878.000622 163.683663a14.719937 14.719937 0 0 0-17.679925-17.679925L810.000911 157.863688q-4.339982-3.659984-8.799962-7.219969l1.819992-51.639781a14.699937 14.699937 0 0 0-20.779912-13.99994L735.401229 106.463907c-3.399986-1.879992-6.859971-3.679984-10.299956-5.459977l-8.299965-50.839784a14.699937 14.699937 0 0 0-23.079902-9.579959L652.001584 70.52406c-3.719984-1.179995-7.499968-2.25999-11.279952-3.339986l-17.999923-47.999796a14.699937 14.699937 0 0 0-24.499896-4.879979l-34.999851 37.439841c-3.899983-0.419998-7.819967-0.759997-11.75995-1.099996L524.502127 6.96433a14.699937 14.699937 0 0 0-24.999894 0L472.482348 50.604145c-3.999983 0.339999-7.859967 0.679997-11.75995 1.099995l-34.999851-37.439841a14.699937 14.699937 0 0 0-24.499895 4.879979l-17.999924 47.999796c-3.779984 1.099995-7.579968 2.159991-11.319951 3.359986l-41.639823-29.999872a14.699937 14.699937 0 0 0-23.079902 9.579959l-8.299965 50.819783c-3.459985 1.799992-6.899971 3.579985-10.319956 5.459977l-46.7998-21.259909a14.699937 14.699937 0 0 0-20.779912 13.99994l1.839992 51.61978c-2.979987 2.37999-5.999974 4.77998-8.839962 7.21997L163.683663 146.003738A14.719937 14.719937 0 0 0 146.003738 163.683663L157.863688 214.003449c-2.45999 2.899988-4.859979 5.859975-7.239969 8.819962l-51.619781-1.819992a14.839937 14.839937 0 0 0-12.739945 6.519972 14.699937 14.699937 0 0 0-1.139995 14.25994l21.319909 46.8198c-1.879992 3.399986-3.659984 6.859971-5.459977 10.319956l-50.819784 8.279965a14.699937 14.699937 0 0 0-9.579959 23.079902l29.999872 41.639822c-1.179995 3.739984-2.25999 7.539968-3.359985 11.319952l-47.999796 17.999924a14.699937 14.699937 0 0 0-4.879979 24.499895l37.439841 34.999851c-0.419998 3.899983-0.759997 7.819967-1.099996 11.75995l-43.719814 26.999885a14.699937 14.699937 0 0 0 0 24.999894l43.639815 27.019885c0.339999 3.999983 0.679997 7.839967 1.099995 11.73995l-37.439841 34.999851a14.699937 14.699937 0 0 0 4.87998 24.499895l47.999795 17.999924c1.099995 3.779984 2.159991 7.559968 3.359986 11.299952l-29.999872 41.659822a14.699937 14.699937 0 0 0 9.579959 23.079902l50.839783 8.299965c1.799992 3.439985 3.579985 6.899971 5.459977 10.279956l-21.259909 46.8598a14.699937 14.699937 0 0 0 1.139995 14.25994 14.259939 14.259939 0 0 0 12.739945 6.519972l51.659781-1.819992q3.539985 4.439981 7.199969 8.799962L146.003738 860.320697a14.719937 14.719937 0 0 0 17.679925 17.679925l50.319786-11.85995q4.359981 3.659984 8.819962 7.219969l-1.839992 51.639781a14.699937 14.699937 0 0 0 20.779912 13.89994l46.8598-21.359909c3.379986 1.879992 6.839971 3.659984 10.279956 5.459977l8.299965 50.839784a14.679937 14.679937 0 0 0 23.079902 9.559959l41.659822-29.999872c3.719984 1.199995 7.519968 2.25999 11.299952 3.359985l17.999924 47.999796a14.719937 14.719937 0 0 0 24.499895 4.879979l34.999851-37.43984c3.899983 0.419998 7.839967 0.759997 11.75995 1.099995l27.019885 43.639814a14.699937 14.699937 0 0 0 24.999894 0l27.019885-43.639814c3.999983-0.339999 7.859967-0.679997 11.75995-1.119995l34.999851 37.45984a14.719937 14.719937 0 0 0 24.499895-4.879979l17.999924-47.999796c3.779984-1.099995 7.559968-2.159991 11.299951-3.359985l41.639823 29.999872a14.679937 14.679937 0 0 0 23.079902-9.559959l8.299965-50.839784c3.439985-1.799992 6.899971-3.579985 10.299956-5.459977l46.8398 21.359909a14.699937 14.699937 0 0 0 20.779912-13.89994l-1.819992-51.639781q4.439981-3.579985 8.799962-7.219969l50.299786 11.85995a14.719937 14.719937 0 0 0 17.679925-17.679925L866.140672 810.000911q3.659984-4.339982 7.219969-8.799962l51.639781 1.819992a14.459938 14.459938 0 0 0 12.739945-6.519972 14.699937 14.699937 0 0 0 1.159995-14.25994l-21.359909-46.8398c1.879992-3.399986 3.659984-6.859971 5.459977-10.299956l50.839784-8.299965a14.699937 14.699937 0 0 0 9.579959-23.079902l-29.999872-41.659822c1.179995-3.739984 2.25999-7.519968 3.339985-11.299952l47.999796-17.999924a14.699937 14.699937 0 0 0 4.879979-24.499895l-37.43984-34.999851c0.419998-3.899983 0.759997-7.819967 1.099995-11.73995l43.639814-27.019885a14.699937 14.699937 0 0 0 0-24.999894z m-301.998714 258.158901A27.819882 27.819882 0 0 0 682.001456 779.021043l-15.279935 71.339696a375.018403 375.018403 0 0 1-312.718668-1.479993l-15.279935-71.319697a27.739882 27.739882 0 0 0-32.91986-21.359909l-63.019732 13.519943a374.758404 374.758404 0 0 1-32.519861-38.419837H516.60216c3.439985 0 5.779975-0.579998 5.779976-3.819983v-108.379539c0-3.139987-2.33999-3.819984-5.779976-3.819984h-89.65Line truncated
|
window._iconfont_svg_string_4146468='<svg><symbol id="el-ico-aliphp" viewBox="0 0 1024 1024"><path d="M299.093333 435.498667h-40.277333l-21.973333 112.981333h35.754666c23.722667 0 41.386667-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.466667-44.757334 3.925333-20.053333 2.133333-34.218667-5.290667-42.453333-7.466667-8.234667-22.314667-12.373333-44.672-12.373333zM512 242.688C229.248 242.688 0 363.264 0 512s229.248 269.354667 512 269.354667S1024 660.736 1024 512c0-148.736-229.248-269.312-512-269.312z m-139.093333 317.909333c-11.136 10.666667-24.533333 18.688-39.125334 23.509334-14.336 4.608-32.64 6.997333-54.826666 6.997333H228.565333l-13.952 71.722667H155.818667l52.48-269.909334h113.066666c34.005333 0 58.794667 8.917333 74.410667 26.794667 15.616 17.834667 20.309333 42.752 14.08 74.752a121.002667 121.002667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666z m171.690666 30.506667l23.168-119.424c2.688-13.568 1.664-22.869333-2.901333-27.776-4.565333-4.949333-14.336-7.424-29.312-7.424H488.96l-30.037333 154.666667H400.554667l52.48-269.952h58.325333l-13.952 71.765333h51.968c32.725333 0 55.253333 5.717333 67.669333 17.109333s16.128 29.866667 11.221334 55.424l-24.405334 125.610667h-59.264z m324.138667-96.64a118.698667 118.698667 0 0 1-13.013333 36.138667c-6.101333 10.88-14.08 20.906667-23.936 29.994666a104.106667 104.106667 0 0 1-39.125334 23.509334c-14.336 4.608-32.64 6.997333-54.869333 6.997333h-50.346667l-13.952 71.765333h-58.794666l52.48-269.909333h113.024c34.005333 0 58.794667 8.917333 74.410666 26.794667 15.616 17.792 20.352 42.709333 14.122667 74.709333z m-110.72-58.965333h-40.234667l-22.016 112.981333h35.754667c23.765333 0 41.429333-4.48 52.992-13.397333 11.605333-8.96 19.413333-23.850667 23.509333-44.757334 3.925333-20.053333 2.090667-34.218667-5.333333-42.453333s-22.357333-12.373333-44.672-12.373333z" ></path></symbol><symbol id="el-ico-alijiqixuexi___" viewBox="0 0 1024 1024"><path d="M 512 960 c -247.424 0 -448 -200.576 -448 -448 S 264.576 64 512 64 s 448 200.576 448 448 s -200.576 448 -448 448 Z m 183.888 -306.04 c -30.556 0 -56.608 19.28 -67.116 46.448 L 398.784 646.6 c 0.944 -4.704 1.44 -9.568 1.44 -14.548 c 0 -30.836 -18.908 -57.152 -45.6 -67.856 l 34.32 -185.092 c 16.092 -3.16 29.648 -13.52 37.22 -27.668 l 215.884 -13.02 a 54.744 54.744 0 0 0 16.896 18.076 l -26.928 118.948 c -20.72 2.396 -37.84 16.64 -44.664 35.876 l -69.872 -0.368 a 32.788 32.788 0 0 0 -1.696 -2.604 l 16.284 -52.904 a 36.336 36.336 0 0 0 26.804 -35.144 c 0 -20.16 -16.144 -36.512 -36.056 -36.512 c -19.908 0 -36.056 16.352 -36.056 36.512 a 36.64 36.64 0 0 0 10.5 25.748 l -14.632 47.696 c -17.94 2.1 -31.92 17.356 -31.92 36.084 c 0 20.16 16.144 36.512 36.052 36.512 c 12.708 0 23.828 -6.696 30.252 -16.752 l 71.248 1.264 c 8.14 19.812 27.424 33.744 49.936 33.744 c 29.872 0 54.084 -24.52 54.084 -54.768 c 0 -19.328 -9.912 -36.28 -24.856 -46.032 l 26.612 -118.532 c 27.352 -2.732 48.724 -26.08 48.724 -54.496 C 742.76 280.52 718.544 256 688.68 256 c -27 0 -49.32 20.06 -53.36 46.24 l -203.708 12.292 c -4.968 -25.052 -26.812 -43.928 -53.016 -43.928 c -29.868 0 -54.084 24.52 -54.084 54.764 c 0 20.972 11.652 39.168 28.744 48.368 l -34.484 185.976 C 283.368 564.364 256 594.936 256 632.052 c 0 40.332 32.284 73.02 72.112 73.02 c 21.584 0 40.904 -9.652 54.12 -24.868 l 242.284 56.68 c 4.784 35.632 34.868 63.116 71.372 63.116 c 39.828 0 72.112 -32.692 72.112 -73.02 c 0 -40.328 -32.284 -73.02 -72.112 -73.02 Z" fill="#868686" ></path></symbol><symbol id="el-ico-alicss3" viewBox="0 0 1024 1024"><path d="M64 0h896l-81.493333 920.021333L511.018667 1024l-365.44-104.021333L64 0z m729.173333 188.288L230.826667 188.16l9.088 111.872 432 0.085333-10.88 115.882667h-283.306667l10.24 109.781333h263.765333l-15.616 150.314667-124.16 34.304-126.122666-34.56-8.021334-90.026667h-111.36l12.373334 164.48L512 822.954667l229.248-65.28L793.173333 188.330667z" ></path></symbol><symbol id="el-ico-aliRubyyuyan" viewBox="0 0 1024 1024"><path d="M924 0H100C45 0 0 45 0 100v824c0 55 45 100 100 100h824c55 0 100-45 100-100V100c0-55-45-100-100-100z m55 924c0 14.58-5.75 28.36-16.19 38.81S938.58 979 924 979H100c-14.58 0-28.36-5.75-38.81-16.19S45 938.58 45 924V315h934v609zM45 270V100c0-14.58 5.75-28.36 16.19-38.81C71.64 50.75 85.42 45 100 45h824c14.58 0 28.36 5.75 38.81 16.19C973.25 71.64 979 85.42 979 100v170H45z" fill="#303133" ></path><path d="M157.5 157.5m-22.5 0a22.5 22.5 0 1 0 45 0 22.5 22.5 0 1 0-45 0Z" fill="#303133" ></path><path d="M292.5 157.5m-22.5 0a22.5 22.5 0 1 0 45 0 22.5 22.5 0 1 0-45 0Z" fill="#303133" ></path><path d="M427.5 157.5m-22.5 0a22.5 22.5 0 1 0 45 0 22.5 22.5 0 1 0-45 0Z" fill="#303133" ></path><path d="M254 757.52l-50.9-83.53h-34.49v83.53h-49.56V536.76h86.39c51.9 0 93.08 16.11 93.08 66.82 0 33.11-18.75 53.7-47.21 63.54l57.93 90.39H254z m-85.38-118.43h32.14c31.81 0 49.22-11.93 49.22-35.5 0-23.87-17.41-31.92-49.22-31.92h-32.14v67.42zM341.4 694.87V590.46h49.22v98.75c0 25.95 8.04 34.9 26.12 34.9 15.4 0 25.45-5.97 38.17-Line truncated
|
||||||
@@ -5,6 +5,34 @@
|
|||||||
"css_prefix_text": "el-ico-ali",
|
"css_prefix_text": "el-ico-ali",
|
||||||
"description": "",
|
"description": "",
|
||||||
"glyphs": [
|
"glyphs": [
|
||||||
|
{
|
||||||
|
"icon_id": "15378684",
|
||||||
|
"name": "php",
|
||||||
|
"font_class": "php",
|
||||||
|
"unicode": "ec50",
|
||||||
|
"unicode_decimal": 60496
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "10033408",
|
||||||
|
"name": "机器学习",
|
||||||
|
"font_class": "jiqixuexi___",
|
||||||
|
"unicode": "e601",
|
||||||
|
"unicode_decimal": 58881
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "15378279",
|
||||||
|
"name": "css3",
|
||||||
|
"font_class": "css3",
|
||||||
|
"unicode": "eb76",
|
||||||
|
"unicode_decimal": 60278
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"icon_id": "20784475",
|
||||||
|
"name": "Ruby语言",
|
||||||
|
"font_class": "Rubyyuyan",
|
||||||
|
"unicode": "e61d",
|
||||||
|
"unicode_decimal": 58909
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"icon_id": "27365258",
|
"icon_id": "27365258",
|
||||||
"name": "rust",
|
"name": "rust",
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -20,7 +20,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import SearchInput from "@/components/SearchInput.vue";
|
import SearchInput from "@/components/Home/SearchInput.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "HeaderComponent",
|
name: "HeaderComponent",
|
||||||
|
|||||||
@@ -9,18 +9,20 @@
|
|||||||
<span><i class="el-icon-menu"></i> 热门标签</span>
|
<span><i class="el-icon-menu"></i> 热门标签</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom clearfix">
|
<div class="bottom clearfix">
|
||||||
<el-tabs v-model="currentTabName" tab-position="left" @tab-click="typeChange">
|
<el-scrollbar style="height:50vh">
|
||||||
<el-tab-pane v-for="(tag,index) in tags" :key="index" :index="index" :name="tag.name" >
|
<el-tabs v-model="currentTabName" tab-position="left" @tab-click="typeChange" lazy>
|
||||||
<span slot="label" style="text-align: center" v-html="tag.icon"></span>
|
<el-tab-pane v-for="(tag,index) in tags" :key="index" :index="tag.categoryId" :name="tag.categoryName" >
|
||||||
|
<span slot="label" style="border-radius: 10px;align-items: center;display: flex;flex-direction: row;justify-content: flex-start" v-html="tag.category"></span>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
|
</el-scrollbar>
|
||||||
<!-- <div v-for="(tag,index) in tags" :key="index" class="text item">-->
|
<!-- <div v-for="(tag,index) in tags" :key="index" class="text item">-->
|
||||||
<!--<!– <el-tag style="margin-top: 10px" type="success" v-html="tag"></el-tag>–>-->
|
<!--<!– <el-tag style="margin-top: 10px" type="success" v-html="tag"></el-tag>–>-->
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
<div style="margin-top: 10px;width: 100%;height: 0;border-top: 1px solid #eee;"></div>
|
<div style="margin-top: 10px;width: 100%;height: 0;border-top: 1px solid #eee;"></div>
|
||||||
<div>
|
<div>
|
||||||
<i class="el-icon-setting"></i>
|
<i class="el-icon-setting"></i>
|
||||||
<el-button type="text" class="button">管理标签</el-button>
|
<el-button type="text" class="button" @click="manageCategoryVisible=true">管理标签</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
@@ -201,6 +203,17 @@
|
|||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
|
||||||
|
<!--管理标签弹框-->
|
||||||
|
<el-dialog
|
||||||
|
:visible.sync="manageCategoryVisible"
|
||||||
|
width="50vw">
|
||||||
|
<div>
|
||||||
|
<ManageCategory></ManageCategory>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
</el-main>
|
</el-main>
|
||||||
</el-container>
|
</el-container>
|
||||||
</template>
|
</template>
|
||||||
@@ -208,11 +221,13 @@
|
|||||||
<script>
|
<script>
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import Vue from "vue";
|
import Vue from "vue";
|
||||||
import ProjectList from "@/components/ProjectList.vue";
|
import ProjectList from "@/components/Home/ProjectList.vue";
|
||||||
|
import manageCategory from "@/components/Home/ManageCategory.vue";
|
||||||
|
import ManageCategory from "@/components/Home/ManageCategory.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "HomeComponent",
|
name: "HomeComponent",
|
||||||
components: {ProjectList},
|
components: {ManageCategory, ProjectList},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
activeName: 'first',
|
activeName: 'first',
|
||||||
@@ -224,6 +239,7 @@ export default {
|
|||||||
loading: false,
|
loading: false,
|
||||||
loginDialogVisible: false,
|
loginDialogVisible: false,
|
||||||
registerDialogVisible: false,
|
registerDialogVisible: false,
|
||||||
|
manageCategoryVisible:false,
|
||||||
imageUrl: "http://localhost:8082/helloGithub_war_exploded/VerifycodeServlet?" + new Date().getDate(),
|
imageUrl: "http://localhost:8082/helloGithub_war_exploded/VerifycodeServlet?" + new Date().getDate(),
|
||||||
checked: false,
|
checked: false,
|
||||||
passwordVisible: "password",
|
passwordVisible: "password",
|
||||||
@@ -247,38 +263,13 @@ export default {
|
|||||||
password: [{required: true, message: "请输入密码", trigger: "blur"}],
|
password: [{required: true, message: "请输入密码", trigger: "blur"}],
|
||||||
code: [{required: true, message: "请输入验证码", trigger: "blur"}],
|
code: [{required: true, message: "请输入验证码", trigger: "blur"}],
|
||||||
},
|
},
|
||||||
// tags:['<i class="el-icon-discover"></i> 综 合',
|
tags:null,
|
||||||
// '<i class="el-ico-alicyuyan"></i> C++',
|
|
||||||
// '<i class="el-ico-aliPython"></i> python',
|
|
||||||
// `<i class="el-ico-alijava"></i> java`,
|
|
||||||
// `<i class="el-ico-alicyuyan"></i> C`,
|
|
||||||
// `<i class="el-ico-alioutline-java-script"></i> javaScript`,
|
|
||||||
// `<i class="el-ico-alicaishichang-"></i> 教 程`,
|
|
||||||
// ],
|
|
||||||
tags:[
|
|
||||||
{
|
|
||||||
icon: `<i class="el-icon-discover"></i> 综 合`,
|
|
||||||
name:"综合"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: `<i class="el-ico-alicyuyan"></i> C`,
|
|
||||||
name:"C"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: `<i class="el-ico-aliGoyuyan"></i> C#`,
|
|
||||||
name:"C#"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: `<i class="el-ico-alicyuyan"></i> C++`,
|
|
||||||
name:"C++"
|
|
||||||
},
|
|
||||||
],
|
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.account(); //获取cookie的方法
|
this.account(); //获取cookie的方法
|
||||||
this.ProjectLists();
|
this.ProjectLists();
|
||||||
|
this.categoryList();
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
// if (sessionStorage.getItem('current_name') == null){
|
// if (sessionStorage.getItem('current_name') == null){
|
||||||
@@ -294,6 +285,9 @@ export default {
|
|||||||
// next()
|
// next()
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
manageCategory() {
|
||||||
|
return manageCategory
|
||||||
|
},
|
||||||
noMore() {
|
noMore() {
|
||||||
return this.count >= 10
|
return this.count >= 10
|
||||||
},
|
},
|
||||||
@@ -514,7 +508,7 @@ export default {
|
|||||||
that.projectLists=res.data;
|
that.projectLists=res.data;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
projectListsByCount(index){
|
projectListsByCount(index,name){
|
||||||
var that=this;
|
var that=this;
|
||||||
axios({
|
axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -523,6 +517,7 @@ export default {
|
|||||||
// URL 中的查询参数
|
// URL 中的查询参数
|
||||||
params: {
|
params: {
|
||||||
num: index,
|
num: index,
|
||||||
|
name:name
|
||||||
}
|
}
|
||||||
}).then((res)=>{
|
}).then((res)=>{
|
||||||
// console.log(res.data);
|
// console.log(res.data);
|
||||||
@@ -532,23 +527,21 @@ export default {
|
|||||||
tabChange(tab) {
|
tabChange(tab) {
|
||||||
if(tab.name=="first"){
|
if(tab.name=="first"){
|
||||||
if(this.currentTabIndex!=null){
|
if(this.currentTabIndex!=null){
|
||||||
this. typeChangeFun(this.currentTabIndex);
|
this.typeChangeFun(this.currentTabIndex,this.currentTabName);
|
||||||
}else {
|
}else {
|
||||||
this.ProjectLists();
|
this.ProjectLists();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
if (tab.name == "second") {
|
if (tab.name == "second") {
|
||||||
if(this.currentTabIndex!=null){
|
if(this.currentTabIndex!=null){
|
||||||
this.projectListsByCount(this.currentTabIndex);
|
this.projectListsByCount(this.currentTabIndex,this.currentTabName);
|
||||||
}else {
|
}else {
|
||||||
this.projectListsByCount(this.tabindex);
|
this.projectListsByCount(this.tabindex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
typeChangeFun(index){
|
typeChangeFun(index,name){
|
||||||
var that=this;
|
var that=this;
|
||||||
axios({
|
axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
@@ -557,6 +550,7 @@ export default {
|
|||||||
// URL 中的查询参数
|
// URL 中的查询参数
|
||||||
params: {
|
params: {
|
||||||
num: index,
|
num: index,
|
||||||
|
name:name
|
||||||
}
|
}
|
||||||
}).then((res)=>{
|
}).then((res)=>{
|
||||||
console.log(res.data);
|
console.log(res.data);
|
||||||
@@ -567,12 +561,27 @@ export default {
|
|||||||
typeChange(tab){
|
typeChange(tab){
|
||||||
this.currentTabIndex=tab.index;
|
this.currentTabIndex=tab.index;
|
||||||
if(this.activeName==="first"){
|
if(this.activeName==="first"){
|
||||||
this.typeChangeFun(tab.index);
|
this.typeChangeFun(tab.index,this.currentTabName);
|
||||||
}
|
}
|
||||||
if(this.activeName==="second"){
|
if(this.activeName==="second"){
|
||||||
this.projectListsByCount(tab.index);
|
this.projectListsByCount(tab.index,this.currentTabName);
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
// 标签列表
|
||||||
|
categoryList(){
|
||||||
|
var that=this;
|
||||||
|
axios({
|
||||||
|
method: 'post',
|
||||||
|
// 请求的地址
|
||||||
|
url: 'http://localhost:8082/helloGithub_war_exploded/retLabel',
|
||||||
|
// URL 中的查询参数
|
||||||
|
params: {
|
||||||
|
}
|
||||||
|
}).then((res)=>{
|
||||||
|
console.log(res);
|
||||||
|
that.tags=res.data;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -604,4 +613,8 @@ export default {
|
|||||||
background-color: #eeeeee;
|
background-color: #eeeeee;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.el-scrollbar__wrap {
|
||||||
|
overflow-y: hidden;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<template>
|
||||||
|
<el-card class="box-card">
|
||||||
|
<el-checkbox-group v-model="checkboxGroup" size="medium">
|
||||||
|
<el-checkbox label="备选项1" border></el-checkbox>
|
||||||
|
</el-checkbox-group>
|
||||||
|
</el-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: "ManageCategory",
|
||||||
|
props: {
|
||||||
|
tags: Object
|
||||||
|
},
|
||||||
|
data(){
|
||||||
|
return{
|
||||||
|
checkboxGroup:[],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div style="margin-left: 10px;width: 10px;height: 10px;border-radius: 50%;background-color: #ffba00"></div>
|
<div style="margin-left: 10px;width: 10px;height: 10px;border-radius: 50%;background-color: #ffba00"></div>
|
||||||
</div>
|
</div>
|
||||||
<el-tag size="mini" style="margin-left: 5px">{{projectLists.categoryName}}</el-tag><span style="color: rgb(156 163 175);margin-left: 5px"> • </span>
|
<el-tag size="mini" style="margin-left: 5px" v-html="projectLists.categoryName"></el-tag><span style="color: rgb(156 163 175);margin-left: 5px"> • </span>
|
||||||
<div style="margin-left: 10px">
|
<div style="margin-left: 10px">
|
||||||
<span style="color: rgb(156 163 175); ">{{ formatTime }}</span>
|
<span style="color: rgb(156 163 175); ">{{ formatTime }}</span>
|
||||||
</div>
|
</div>
|
||||||
File renamed without changes.
Reference in new issue
Block a user