Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-12 fb48777cd4c3f086f77b5b26e1d03aebf995f4f5

 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';