From ce4b9391a433cad82a636ec8a66071880022db42 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 29 九月 2024 16:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

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

diff --git a/uni.scss b/uni.scss
index ce00c66..24a3417 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,4 +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