Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/assets/icons/iconfont/demo_index.html

@@ -55,6 +55,198 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe8d2;</span>
+                <div class="name">iconm_gongncd</div>
+                <div class="code-name">&amp;#xe8d2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d3;</span>
+                <div class="name">iconm_changycd</div>
+                <div class="code-name">&amp;#xe8d3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d4;</span>
+                <div class="name">iconx_changycd</div>
+                <div class="code-name">&amp;#xe8d4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d5;</span>
+                <div class="name">iconx_gongncd</div>
+                <div class="code-name">&amp;#xe8d5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ba;</span>
+                <div class="name">icomx_xiaosht</div>
+                <div class="code-name">&amp;#xe8ba;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8bb;</span>
+                <div class="name">iconm_daicg</div>
+                <div class="code-name">&amp;#xe8bb;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8bc;</span>
+                <div class="name">iconm_fukgl</div>
+                <div class="code-name">&amp;#xe8bc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8bd;</span>
+                <div class="name">iconm_hetgl</div>
+                <div class="code-name">&amp;#xe8bd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8be;</span>
+                <div class="name">iconm_jihuagl</div>
+                <div class="code-name">&amp;#xe8be;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8bf;</span>
+                <div class="name">iconx_daicg</div>
+                <div class="code-name">&amp;#xe8bf;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c0;</span>
+                <div class="name">iconm_xiaosht</div>
+                <div class="code-name">&amp;#xe8c0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c1;</span>
+                <div class="name">iconm_shenggl</div>
+                <div class="code-name">&amp;#xe8c1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c2;</span>
+                <div class="name">iconx_caigth</div>
+                <div class="code-name">&amp;#xe8c2;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c3;</span>
+                <div class="name">iconx_daishenpi (1)</div>
+                <div class="code-name">&amp;#xe8c3;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c4;</span>
+                <div class="name">iconx_fukgl</div>
+                <div class="code-name">&amp;#xe8c4;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c5;</span>
+                <div class="name">iconm_daishenpi</div>
+                <div class="code-name">&amp;#xe8c5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c6;</span>
+                <div class="name">iconm_caigth</div>
+                <div class="code-name">&amp;#xe8c6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c7;</span>
+                <div class="name">iconm_xiaosth</div>
+                <div class="code-name">&amp;#xe8c7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c8;</span>
+                <div class="name">iconx_hetgl</div>
+                <div class="code-name">&amp;#xe8c8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8c9;</span>
+                <div class="name">iconm_wulwh</div>
+                <div class="code-name">&amp;#xe8c9;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ca;</span>
+                <div class="name">iconx_shenggl</div>
+                <div class="code-name">&amp;#xe8ca;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8cb;</span>
+                <div class="name">iconm_yicg</div>
+                <div class="code-name">&amp;#xe8cb;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8cc;</span>
+                <div class="name">iconx_lisfk</div>
+                <div class="code-name">&amp;#xe8cc;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8cd;</span>
+                <div class="name">iconm_lisfk</div>
+                <div class="code-name">&amp;#xe8cd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8ce;</span>
+                <div class="name">iconx_daishenpi</div>
+                <div class="code-name">&amp;#xe8ce;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8cf;</span>
+                <div class="name">iconx_wulwh</div>
+                <div class="code-name">&amp;#xe8cf;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d0;</span>
+                <div class="name">iconx_jihuagl</div>
+                <div class="code-name">&amp;#xe8d0;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8d1;</span>
+                <div class="name">iconx_yicg</div>
+                <div class="code-name">&amp;#xe8d1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b6;</span>
+                <div class="name">iconm_saixuan</div>
+                <div class="code-name">&amp;#xe8b6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b7;</span>
+                <div class="name">iconm_play2</div>
+                <div class="code-name">&amp;#xe8b7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b8;</span>
+                <div class="name">iconx_daishenpi</div>
+                <div class="code-name">&amp;#xe8b8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe8b9;</span>
+                <div class="name">iconm_daishenpi</div>
+                <div class="code-name">&amp;#xe8b9;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe8b4;</span>
                 <div class="name">iconx_saixuan</div>
                 <div class="code-name">&amp;#xe8b4;</div>
@@ -2766,9 +2958,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1686554047584') format('woff2'),
-       url('iconfont.woff?t=1686554047584') format('woff'),
-       url('iconfont.ttf?t=1686554047584') format('truetype');
+  src: url('iconfont.woff2?t=1687672153417') format('woff2'),
+       url('iconfont.woff?t=1687672153417') format('woff'),
+       url('iconfont.ttf?t=1687672153417') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -2795,6 +2987,294 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-iconm_gongncd"></span>
+            <div class="name">
+              iconm_gongncd
+            </div>
+            <div class="code-name">.icon-iconm_gongncd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_changycd"></span>
+            <div class="name">
+              iconm_changycd
+            </div>
+            <div class="code-name">.icon-iconm_changycd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_changycd"></span>
+            <div class="name">
+              iconx_changycd
+            </div>
+            <div class="code-name">.icon-iconx_changycd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_gongncd"></span>
+            <div class="name">
+              iconx_gongncd
+            </div>
+            <div class="code-name">.icon-iconx_gongncd
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-icomx_xiaosht"></span>
+            <div class="name">
+              icomx_xiaosht
+            </div>
+            <div class="code-name">.icon-icomx_xiaosht
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_daicg"></span>
+            <div class="name">
+              iconm_daicg
+            </div>
+            <div class="code-name">.icon-iconm_daicg
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_fukgl"></span>
+            <div class="name">
+              iconm_fukgl
+            </div>
+            <div class="code-name">.icon-iconm_fukgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_hetgl"></span>
+            <div class="name">
+              iconm_hetgl
+            </div>
+            <div class="code-name">.icon-iconm_hetgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_jihuagl"></span>
+            <div class="name">
+              iconm_jihuagl
+            </div>
+            <div class="code-name">.icon-iconm_jihuagl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_daicg"></span>
+            <div class="name">
+              iconx_daicg
+            </div>
+            <div class="code-name">.icon-iconx_daicg
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_xiaosht"></span>
+            <div class="name">
+              iconm_xiaosht
+            </div>
+            <div class="code-name">.icon-iconm_xiaosht
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_shenggl"></span>
+            <div class="name">
+              iconm_shenggl
+            </div>
+            <div class="code-name">.icon-iconm_shenggl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_caigth"></span>
+            <div class="name">
+              iconx_caigth
+            </div>
+            <div class="code-name">.icon-iconx_caigth
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-iconx_daishenpi1"></span>
+            <div class="name">
+              iconx_daishenpi (1)
+            </div>
+            <div class="code-name">.icon-a-iconx_daishenpi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_fukgl"></span>
+            <div class="name">
+              iconx_fukgl
+            </div>
+            <div class="code-name">.icon-iconx_fukgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_daishenpi1"></span>
+            <div class="name">
+              iconm_daishenpi
+            </div>
+            <div class="code-name">.icon-iconm_daishenpi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_caigth"></span>
+            <div class="name">
+              iconm_caigth
+            </div>
+            <div class="code-name">.icon-iconm_caigth
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_xiaosth"></span>
+            <div class="name">
+              iconm_xiaosth
+            </div>
+            <div class="code-name">.icon-iconm_xiaosth
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_hetgl"></span>
+            <div class="name">
+              iconx_hetgl
+            </div>
+            <div class="code-name">.icon-iconx_hetgl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_wulwh"></span>
+            <div class="name">
+              iconm_wulwh
+            </div>
+            <div class="code-name">.icon-iconm_wulwh
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_shenggl"></span>
+            <div class="name">
+              iconx_shenggl
+            </div>
+            <div class="code-name">.icon-iconx_shenggl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_yicg"></span>
+            <div class="name">
+              iconm_yicg
+            </div>
+            <div class="code-name">.icon-iconm_yicg
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_lisfk"></span>
+            <div class="name">
+              iconx_lisfk
+            </div>
+            <div class="code-name">.icon-iconx_lisfk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_lisfk"></span>
+            <div class="name">
+              iconm_lisfk
+            </div>
+            <div class="code-name">.icon-iconm_lisfk
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_daishenpi1"></span>
+            <div class="name">
+              iconx_daishenpi
+            </div>
+            <div class="code-name">.icon-iconx_daishenpi1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_wulwh"></span>
+            <div class="name">
+              iconx_wulwh
+            </div>
+            <div class="code-name">.icon-iconx_wulwh
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_jihuagl"></span>
+            <div class="name">
+              iconx_jihuagl
+            </div>
+            <div class="code-name">.icon-iconx_jihuagl
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_yicg"></span>
+            <div class="name">
+              iconx_yicg
+            </div>
+            <div class="code-name">.icon-iconx_yicg
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_saixuan1"></span>
+            <div class="name">
+              iconm_saixuan
+            </div>
+            <div class="code-name">.icon-iconm_saixuan1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_play2"></span>
+            <div class="name">
+              iconm_play2
+            </div>
+            <div class="code-name">.icon-iconm_play2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconx_daishenpi"></span>
+            <div class="name">
+              iconx_daishenpi
+            </div>
+            <div class="code-name">.icon-iconx_daishenpi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-iconm_daishenpi"></span>
+            <div class="name">
+              iconm_daishenpi
+            </div>
+            <div class="code-name">.icon-iconm_daishenpi
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-iconx_saixuan"></span>
             <div class="name">
               iconx_saixuan
@@ -6864,6 +7344,262 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_gongncd"></use>
+                </svg>
+                <div class="name">iconm_gongncd</div>
+                <div class="code-name">#icon-iconm_gongncd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_changycd"></use>
+                </svg>
+                <div class="name">iconm_changycd</div>
+                <div class="code-name">#icon-iconm_changycd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_changycd"></use>
+                </svg>
+                <div class="name">iconx_changycd</div>
+                <div class="code-name">#icon-iconx_changycd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_gongncd"></use>
+                </svg>
+                <div class="name">iconx_gongncd</div>
+                <div class="code-name">#icon-iconx_gongncd</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icomx_xiaosht"></use>
+                </svg>
+                <div class="name">icomx_xiaosht</div>
+                <div class="code-name">#icon-icomx_xiaosht</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_daicg"></use>
+                </svg>
+                <div class="name">iconm_daicg</div>
+                <div class="code-name">#icon-iconm_daicg</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_fukgl"></use>
+                </svg>
+                <div class="name">iconm_fukgl</div>
+                <div class="code-name">#icon-iconm_fukgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_hetgl"></use>
+                </svg>
+                <div class="name">iconm_hetgl</div>
+                <div class="code-name">#icon-iconm_hetgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_jihuagl"></use>
+                </svg>
+                <div class="name">iconm_jihuagl</div>
+                <div class="code-name">#icon-iconm_jihuagl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_daicg"></use>
+                </svg>
+                <div class="name">iconx_daicg</div>
+                <div class="code-name">#icon-iconx_daicg</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_xiaosht"></use>
+                </svg>
+                <div class="name">iconm_xiaosht</div>
+                <div class="code-name">#icon-iconm_xiaosht</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_shenggl"></use>
+                </svg>
+                <div class="name">iconm_shenggl</div>
+                <div class="code-name">#icon-iconm_shenggl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_caigth"></use>
+                </svg>
+                <div class="name">iconx_caigth</div>
+                <div class="code-name">#icon-iconx_caigth</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-iconx_daishenpi1"></use>
+                </svg>
+                <div class="name">iconx_daishenpi (1)</div>
+                <div class="code-name">#icon-a-iconx_daishenpi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_fukgl"></use>
+                </svg>
+                <div class="name">iconx_fukgl</div>
+                <div class="code-name">#icon-iconx_fukgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_daishenpi1"></use>
+                </svg>
+                <div class="name">iconm_daishenpi</div>
+                <div class="code-name">#icon-iconm_daishenpi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_caigth"></use>
+                </svg>
+                <div class="name">iconm_caigth</div>
+                <div class="code-name">#icon-iconm_caigth</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_xiaosth"></use>
+                </svg>
+                <div class="name">iconm_xiaosth</div>
+                <div class="code-name">#icon-iconm_xiaosth</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_hetgl"></use>
+                </svg>
+                <div class="name">iconx_hetgl</div>
+                <div class="code-name">#icon-iconx_hetgl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_wulwh"></use>
+                </svg>
+                <div class="name">iconm_wulwh</div>
+                <div class="code-name">#icon-iconm_wulwh</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_shenggl"></use>
+                </svg>
+                <div class="name">iconx_shenggl</div>
+                <div class="code-name">#icon-iconx_shenggl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_yicg"></use>
+                </svg>
+                <div class="name">iconm_yicg</div>
+                <div class="code-name">#icon-iconm_yicg</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_lisfk"></use>
+                </svg>
+                <div class="name">iconx_lisfk</div>
+                <div class="code-name">#icon-iconx_lisfk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_lisfk"></use>
+                </svg>
+                <div class="name">iconm_lisfk</div>
+                <div class="code-name">#icon-iconm_lisfk</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_daishenpi1"></use>
+                </svg>
+                <div class="name">iconx_daishenpi</div>
+                <div class="code-name">#icon-iconx_daishenpi1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_wulwh"></use>
+                </svg>
+                <div class="name">iconx_wulwh</div>
+                <div class="code-name">#icon-iconx_wulwh</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_jihuagl"></use>
+                </svg>
+                <div class="name">iconx_jihuagl</div>
+                <div class="code-name">#icon-iconx_jihuagl</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_yicg"></use>
+                </svg>
+                <div class="name">iconx_yicg</div>
+                <div class="code-name">#icon-iconx_yicg</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_saixuan1"></use>
+                </svg>
+                <div class="name">iconm_saixuan</div>
+                <div class="code-name">#icon-iconm_saixuan1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_play2"></use>
+                </svg>
+                <div class="name">iconm_play2</div>
+                <div class="code-name">#icon-iconm_play2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconx_daishenpi"></use>
+                </svg>
+                <div class="name">iconx_daishenpi</div>
+                <div class="code-name">#icon-iconx_daishenpi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-iconm_daishenpi"></use>
+                </svg>
+                <div class="name">iconm_daishenpi</div>
+                <div class="code-name">#icon-iconm_daishenpi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-iconx_saixuan"></use>
                 </svg>
                 <div class="name">iconx_saixuan</div>

src/assets/icons/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3933484 */
-  src: url('iconfont.woff2?t=1686554047584') format('woff2'),
-       url('iconfont.woff?t=1686554047584') format('woff'),
-       url('iconfont.ttf?t=1686554047584') format('truetype');
+  src: url('iconfont.woff2?t=1687672153417') format('woff2'),
+       url('iconfont.woff?t=1687672153417') format('woff'),
+       url('iconfont.ttf?t=1687672153417') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,134 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-iconm_gongncd:before {
+  content: "\e8d2";
+}
+
+.icon-iconm_changycd:before {
+  content: "\e8d3";
+}
+
+.icon-iconx_changycd:before {
+  content: "\e8d4";
+}
+
+.icon-iconx_gongncd:before {
+  content: "\e8d5";
+}
+
+.icon-icomx_xiaosht:before {
+  content: "\e8ba";
+}
+
+.icon-iconm_daicg:before {
+  content: "\e8bb";
+}
+
+.icon-iconm_fukgl:before {
+  content: "\e8bc";
+}
+
+.icon-iconm_hetgl:before {
+  content: "\e8bd";
+}
+
+.icon-iconm_jihuagl:before {
+  content: "\e8be";
+}
+
+.icon-iconx_daicg:before {
+  content: "\e8bf";
+}
+
+.icon-iconm_xiaosht:before {
+  content: "\e8c0";
+}
+
+.icon-iconm_shenggl:before {
+  content: "\e8c1";
+}
+
+.icon-iconx_caigth:before {
+  content: "\e8c2";
+}
+
+.icon-a-iconx_daishenpi1:before {
+  content: "\e8c3";
+}
+
+.icon-iconx_fukgl:before {
+  content: "\e8c4";
+}
+
+.icon-iconm_daishenpi1:before {
+  content: "\e8c5";
+}
+
+.icon-iconm_caigth:before {
+  content: "\e8c6";
+}
+
+.icon-iconm_xiaosth:before {
+  content: "\e8c7";
+}
+
+.icon-iconx_hetgl:before {
+  content: "\e8c8";
+}
+
+.icon-iconm_wulwh:before {
+  content: "\e8c9";
+}
+
+.icon-iconx_shenggl:before {
+  content: "\e8ca";
+}
+
+.icon-iconm_yicg:before {
+  content: "\e8cb";
+}
+
+.icon-iconx_lisfk:before {
+  content: "\e8cc";
+}
+
+.icon-iconm_lisfk:before {
+  content: "\e8cd";
+}
+
+.icon-iconx_daishenpi1:before {
+  content: "\e8ce";
+}
+
+.icon-iconx_wulwh:before {
+  content: "\e8cf";
+}
+
+.icon-iconx_jihuagl:before {
+  content: "\e8d0";
+}
+
+.icon-iconx_yicg:before {
+  content: "\e8d1";
+}
+
+.icon-iconm_saixuan1:before {
+  content: "\e8b6";
+}
+
+.icon-iconm_play2:before {
+  content: "\e8b7";
+}
+
+.icon-iconx_daishenpi:before {
+  content: "\e8b8";
+}
+
+.icon-iconm_daishenpi:before {
+  content: "\e8b9";
+}
+
 .icon-iconx_saixuan:before {
   content: "\e8b4";
 }

src/assets/icons/iconfont/iconfont.json

@@ -6,6 +6,230 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "36123929",
+      "name": "iconm_gongncd",
+      "font_class": "iconm_gongncd",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "36123930",
+      "name": "iconm_changycd",
+      "font_class": "iconm_changycd",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "36123931",
+      "name": "iconx_changycd",
+      "font_class": "iconx_changycd",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "36123932",
+      "name": "iconx_gongncd",
+      "font_class": "iconx_gongncd",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "36111345",
+      "name": "icomx_xiaosht",
+      "font_class": "icomx_xiaosht",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "36111346",
+      "name": "iconm_daicg",
+      "font_class": "iconm_daicg",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "36111347",
+      "name": "iconm_fukgl",
+      "font_class": "iconm_fukgl",
+      "unicode": "e8bc",
+      "unicode_decimal": 59580
+    },
+    {
+      "icon_id": "36111348",
+      "name": "iconm_hetgl",
+      "font_class": "iconm_hetgl",
+      "unicode": "e8bd",
+      "unicode_decimal": 59581
+    },
+    {
+      "icon_id": "36111349",
+      "name": "iconm_jihuagl",
+      "font_class": "iconm_jihuagl",
+      "unicode": "e8be",
+      "unicode_decimal": 59582
+    },
+    {
+      "icon_id": "36111350",
+      "name": "iconx_daicg",
+      "font_class": "iconx_daicg",
+      "unicode": "e8bf",
+      "unicode_decimal": 59583
+    },
+    {
+      "icon_id": "36111351",
+      "name": "iconm_xiaosht",
+      "font_class": "iconm_xiaosht",
+      "unicode": "e8c0",
+      "unicode_decimal": 59584
+    },
+    {
+      "icon_id": "36111352",
+      "name": "iconm_shenggl",
+      "font_class": "iconm_shenggl",
+      "unicode": "e8c1",
+      "unicode_decimal": 59585
+    },
+    {
+      "icon_id": "36111353",
+      "name": "iconx_caigth",
+      "font_class": "iconx_caigth",
+      "unicode": "e8c2",
+      "unicode_decimal": 59586
+    },
+    {
+      "icon_id": "36111354",
+      "name": "iconx_daishenpi (1)",
+      "font_class": "a-iconx_daishenpi1",
+      "unicode": "e8c3",
+      "unicode_decimal": 59587
+    },
+    {
+      "icon_id": "36111355",
+      "name": "iconx_fukgl",
+      "font_class": "iconx_fukgl",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "36111356",
+      "name": "iconm_daishenpi",
+      "font_class": "iconm_daishenpi1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "36111357",
+      "name": "iconm_caigth",
+      "font_class": "iconm_caigth",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "36111358",
+      "name": "iconm_xiaosth",
+      "font_class": "iconm_xiaosth",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "36111359",
+      "name": "iconx_hetgl",
+      "font_class": "iconx_hetgl",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "36111360",
+      "name": "iconm_wulwh",
+      "font_class": "iconm_wulwh",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "36111361",
+      "name": "iconx_shenggl",
+      "font_class": "iconx_shenggl",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "36111362",
+      "name": "iconm_yicg",
+      "font_class": "iconm_yicg",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "36111363",
+      "name": "iconx_lisfk",
+      "font_class": "iconx_lisfk",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "36111364",
+      "name": "iconm_lisfk",
+      "font_class": "iconm_lisfk",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
+    {
+      "icon_id": "36111365",
+      "name": "iconx_daishenpi",
+      "font_class": "iconx_daishenpi1",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "36111366",
+      "name": "iconx_wulwh",
+      "font_class": "iconx_wulwh",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "36111367",
+      "name": "iconx_jihuagl",
+      "font_class": "iconx_jihuagl",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "36111368",
+      "name": "iconx_yicg",
+      "font_class": "iconx_yicg",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "36040573",
+      "name": "iconm_saixuan",
+      "font_class": "iconm_saixuan1",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
+    {
+      "icon_id": "36040574",
+      "name": "iconm_play2",
+      "font_class": "iconm_play2",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "36040575",
+      "name": "iconx_daishenpi",
+      "font_class": "iconx_daishenpi",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
+    {
+      "icon_id": "36040576",
+      "name": "iconm_daishenpi",
+      "font_class": "iconm_daishenpi",
+      "unicode": "e8b9",
+      "unicode_decimal": 59577
+    },
+    {
       "icon_id": "35941342",
       "name": "iconx_saixuan",
       "font_class": "iconx_saixuan",

src/components/headerBar/header-bar.vue

@@ -32,20 +32,17 @@
           <div class="header-bar-hover" @click.stop>
             <div class="header-bar-hover-content">
               <div class="left-banner">
-                <div class="first-order" @click="leftBanerType = 2">
-                  <el-icon size="16" color="#0084FF">
-                    <edit />
-                  </el-icon>
+                <!-- :style="leftBanerType == 2 ? 'color:#0084ff' : ''" -->
+                <div class="first-order" @click="leftBanerType = 2" >
+                  <i class="iconfont icon-iconm_changycd" style="position: relative;top:-1px;"></i>
                   {{$t('header.commonFunctions')}}
                 </div>
                 <div class="first-order">
-                  <el-icon size="16" color="#0084FF">
-                    <edit />
-                  </el-icon>
+                  <i class="iconfont icon-iconm_gongncd" style="position: relative;top:-1px;"></i>
                   {{$t('header.functionMenu')}}
                 </div>
                 <ul>
-                  <li @click="openLeftBaner(i, index)" v-for="(i, index) in sidebarRoutersCopy" :key="i.name" v-show="i.type == 1 && i.status == '0'">
+                  <li :class="menuName == i.menuName ? 'active' : ''" @click="openLeftBaner(i, index)" v-for="(i, index) in sidebarRoutersCopy" :key="i.name" v-show="i.type == 1 && i.status == '0'">
                     {{ i.menuName }}
                   </li>
                 </ul>
@@ -57,7 +54,7 @@
 								</div> -->
               </div>
               <div class="menu-warp" v-show="leftBanerType == 1">
-                <div class="first-order-title">{{ activeLeftData.menuName }}</div>
+                <div class="first-order-title">{{ menuName }}</div>
                 <!-- <ul class="second-level" v-for="i in activeLeftData.children" :key="i.menuId">
 									<li class="menu-title">
 											
@@ -187,8 +184,10 @@ const activeLeftData = ref({});
 const openLeftBaner = (i, index) => {
   leftBanerType.value = 1;
   activeLeftData.value = i;
+  menuName.value = i.menuName;
   routerInit(i);
 };
+let menuName = ref("");
 const logoUrl = ref();
 const getLogo = () => {
   proxy.post("/tenantInfo/getLogo", {}).then((res) => {

src/components/headerBar/header.scss

@@ -51,6 +51,10 @@
 						font-size: 12px;
 						cursor: pointer;
 					}
+					li.active{
+						color: #0084FF;
+						background-color: #D9EDFF;
+					}
 				}
 				.first-order {
 					height: 50px;

src/lang/index.js

@@ -19,10 +19,10 @@ const i18n = createI18n({
   }
 })
 
-get('/open/multilingual/getJson',{}).then(res=>{
-  // console.log(JSON.parse(res.data),'下载')
-  window.localStorage.setItem('lang',res.data)
-  i18n.global.setLocaleMessage('zh-cn', cn)
-})
+// get('/open/multilingual/getJson',{}).then(res=>{
+//   // console.log(JSON.parse(res.data),'下载')
+//   window.localStorage.setItem('lang',res.data)
+//   i18n.global.setLocaleMessage('zh-cn', cn)
+// })
 
 export default i18n

src/views/process/processApproval/auxiliary.vue

@@ -31,6 +31,31 @@ defineProps({
 })
 console.log(proxy.data)
 </script>
+<style>
+.auxiliary .el-collapse-item{
+	border:1px solid #dddddd;
+	margin-bottom:20px;
+}
+.auxiliary .el-collapse-item__header{
+	border:none !important;
+	padding-left: 20px;
+	font-size: 14px;
+	font-weight: bold;
+}
+.el-collapse-item__wrap{
+	border:none !important;
+}
+.el-collapse-item__wrap{
+	padding: 0 20px;
+}
+.el-collapse-item__content{
+	padding-bottom:10px;
+}
+
+.el-collapse{
+	border:none;
+}
+</style>
 <style lang="scss">
 .auxiliary {
 	ul {
@@ -42,7 +67,7 @@ console.log(proxy.data)
 			background: #f1f1f1;
 			overflow: hidden;
 			margin-bottom: 10px;
-			
+			border-radius: 2px 2px 2px 2px;
 			.list-box {
 				float: left;
 				width: 50%;
@@ -70,6 +95,10 @@ console.log(proxy.data)
 				}
 			}
 		}
+		li:hover{
+			background: #EFF6FF;
+		}
+	
 	}
 }
 </style>

src/views/system/dept2/index.vue

@@ -62,14 +62,14 @@
         </template>
       </byForm>
       <template #footer>
-        <el-button @click="dialogVisible = false" size="large">{{$t('dept.cancel')}}</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">{{$t('dept.confirm')}}</el-button>
+        <el-button @click="dialogVisible = false" size="large">{{$t('common.cancel')}}</el-button>
+        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">{{$t('common.confirm')}}</el-button>
       </template>
     </el-dialog>
     <el-dialog title="修改密码" v-model="roomDialogVisible" width="500" :before-close="handleClose" v-loading="loading">
       <template #footer>
-        <el-button @click="roomDialogVisible = false" size="large">{{$t('dept.cancel')}}</el-button>
-        <el-button type="primary" @click="submitTree('byform')" size="large" :loading="submitLoading">{{$t('dept.confirm')}}</el-button>
+        <el-button @click="roomDialogVisible = false" size="large">{{$t('common.cancel')}}</el-button>
+        <el-button type="primary" @click="submitTree('byform')" size="large" :loading="submitLoading">{{$t('common.confirm')}}</el-button>
       </template>
     </el-dialog>
   </div>
@@ -391,7 +391,7 @@ const showType = (type) => {
 const getDtl = (row) => {
   formData.data = { ...row };
   modalType.value = "edit";
-  getUserList();
+  
   dialogVisible.value = true;
 };
 
@@ -412,7 +412,7 @@ const getUserList = () => {
       console.log(config);
     });
 };
-
+getUserList();
 getTreeList();
 getList();
 </script>