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

xuxueyang

2024-09-20 30ad3682135c701a2b09e523e1532642041292ab

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