Merge branch 'developerB' of git.caimei365.com:caimei-repository/caimei-applets-caimei into developerB

# Conflicts:
#	components/cm-module/orderDetails/orderButton.vue

components/cm-module/creatOrder/goodsList.vue

@@ -157,16 +157,17 @@
 					padding: 12rpx 0;
 					margin-right: 12rpx;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 			}
@@ -265,16 +266,17 @@
 					float: left;
 					padding:0 0 10rpx 0;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 			}

components/cm-module/creatOrder/invoiceTent.vue

@@ -564,7 +564,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 				}
 			}

components/cm-module/creatOrder/sellerFreight.vue

@@ -392,7 +392,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 				}
 			}

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -157,16 +157,17 @@
 					padding: 12rpx 0;
 					margin-right: 12rpx;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 			}
@@ -266,16 +267,17 @@
 					float: left;
 					padding:0 0 10rpx 0;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 			}

components/cm-module/creatOrder/sellerInvoice.vue

@@ -574,7 +574,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 				}
 			}

components/cm-module/creatOrder/sellerRegulations.vue

@@ -321,7 +321,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 				}
 			}

components/cm-module/listTemplate/buyagainList.vue

@@ -300,10 +300,10 @@
 			box-sizing: border-box;
 			float: left;
 			.floor-tags{
-				height: 36rpx;
+				height: 28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

components/cm-module/listTemplate/classifyProductList.vue

@@ -329,11 +329,11 @@
 			text-align: center;
 			box-sizing: border-box;
 			float: right;
-			.floor-tags{
-				height: 36rpx;
+			.floor-tags{			
+				height: 28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

components/cm-module/listTemplate/commodityList.vue

@@ -358,10 +358,10 @@
 			box-sizing: border-box;
 			float: right;
 			.floor-tags{
-				height: 36rpx;
+				height: 28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

components/cm-module/listTemplate/immediatelyList.vue

@@ -779,10 +779,10 @@
 			box-sizing: border-box;
 			float: left;
 			.floor-tags{
-				height: 36rpx;
+				height:28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

components/cm-module/listTemplate/productList.vue

@@ -302,10 +302,10 @@
 			box-sizing: border-box;
 			float: left;
 			.floor-tags{
-				height: 36rpx;
+				height: 28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

components/cm-module/orderDetails/goodsList.vue

@@ -325,16 +325,17 @@
 					float: left;
 					padding:10rpx 0 0 0;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 				.floor-item-act{
@@ -346,10 +347,10 @@
 					margin-right: 12rpx;
 					.floor-tags{
 						float: left;
-						height: 36rpx;
+						height: 28rpx;
 						border-radius: 6rpx;
 						background-color: #FFFFFF;
-						line-height: 36rpx;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;

components/cm-module/orderDetails/orderButton.vue

@@ -190,9 +190,9 @@
 				}
 			}
 			.btn-confirm{
-				color: #FFFFFF;
-				border: 2rpx solid #ff7a51;
 				background:#ff7a51;
+				border-color:#ff7a51;
+				color: #FFFFFF;
 			}
 			.btn-pay{
 				background:#f94b4b;

components/cm-module/orderDetails/orderListButton.vue

@@ -169,7 +169,7 @@
 			// }
 			.btn-confirm{
 				background:#ff7a51;
-				border: 2rpx solid #ff7a51;
+				border-color:#ff7a51;
 				color: #FFFFFF;
 			}
 			.btn-pay{

components/cm-module/productDetails/cm-activipopu.vue

@@ -174,6 +174,8 @@
 			.box-product-main{
 				width: 100%;
 				height: 136rpx;
+				float: left;
+				margin: 10rpx 0;
 				.image{
 					width: 134rpx;
 					height: 134rpx;
@@ -234,7 +236,7 @@
 			text-align: center;
 			color: #FFFFFF;
 			font-size: $font-size-28;
-			border-radius: 14rpx;
+			border-radius: 44rpx;
 		}
 	}
 </style>

pages/goods/cart.vue

@@ -980,16 +980,17 @@
 				padding:10rpx 0;
 				margin-left: 20rpx;
 				.floor-tags{
-					float: right;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: right;
 				}
 			}
 		}
@@ -1215,16 +1216,17 @@
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
 				.floor-tags{
-					float: left;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: left;
 				}
 			}
 		}

pages/goods/product.vue

@@ -989,10 +989,10 @@
 				margin-left: 10rpx;
 				.floor-tags{
 					float: right;
-					height: 36rpx;
+					height: 28rpx;
 					border-radius: 6rpx;
 					background-color: #FFFFFF;
-					line-height: 36rpx;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;

pages/search/search-order.vue

@@ -739,16 +739,17 @@
 			padding: 10rpx 0;
 			margin-right: 12rpx;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 		.title-text{
@@ -855,16 +856,17 @@
 			float: left;
 			padding:0 0 10rpx 0;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 	}

pages/search/search.vue

@@ -698,10 +698,10 @@
 			box-sizing: border-box;
 			float: right;
 			.floor-tags{
-				height: 36rpx;
+				height: 28rpx;
 				border-radius: 6rpx;
 				background-color: #FFFFFF;
-				line-height: 36rpx;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;

pages/tabBar/cart/cart.vue

@@ -970,16 +970,17 @@
 				padding:10rpx 0;
 				margin-left: 20rpx;
 				.floor-tags{
-					float: right;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: right;
 				}
 			}
 		}
@@ -1211,16 +1212,17 @@
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
 				.floor-tags{
-					float: left;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: left;
 				}
 			}
 		}

pages/tabBar/home/home.vue

@@ -698,16 +698,17 @@
 					padding: 16rpx 0;
 					margin-top: 8rpx;
 					.floor-tags{
-						float: left;
-						height: 36rpx;
-						border-radius: 4rpx;
-						background-color: rgba(225, 86, 22, 0.1);
-						line-height: 36rpx;
+						height: 28rpx;
+						border-radius: 6rpx;
+						background-color: #FFFFFF;
+						line-height: 28rpx;
 						color: $color-system;
 						text-align: center;
 						display: inline-block;
 						padding:0 16rpx;
 						font-size: $font-size-20;
+						border: 1px solid #E15616;
+						float: left;
 					}
 				}
 				.title-none{

pages/user/order/order-list.vue

@@ -738,16 +738,17 @@
 			padding: 10rpx 0;
 			margin-right: 12rpx;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 		.title-text{
@@ -858,16 +859,17 @@
 			float: left;
 			padding:0 0 10rpx 0;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 	}

second/pages/product/product-details.vue

@@ -699,16 +699,17 @@
 				padding:10rpx 0;
 				margin-left: 10rpx;
 				.floor-tags{
-					float: right;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: right;
 				}
 			}
 			.floor-item-btn{

seller/pages/cart/cart.vue

@@ -979,16 +979,17 @@
 				padding:10rpx 0;
 				margin-left: 20rpx;
 				.floor-tags{
-					float: right;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: right;
 				}
 			}
 		}
@@ -1226,16 +1227,17 @@
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
 				.floor-tags{
-					float: left;
-					height: 36rpx;
-					border-radius: 4rpx;
-					background-color: rgba(225, 86, 22, 0.1);
-					line-height: 36rpx;
+					height: 28rpx;
+					border-radius: 6rpx;
+					background-color: #FFFFFF;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;
 					padding:0 16rpx;
 					font-size: $font-size-20;
+					border: 1px solid #E15616;
+					float: left;
 				}
 			}
 		}

seller/pages/cart/immediately.vue

@@ -492,7 +492,7 @@
 					align-items: center;
 					justify-content: center;
 					font-size: $font-size-28;
-					border-radius: 14rpx;
+					border-radius: 44rpx;
 					background: $btn-confirm;
 					margin-top: 20rpx;
 				}

seller/pages/order/order-historylist.vue

@@ -632,16 +632,17 @@
 			padding: 10rpx 0;
 			margin-right: 12rpx;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 		.title-text{
@@ -746,16 +747,17 @@
 			float: left;
 			padding:0 0 10rpx 0;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 	}

seller/pages/order/order-list.vue

@@ -761,16 +761,17 @@
 			padding: 10rpx 0;
 			margin-right: 12rpx;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 		.title-text{
@@ -875,16 +876,17 @@
 			float: left;
 			padding:0 0 10rpx 0;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 	}

seller/pages/search/search-order.vue

@@ -740,16 +740,17 @@
 			padding: 10rpx 0;
 			margin-right: 12rpx;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 		.title-text{
@@ -840,16 +841,17 @@
 			float: left;
 			padding:0 0 10rpx 0;
 			.floor-tags{
-				float: left;
-				height: 36rpx;
-				border-radius: 4rpx;
-				background-color: rgba(225, 86, 22, 0.1);
-				line-height: 36rpx;
+				height: 28rpx;
+				border-radius: 6rpx;
+				background-color: #FFFFFF;
+				line-height: 28rpx;
 				color: $color-system;
 				text-align: center;
 				display: inline-block;
 				padding:0 16rpx;
 				font-size: $font-size-20;
+				border: 1px solid #E15616;
+				float: left;
 			}
 		}
 	}

supplier/pages/user/my-shop.vue

@@ -682,10 +682,10 @@
 					margin-top: 8rpx;
 				}
 				.floor-tags{
-					height: 36rpx;
+					height: 28rpx;
 					border-radius: 6rpx;
 					background-color: #FFFFFF;
-					line-height: 36rpx;
+					line-height: 28rpx;
 					color: $color-system;
 					text-align: center;
 					display: inline-block;