Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

components/shopCar/shopCar.vue

@@ -265,7 +265,7 @@ export default {
 	font-weight: 500;
 	font-family: Futura-Medium, Futura;
 	display: flex;
-	margin-left: 30rpx;
+	margin-left: 32rpx;
 	letter-spacing: 1rpx;
 	align-items: center;
 }

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -592,7 +592,7 @@ button[disabled]:not([type]) {
 		.good-select-price-normal {
 			font-family: Futura-Medium, Futura;
 			letter-spacing: 1px;
-			font-size: 36rpx;
+			font-size: 32rpx;
 			color: #333333;
 			margin-right: 12rpx;
 			font-weight: 500;