解决冲突

2021-11-03 18:43:00 +08:00
parent 1df114459c 72a3d53a17
commit 87b8fe22d0
52 changed files with 49016 additions and 541 deletions
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -131,7 +131,7 @@

 					.is_allow_values {
 						color: #fff;
-						background-image: linear-gradient(to left, $main-color, $mian-color-light);
+						background-image: linear-gradient(to left, $mian-color, $mian-color-light);
 						padding: 2rpx 14rpx;
 						font-size: 20rpx;
 						text-align: center;