From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
App.vue | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/App.vue b/App.vue
index cb6fe29..d173efb 100644
--- a/App.vue
+++ b/App.vue
@@ -223,7 +223,7 @@
</script>
<style lang="scss">
- @import "uview-ui/index.scss";
+ @import '@/components/uview-components/uview-ui/index.scss';
// -------閫傞厤搴曢儴瀹夊叏鍖� 鑻规灉x绯诲垪鍒樻捣灞�
@@ -250,4 +250,21 @@
.flex1 {
flex: 1; //蹇呴』鐖剁骇璁剧疆flex
}
+
+ /* 鍦ㄧ嚎閾炬帴鏈嶅姟浠呬緵骞冲彴浣撻獙鍜岃皟璇曚娇鐢紝骞冲彴涓嶆壙璇烘湇鍔＄殑绋冲畾鎬э紝浼佷笟瀹㈡埛闇�涓嬭浇瀛椾綋鍖呰嚜琛屽彂甯冧娇鐢ㄥ苟鍋氬ソ澶囦唤銆� */
+ @font-face {
+ font-family: 'iconfont'; /* Project id 4921691 */
+ src:
+ 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闇�瑕佸拰鑷畾涔夌殑鐩稿悓 */
+ font-family: "iconfont" !important;
+ font-size: 2em;
+ font-style: normal;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
</style>
--
Gitblit v1.8.0