Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	packageRc/api/company/index.js
#	unpackage/dist/dev/mp-weixin/project.config.json

static/iconfont/demo_index.html

@@ -54,6 +54,18 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe63f;</span>
+                <div class="name">gxbys</div>
+                <div class="code-name">&amp;#xe63f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60f;</span>
+                <div class="name">个人中心</div>
+                <div class="code-name">&amp;#xe60f;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe607;</span>
                 <div class="name">素质测评</div>
@@ -120,9 +132,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1760941852498') format('woff2'),
-       url('iconfont.woff?t=1760941852498') format('woff'),
-       url('iconfont.ttf?t=1760941852498') format('truetype');
+  src: url('iconfont.woff2?t=1761826914823') format('woff2'),
+       url('iconfont.woff?t=1761826914823') format('woff'),
+       url('iconfont.ttf?t=1761826914823') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -148,6 +160,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-Graduation-simple-"></span>
+            <div class="name">
+              gxbys
+            </div>
+            <div class="code-name">.icon-Graduation-simple-
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gerenzhongxin"></span>
+            <div class="name">
+              个人中心
+            </div>
+            <div class="code-name">.icon-gerenzhongxin
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-suzhicepingtiku"></span>
             <div class="name">
@@ -247,6 +277,22 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-Graduation-simple-"></use>
+                </svg>
+                <div class="name">gxbys</div>
+                <div class="code-name">#icon-Graduation-simple-</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gerenzhongxin"></use>
+                </svg>
+                <div class="name">个人中心</div>
+                <div class="code-name">#icon-gerenzhongxin</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-suzhicepingtiku"></use>

static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 5044714 */
-  src: url('iconfont.woff2?t=1760941852498') format('woff2'),
-       url('iconfont.woff?t=1760941852498') format('woff'),
-       url('iconfont.ttf?t=1760941852498') format('truetype');
+  src: url('iconfont.woff2?t=1761826914823') format('woff2'),
+       url('iconfont.woff?t=1761826914823') format('woff'),
+       url('iconfont.ttf?t=1761826914823') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-Graduation-simple-:before {
+  content: "\e63f";
+}
+
+.icon-gerenzhongxin:before {
+  content: "\e60f";
+}
+
 .icon-suzhicepingtiku:before {
   content: "\e607";
 }

static/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "5122382",
+      "name": "gxbys",
+      "font_class": "Graduation-simple-",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "6311925",
+      "name": "个人中心",
+      "font_class": "gerenzhongxin",
+      "unicode": "e60f",
+      "unicode_decimal": 58895
+    },
     {
       "icon_id": "28808301",
       "name": "素质测评",