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

xuxueyang

2024-09-19 e1ed755f972a9b6c1b67004840a2adbac4d2c7a7

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