Merge branch 'develop5.0-tmd' into develop5.0

TEAMModelOS/ClientApp/src/assets/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">&#xe659;</span>
+                <div class="name">微信 (1)</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe643;</span>
+                <div class="name">地球</div>
+                <div class="code-name">&amp;#xe643;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe603;</span>
                 <div class="name">手机未认证</div>
@@ -774,9 +786,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1621999720250') format('woff2'),
-       url('iconfont.woff?t=1621999720250') format('woff'),
-       url('iconfont.ttf?t=1621999720250') format('truetype');
+  src: url('iconfont.woff2?t=1623422826606') format('woff2'),
+       url('iconfont.woff?t=1623422826606') format('woff'),
+       url('iconfont.ttf?t=1623422826606') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -802,6 +814,24 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-wechat"></span>
+            <div class="name">
+              微信 (1)
+            </div>
+            <div class="code-name">.icon-wechat
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-earth"></span>
+            <div class="name">
+              地球
+            </div>
+            <div class="code-name">.icon-earth
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-phone-unverify"></span>
             <div class="name">
@@ -1882,6 +1912,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-wechat"></use>
+                </svg>
+                <div class="name">微信 (1)</div>
+                <div class="code-name">#icon-wechat</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-earth"></use>
+                </svg>
+                <div class="name">地球</div>
+                <div class="code-name">#icon-earth</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-phone-unverify"></use>

TEAMModelOS/ClientApp/src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2000444 */
-  src: url('iconfont.woff2?t=1621999720250') format('woff2'),
-       url('iconfont.woff?t=1621999720250') format('woff'),
-       url('iconfont.ttf?t=1621999720250') format('truetype');
+  src: url('iconfont.woff2?t=1623422826606') format('woff2'),
+       url('iconfont.woff?t=1623422826606') format('woff'),
+       url('iconfont.ttf?t=1623422826606') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wechat:before {
+  content: "\e659";
+}
+
+.icon-earth:before {
+  content: "\e643";
+}
+
 .icon-phone-unverify:before {
   content: "\e603";
 }

TEAMModelOS/ClientApp/src/assets/iconfont/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "1382584",
+      "name": "微信 (1)",
+      "font_class": "wechat",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "2678587",
+      "name": "地球",
+      "font_class": "earth",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
     {
       "icon_id": "21777109",
       "name": "手机未认证",