Merge branch 'master' of http://git.liuniu946.com/hwq/zhongwin

pages.json

@@ -264,7 +264,9 @@
 		}, {
 			"path": "pages/cart/cart",
 			"style": {
-				"navigationBarTitleText": "购物车"
+				"navigationBarTitleText": "购物车",
+				"navigationBarBackgroundColor":"#52C696",
+				"navigationBarTextStyle":"white"
 			}
 		},
 

pages/cart/cart.vue

@@ -370,7 +370,7 @@ export default {
 			color: $font-color-light;
 		}
 		.icon-checked {
-			color: $base-color;
+			color: #52C696;
 		}
 	}
 	.clear-btn {
@@ -384,7 +384,7 @@ export default {
 		padding-left: 38rpx;
 		font-size: $font-base;
 		color: #fff;
-		background: $font-color-disabled;
+		background: #52C696;
 		border-radius: 0 50px 50px 0;
 		opacity: 0;
 		transition: 0.2s;
@@ -418,12 +418,12 @@ export default {
 		height: 76rpx;
 		line-height: 76rpx;
 		font-size: $font-base + 2rpx;
-		background: $base-color;
+		background: #52C696;
 	}
 }
 /* 复选框选中状态 */
 .action-section .checkbox.checked,
 .cart-item .checkbox.checked {
-	color: $base-color;
+	color: #52C696;
 }
 </style>

pages/set/userinfo.vue

@@ -135,7 +135,7 @@ export default{
 		margin: 158rpx auto 30rpx;
 		width: 560rpx;
 		height: 80rpx;
-		background: linear-gradient(0deg, #2E58FF, #32C6FF);
+		background: #52C696;
 		border-radius: 40px;
 		color: #FFFFFF;
 	}
@@ -146,9 +146,9 @@ export default{
 		margin: 0 auto 30rpx;
 		width: 560rpx;
 		height: 80rpx;
-		border: 1px solid #32C6FF;
+		border: 1px solid #52C696;
 		background: #FFFFFF;
 		border-radius: 40px;
-		color: #32C6FF;
+		color: #52C696;
 	}
 </style>