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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 App.vue

@@ -223,7 +223,7 @@
</script>

<style lang="scss">
   @import '@/uview-components/uview-ui/index.scss';
   @import '@/components/uview-components/uview-ui/index.scss';

   // -------适配底部安全区  苹果x系列刘海屏

@@ -255,9 +255,9 @@
   @font-face {
     font-family: 'iconfont';  /* Project id 4921691 */
     src: 
          url('//at.alicdn.com/t/c/font_4921691_nm6or3sic2.woff2?t=1748867592712') format('woff2'),
          url('//at.alicdn.com/t/c/font_4921691_nm6or3sic2.woff?t=1748867592712') format('woff'),
          url('//at.alicdn.com/t/c/font_4921691_nm6or3sic2.ttf?t=1748867592712') format('truetype');
          url('//at.alicdn.com/t/c/font_4921691_3vdxatwdwe9.woff2?t=1750062394172') format('woff2'),
          url('//at.alicdn.com/t/c/font_4921691_3vdxatwdwe9.woff?t=1750062394172') format('woff'),
          url('//at.alicdn.com/t/c/font_4921691_3vdxatwdwe9.ttf?t=1750062394172') format('truetype');
   }
   .iconfont {
        /* font-family需要和自定义的相同 */