From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-wxparty/app.wxss | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/gz-wxparty/app.wxss b/gz-wxparty/app.wxss
index 115184a..dfe8a57 100644
--- a/gz-wxparty/app.wxss
+++ b/gz-wxparty/app.wxss
@@ -3,6 +3,12 @@
@import './styles/animate.wxss';
@import './components/vant/common/index.wxss';
+/* font-family */
+@font-face {
+ font-family: 'DingTalk';
+ src: url('./font/DingTalk_JinBuTi_Regular.ttf') format('truetype');
+}
+
page {
color: var(--text-color);
background-color: var(--bg-color);
--
Gitblit v1.8.0