From e8d258576a34f35cfefbd6bfe07b7f22e72d87d4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2

---
 uni.scss |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/uni.scss b/uni.scss
index c24ca6b..24a3417 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1 +1,7 @@
+/* uni.scss */
+@import '@/common/self.scss';
+$u-primary: $main-color;
+@import 'uview-ui/theme.scss';
+$u-primary: $main-color;
+
 @import '@/uni_modules/uni-scss/variables.scss';
\ No newline at end of file

--
Gitblit v1.9.3