解决冲突

2021-11-03 18:43:00 +08:00
parent 1df114459c 72a3d53a17
commit 87b8fe22d0
52 changed files with 49016 additions and 541 deletions
--- a/pages/goods/attestation.vue
+++ b/pages/goods/attestation.vue
@@ -152,7 +152,7 @@
 		.authenticationTop {
 			width: 100%;
 			padding: 20rpx 50rpx;
-			background-color: $main-color;
+			background-color: $mian-color;
 			font-size: 26rpx;
 			color: #fff;
 			border-radius: 60rpx;