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

xiangpei

2025-07-02 642a3b5191eb72a68b257630eac678b891c77740

 App.vue

@@ -250,15 +250,15 @@
   .flex1 {
      flex: 1; //必须父级设置flex
   }
	
   /* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
   @font-face {
     font-family: 'iconfont';  /* Project id 4921691 */
     src: 
          url('//at.alicdn.com/t/c/font_4921691_rij5xwhwslo.woff2?t=1751356364172') format('woff2'),
          url('//at.alicdn.com/t/c/font_4921691_rij5xwhwslo.woff?t=1751356364172') format('woff'),
          url('//at.alicdn.com/t/c/font_4921691_rij5xwhwslo.ttf?t=1751356364172') format('truetype');
   }

  /* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
  @font-face {
    font-family: 'iconfont';  /* Project id 4921691 */
    src:
        url('//at.alicdn.com/t/c/font_4921691_xee9dyc5vvk.woff2?t=1751423177597') format('woff2'),
        url('//at.alicdn.com/t/c/font_4921691_xee9dyc5vvk.woff?t=1751423177597') format('woff'),
        url('//at.alicdn.com/t/c/font_4921691_xee9dyc5vvk.ttf?t=1751423177597') format('truetype');
  }
   .iconfont {
        /* font-family需要和自定义的相同 */
         font-family: "iconfont" !important;