Merge remote-tracking branch 'origin/v2' into v2

陶杰

2024-09-11 e8d258576a34f35cfefbd6bfe07b7f22e72d87d4

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