Forráskód Böngészése

commit -m 超级会员修改促销标签

zhengjinyi 3 éve
szülő
commit
5acf238ab3
44 módosított fájl, 121 hozzáadás és 1085 törlés
  1. 65 15
      common/css/common.scss
  2. 0 26
      components/cm-module/cart-components/index.vue
  3. 0 26
      components/cm-module/creatOrder/goodsList.vue
  4. 0 26
      components/cm-module/creatOrder/sellerGoodsList.vue
  5. 0 33
      components/cm-module/listTemplate/buyagainList.vue
  6. 0 29
      components/cm-module/listTemplate/immediatelyList.vue
  7. 0 33
      components/cm-module/listTemplate/productList.vue
  8. 0 26
      components/cm-module/orderDetails/goodsList.vue
  9. 0 21
      components/cm-module/pageFloorTemplate/templateA.vue
  10. 0 21
      components/cm-module/pageFloorTemplate/templateB.vue
  11. 0 21
      components/cm-module/pageFloorTemplate/templateC.vue
  12. 0 21
      components/cm-module/pageFloorTemplate/templateD.vue
  13. 0 21
      components/cm-module/pageFloorTemplate/templateE.vue
  14. 0 21
      components/cm-module/pageFloorTemplate/templateF.vue
  15. 0 21
      components/cm-module/pageFloorTemplate/templateG.vue
  16. 0 21
      components/cm-module/pageFloorTemplate/templateI.vue
  17. 0 21
      components/cm-module/pageFloorTemplate/templateJ.vue
  18. 0 21
      components/cm-module/pageFloorTemplate/templateK.vue
  19. 0 21
      components/cm-module/pageTemplate/templateA.vue
  20. 0 21
      components/cm-module/pageTemplate/templateB.vue
  21. 0 21
      components/cm-module/pageTemplate/templateC.vue
  22. 0 21
      components/cm-module/pageTemplate/templateD.vue
  23. 0 21
      components/cm-module/pageTemplate/templateE.vue
  24. 0 21
      components/cm-module/pageTemplate/templateF.vue
  25. 0 21
      components/cm-module/pageTemplate/templateG.vue
  26. 0 25
      components/cm-module/pageTemplate/templateH.vue
  27. 0 21
      components/cm-module/pageTemplate/templateI.vue
  28. 0 21
      components/cm-module/pageTemplate/templateJ.vue
  29. 0 21
      components/cm-module/pageTemplate/templateK.vue
  30. 0 13
      pages/goods/cart.vue
  31. 0 29
      pages/goods/goods-classify.vue
  32. 0 26
      pages/search/search-order.vue
  33. 0 37
      pages/search/search.vue
  34. 0 13
      pages/second/product/product-details.vue
  35. 0 26
      pages/seller/order/order-historylist.vue
  36. 0 26
      pages/seller/order/order-list.vue
  37. 0 26
      pages/seller/search/search-order.vue
  38. 0 15
      pages/supplier/user/my-shop.vue
  39. 0 13
      pages/tabBar/cart/cart.vue
  40. 1 22
      pages/user/collection/collection.vue
  41. 0 29
      pages/user/coupon/coupon-product.vue
  42. 25 41
      pages/user/member/member-product.vue
  43. 30 84
      pages/user/member/member.vue
  44. 0 26
      pages/user/order/order-list.vue

+ 65 - 15
common/css/common.scss

@@ -364,18 +364,68 @@ button::after{
 		}
 	}
 /* 优惠券标签样式*/
-// .coupon-tags {
-// 	height: 32rpx;
-// 	box-sizing: border-box;
-// 	border-radius: 8rpx;
-// 	background-color: #fff1eb;
-// 	line-height: 28rpx;
-// 	color: #f94b4b;
-// 	text-align: center;
-// 	display: inline-block;
-// 	padding: 0 10rpx;
-// 	font-size: $font-size-20;
-// 	border: 1px solid #f94b4b;
-// 	float: left;
-// 	margin-right: 12rpx;
-// }
+.coupon-tags {
+	height: 32rpx;
+	box-sizing: border-box;
+	border-radius: 8rpx;
+	background-color: #fff1eb;
+	line-height: 28rpx;
+	color: #f94b4b;
+	text-align: center;
+	display: inline-block;
+	padding: 0 4rpx;
+	font-size:18rpx;
+	border: 1px solid #f94b4b;
+	float: left;
+	margin-right: 10rpx;
+}
+/* 促销标签样式*/
+.floor-tags{
+	height: 32rpx;
+	box-sizing: border-box;
+	border-radius: 8rpx;
+	background-color: #FFFFFF;
+	line-height: 28rpx;
+	color: $color-system;
+	text-align: center;
+	display: inline-block;
+	padding:0 4rpx;
+	font-size: $font-size-20;
+	border: 1px solid #E15616;
+	float: left;
+}
+/* 会员标签样式*/
+.svip-tags{
+	padding-left: 44rpx;
+	height: 32rpx;
+	position: relative;
+	float: left;
+	.tags{
+		width: 60rpx;
+		height: 32rpx;
+		background-color: #333333;
+		text-align: center;
+		line-height: 32rpx;
+		font-size: 20rpx;
+		color: #F0CB72;
+		position: absolute;
+		left: 0;
+		top: 0;
+		border-radius: 8rpx 0 0 8rpx;
+		&.none{
+			border-radius: 8rpx;
+		}
+	}
+	.price{
+		height: 32rpx;
+		box-sizing: border-box;
+		border-radius:0 8rpx 8rpx 0;
+		background-color: #F0CB72;
+		line-height: 32rpx;
+		color: #333333;
+		text-align: center;
+		padding:0 9rpx 0 22rpx;
+		font-size: 20rpx;
+		float: left;
+	}
+}

+ 0 - 26
components/cm-module/cart-components/index.vue

@@ -1324,19 +1324,6 @@
 				float: left;
 				padding: 24rpx 0;
 				margin-left: 20rpx;
-				.floor-tags{
-					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;
-				}
 			}
 		}
 		.goods-pros{
@@ -1573,19 +1560,6 @@
 				float: left;
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
-				.floor-tags{
-					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;
-				}
 			}
 		}
 	}

+ 0 - 26
components/cm-module/creatOrder/goodsList.vue

@@ -156,19 +156,6 @@
 					float: left;
 					padding: 12rpx 0;
 					margin-right: 12rpx;
-					.floor-tags{
-						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;
-					}
 				}
 			}
 			.productlist{
@@ -265,19 +252,6 @@
 					box-sizing: border-box;
 					float: left;
 					padding:0 0 10rpx 0;
-					.floor-tags{
-						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;
-					}
 				}
 			}
 			.goods-pros-m{

+ 0 - 26
components/cm-module/creatOrder/sellerGoodsList.vue

@@ -156,19 +156,6 @@
 					float: left;
 					padding: 12rpx 0;
 					margin-right: 12rpx;
-					.floor-tags{
-						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;
-					}
 				}
 			}
 			.productlist{
@@ -266,19 +253,6 @@
 					box-sizing: border-box;
 					float: left;
 					padding:0 0 10rpx 0;
-					.floor-tags{
-						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;
-					}
 				}
 			}
 			.goods-pros-m{

+ 0 - 33
components/cm-module/listTemplate/buyagainList.vue

@@ -33,10 +33,6 @@
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>
 							</view>
-							<view class="floor-item-act" v-else>
-								<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
-								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
-							</view>
 						</view>	
 					</view>
 				</view>
@@ -314,35 +310,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding: 11rpx 0;
-			.coupon-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding:0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
-			.floor-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				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;
-			}
 		}
 		.price-icon {
 			width: 22rpx;

+ 0 - 29
components/cm-module/listTemplate/immediatelyList.vue

@@ -93,12 +93,6 @@
 										<view class="floor-tags" v-else>{{ pros.promotions.name }}</view>
 									</template>
 								</view>
-								<view class="floor-item-act" v-else>
-									<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
-									<view class="floor-tags" v-if="pros.actStatus == 0 && pros.ladderPriceFlag == 1"
-										>阶梯价格</view
-									>
-								</view>
 							</view>
 						</view>
 					</view>
@@ -164,14 +158,6 @@
 														}}</view>
 													</template>
 												</view>
-												<view class="floor-item-act" v-else>
-													<view class="coupon-tags" v-if="pros.couponsLogo">优惠券</view>
-													<view
-														class="floor-tags"
-														v-if="pros.actStatus == 0 && pros.ladderPriceFlag == 1"
-														>阶梯价格</view
-													>
-												</view>
 												<view class="count">
 													<view class="number-box">
 														<view
@@ -918,21 +904,6 @@ export default {
 		box-sizing: border-box;
 		float: left;
 		padding: 11rpx 0;
-		.coupon-tags {
-			height: 32rpx;
-			box-sizing: border-box;
-			border-radius: 8rpx;
-			background-color: #fff1eb;
-			line-height: 28rpx;
-			color: #f94b4b;
-			text-align: center;
-			display: inline-block;
-			padding: 0 10rpx;
-			font-size: $font-size-20;
-			border: 1px solid #f94b4b;
-			float: left;
-			margin-right: 12rpx;
-		}
 		.floor-tags {
 			height: 32rpx;
 			box-sizing: border-box;

+ 0 - 33
components/cm-module/listTemplate/productList.vue

@@ -37,10 +37,6 @@
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</template>
 							</view>
-							<view class="floor-item-act" v-else>
-								<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-								<view class="floor-tags" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">阶梯价格</view>	
-							</view>
 						</view>	
 					</view>
 				</view>
@@ -314,35 +310,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding: 11rpx 0;
-			.coupon-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding:0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
-			.floor-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				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;
-			}
 		}
 		.price-icon {
 			width: 22rpx;

+ 0 - 26
components/cm-module/orderDetails/goodsList.vue

@@ -345,19 +345,6 @@
 					box-sizing: border-box;
 					float: left;
 					padding:10rpx 0 0 0;
-					.floor-tags{
-						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{
 					height: 56rpx;
@@ -366,19 +353,6 @@
 					float: left;
 					padding: 10rpx 0;
 					margin-right: 12rpx;
-					.floor-tags{
-						float: left;
-						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;
-					}
 				}
 			}
 			.goods-pros-m{

+ 0 - 21
components/cm-module/pageFloorTemplate/templateA.vue

@@ -47,9 +47,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -61,9 +58,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -307,21 +301,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateB.vue

@@ -63,9 +63,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -77,9 +74,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -323,21 +317,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateC.vue

@@ -63,9 +63,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -77,9 +74,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -356,21 +350,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateD.vue

@@ -79,9 +79,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -93,9 +90,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -350,21 +344,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateE.vue

@@ -47,9 +47,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -61,9 +58,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -320,21 +314,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateF.vue

@@ -31,9 +31,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -45,9 +42,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -287,21 +281,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateG.vue

@@ -31,9 +31,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -45,9 +42,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -283,21 +277,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateI.vue

@@ -79,9 +79,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -93,9 +90,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -351,21 +345,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateJ.vue

@@ -80,9 +80,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -94,9 +91,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -367,21 +361,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageFloorTemplate/templateK.vue

@@ -111,9 +111,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -125,9 +122,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -412,21 +406,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateA.vue

@@ -48,9 +48,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -62,9 +59,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -307,21 +301,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateB.vue

@@ -64,9 +64,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -78,9 +75,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -324,21 +318,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateC.vue

@@ -64,9 +64,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -78,9 +75,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -357,21 +351,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateD.vue

@@ -80,9 +80,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -94,9 +91,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -351,21 +345,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateE.vue

@@ -48,9 +48,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -62,9 +59,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -321,21 +315,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateF.vue

@@ -32,9 +32,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -46,9 +43,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -339,21 +333,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateG.vue

@@ -32,9 +32,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -46,9 +43,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -289,21 +283,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 25
components/cm-module/pageTemplate/templateH.vue

@@ -46,11 +46,6 @@
 											</view>
 											<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 										</template>
-										<template
-											v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1"
-										>
-											<view class="floor-tags">阶梯价格</view>
-										</template>
 									</template>
 									<template v-else>
 										<template v-if="item.product.actStatus === 1">
@@ -62,11 +57,6 @@
 											</view>
 											<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 										</template>
-										<template
-											v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1"
-										>
-											<view class="floor-tags">阶梯价格</view>
-										</template>
 									</template>
 								</view>
 								<view v-if="hasLogin">
@@ -349,21 +339,6 @@ export default {
 					height: 32rpx;
 					text-align: center;
 					box-sizing: border-box;
-					.coupon-tags {
-						height: 32rpx;
-						box-sizing: border-box;
-						border-radius: 8rpx;
-						background-color: #fff1eb;
-						line-height: 28rpx;
-						color: #f94b4b;
-						text-align: center;
-						display: inline-block;
-						padding: 0 10rpx;
-						font-size: $font-size-20;
-						border: 1px solid #f94b4b;
-						float: left;
-						margin-right: 12rpx;
-					}
 					.floor-tags {
 						height: 32rpx;
 						box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateI.vue

@@ -80,9 +80,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -94,9 +91,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -352,21 +346,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateJ.vue

@@ -81,9 +81,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -95,9 +92,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -368,21 +362,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 21
components/cm-module/pageTemplate/templateK.vue

@@ -112,9 +112,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 						<template v-else>
 							<template v-if="item.product.actStatus === 1">
@@ -126,9 +123,6 @@
 								</view>
 								<view class="floor-tags" v-else>{{ item.product.promotions.name }}</view>
 							</template>
-							<template v-if="item.product.actStatus === 0 && item.product.ladderPriceFlag === 1">
-								<view class="floor-tags">阶梯价格</view>
-							</template>
 						</template>
 					</view>
 					<view v-if="hasLogin">
@@ -413,21 +407,6 @@ export default {
 			height: 32rpx;
 			text-align: center;
 			box-sizing: border-box;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 13
pages/goods/cart.vue

@@ -1223,19 +1223,6 @@
 				float: left;
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
-				.floor-tags{
-					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;
-				}
 			}
 		}
 	}

+ 0 - 29
pages/goods/goods-classify.vue

@@ -641,35 +641,6 @@
 			box-sizing: border-box;
 			float: right;
 			padding: 11rpx 0;
-			.coupon-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding:0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
-			.floor-tags{
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				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;
-			}
 		}
 		.price-icon {
 			width: 22rpx;

+ 0 - 26
pages/search/search-order.vue

@@ -748,19 +748,6 @@
 			float: left;
 			padding: 10rpx 0;
 			margin-right: 12rpx;
-			.floor-tags{
-				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{
 			width: 400rpx;
@@ -865,19 +852,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding:0 0 10rpx 0;
-			.floor-tags{
-				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;
-			}
 		}
 	}
 	.order-footer{

+ 0 - 37
pages/search/search.vue

@@ -131,10 +131,6 @@
 										<view class="floor-tags" v-else>{{ item.promotions.name }}</view>
 									</template>
 								</view>
-								<view class="floor-item-act" v-else>
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-									<view class="floor-tags" v-if="item.actStatus == 0 && item.ladderPriceFlag == 1">阶梯价格</view>
-								</view>
 							</template>
 							<template v-else>
 								<view class="floor-item-act" v-if="item.actStatus == 1">
@@ -149,10 +145,6 @@
 										<view class="floor-tags" v-else>{{ item.promotions.name }}</view>
 									</template>
 								</view>
-								<view class="floor-item-act" v-else>
-									<view class="coupon-tags" v-if="item.couponsLogo">优惠券</view>
-									<view class="floor-tags" v-if="item.actStatus == 0 && item.ladderPriceFlag == 1">阶梯价格</view>
-								</view>
 							</template>
 							<view v-if="hasLogin" class="list-price">
 								<template v-if="userIdentity == 1">
@@ -940,35 +932,6 @@ page {
 		box-sizing: border-box;
 		float: right;
 		padding: 11rpx 0;
-		.coupon-tags {
-			height: 32rpx;
-			box-sizing: border-box;
-			border-radius: 8rpx;
-			background-color: #fff1eb;
-			line-height: 28rpx;
-			color: #f94b4b;
-			text-align: center;
-			display: inline-block;
-			padding: 0 10rpx;
-			font-size: $font-size-20;
-			border: 1px solid #f94b4b;
-			float: left;
-			margin-right: 12rpx;
-		}
-		.floor-tags {
-			height: 32rpx;
-			box-sizing: border-box;
-			border-radius: 8rpx;
-			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;
-		}
 	}
 	.price-icon {
 		width: 22rpx;

+ 0 - 13
pages/second/product/product-details.vue

@@ -763,19 +763,6 @@
 				float: left;
 				padding:10rpx 0;
 				margin-left: 10rpx;
-				.floor-tags{
-					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{
 				float: left;

+ 0 - 26
pages/seller/order/order-historylist.vue

@@ -753,19 +753,6 @@
 			float: left;
 			padding: 10rpx 0;
 			margin-right: 12rpx;
-			.floor-tags{
-				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{
 			width: 400rpx;
@@ -874,19 +861,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding:0 0 10rpx 0;
-			.floor-tags{
-				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;
-			}
 		}
 	}
 	.order-footer{

+ 0 - 26
pages/seller/order/order-list.vue

@@ -804,19 +804,6 @@
 			float: left;
 			padding: 10rpx 0;
 			margin-right: 12rpx;
-			.floor-tags{
-				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{
 			width: 400rpx;
@@ -925,19 +912,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding:0 0 10rpx 0;
-			.floor-tags{
-				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;
-			}
 		}
 	}
 	.order-footer{

+ 0 - 26
pages/seller/search/search-order.vue

@@ -825,19 +825,6 @@
 			float: left;
 			padding: 10rpx 0;
 			margin-right: 12rpx;
-			.floor-tags{
-				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{
 			width: 400rpx;
@@ -926,19 +913,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding:0 0 10rpx 0;
-			.floor-tags{
-				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;
-			}
 		}
 	}
 	.order-footer{

+ 0 - 15
pages/supplier/user/my-shop.vue

@@ -829,21 +829,6 @@ page {
 				box-sizing: border-box;
 				padding: 16rpx 0;
 				margin-top: 8rpx;
-				.coupon-tags {
-					height: 32rpx;
-					box-sizing: border-box;
-					border-radius: 8rpx;
-					background-color: #fff1eb;
-					line-height: 28rpx;
-					color: #f94b4b;
-					text-align: center;
-					display: inline-block;
-					padding: 0 10rpx;
-					font-size: $font-size-20;
-					border: 1px solid #f94b4b;
-					float: left;
-					margin-right: 12rpx;
-				}
 				.floor-tags {
 					height: 32rpx;
 					box-sizing: border-box;

+ 0 - 13
pages/tabBar/cart/cart.vue

@@ -1447,19 +1447,6 @@
 				float: left;
 				padding:0 0 10rpx 0;
 				margin-left: 10rpx;
-				.floor-tags{
-					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;
-				}
 			}
 		}
 	}

+ 1 - 22
pages/user/collection/collection.vue

@@ -69,6 +69,7 @@
 										</view>
 										<view class="list-details-price none">
 											<view class="floor-item-act" v-if="pros.actStatus == 1">
+												<view class="coupon-tags" v-if="item.product.couponsLogo">优惠券</view>
 												<template>
 													<view class="floor-tags" v-if="PromotionsFormat(pros.promotions)">
 														{{ pros.promotions.name }}
@@ -79,13 +80,6 @@
 													<view class="floor-tags" v-else>{{ pros.promotions.name }}</view>
 												</template>
 											</view>
-											<view class="floor-item-act" v-if="pros.actStatus == 0">
-												<view
-													class="floor-tags"
-													v-if="pros.actStatus == 0 && pros.ladderPriceFlag == 1"
-													>阶梯价格</view
-												>
-											</view>
 										</view>
 									</template>
 								</template>
@@ -799,21 +793,6 @@ page {
 			text-align: center;
 			box-sizing: border-box;
 			float: left;
-			.coupon-tags {
-				height: 32rpx;
-				box-sizing: border-box;
-				border-radius: 8rpx;
-				background-color: #fff1eb;
-				line-height: 28rpx;
-				color: #f94b4b;
-				text-align: center;
-				display: inline-block;
-				padding: 0 10rpx;
-				font-size: $font-size-20;
-				border: 1px solid #f94b4b;
-				float: left;
-				margin-right: 12rpx;
-			}
 			.floor-tags {
 				height: 32rpx;
 				box-sizing: border-box;

+ 0 - 29
pages/user/coupon/coupon-product.vue

@@ -247,35 +247,6 @@
 				height: 32rpx;
 				text-align: center;
 				box-sizing: border-box;
-				.coupon-tags{
-					height: 32rpx;
-					box-sizing: border-box;
-					border-radius: 8rpx;
-					background-color: #fff1eb;
-					line-height: 28rpx;
-					color: #f94b4b;
-					text-align: center;
-					display: inline-block;
-					padding:0 10rpx;
-					font-size: $font-size-20;
-					border: 1px solid #f94b4b;
-					float: left;
-					margin-right: 12rpx;
-				}
-				.floor-tags{
-					height: 32rpx;
-					box-sizing: border-box;
-					border-radius: 8rpx;
-					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{
 				font-size: $font-size-26;

+ 25 - 41
pages/user/member/member-product.vue

@@ -19,17 +19,28 @@
 							{{ pro.name }}
 						</view>
 						<view class="product-tags">
-							<view class="floor-item-act" v-if="pro.actStatus==1">
+							<view class="floor-item-act">
 								<view class="coupon-tags">优惠券</view>
-								<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
-									{{pro.promotions.name}}
-									<text v-if="pro.priceFlag != 1">:¥{{ pro.price | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-else>
-								<view class="coupon-tags">优惠券</view>
-								<view class="floor-tags" v-if="pro.actStatus ==0  &&  pro.ladderPriceFlag==1">阶梯价格</view>	
+								<template v-if="pro.actStatus== 1">
+									<view class="svip-tags" v-if='pro.proType == 0'>
+										<view class="tags none">SVIP</view>
+									</view>
+									<view class="svip-tags" v-if='pro.proType == 1'>
+										<view class="tags">SVIP</view>
+										<view class="price">{{ pro.discount }}</view>
+									</view>
+									<view class="svip-tags" v-if='pro.proType == 2'>
+										<view class="tags">SVIP</view>
+										<view class="price">¥{{ pro.discountPrice | NumFormat }}</view>
+									</view>
+								</template>
+								<template  v-else>
+									<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
+										{{pro.promotions.name}}
+										<text v-if="pro.priceFlag != 1">:¥{{ pro.price | NumFormat }}</text>
+									</view>
+									<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
+								</template>
 							</view>
 						</view>
 						<view class="product-price">
@@ -37,19 +48,6 @@
 							<view class="list-none" v-else-if="pro.priceFlag == 2">¥价格仅会员可见</view>
 							<view class="list-none-price" v-else>¥{{ pro.price | NumFormat }}</view>
 						</view>
-						<view class="product-svip">
-							<view class="svip" v-if='pro.proType == 0'>
-								<view class="tags">SVIP</view>
-							</view>
-							<view class="svip" v-if='pro.proType == 1'>
-								<view class="tags">SVIP</view>
-								<view class="price">{{ pro.discount }}</view>
-							</view>
-							<view class="svip" v-if='pro.proType == 2'>
-								<view class="tags">SVIP</view>
-								<view class="price">¥{{ pro.discountPrice | NumFormat }}</view>
-							</view>
-						</view>
 					</view>
 				</view>
 			</view>
@@ -116,7 +114,7 @@
 						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
 						unit:'台',
 						ladderPriceFlag:1,
-						priceFlag:0,
+						priceFlag:1,
 						originalPrice:100,
 						price:5000000,
 						actStatus:1,
@@ -138,7 +136,7 @@
 						priceFlag:0,
 						originalPrice:100,
 						price:50000000,
-						actStatus:0,
+						actStatus:1,
 						promotions:null,
 						isChecked:false,
 						productIds:1003,
@@ -153,7 +151,7 @@
 						priceFlag:1,
 						originalPrice:100,
 						price:5000000,
-						actStatus:0,
+						actStatus:1,
 						promotions:null,
 						isChecked:false,
 						productIds:1000,
@@ -330,27 +328,13 @@
 					.product-tags{
 						width: 100%;
 						height: 32rpx;
-						margin-top: 4rpx;
+						margin-top: 6rpx;
 						.floor-item-act{
 							width: 100%;
 							height: 32rpx;
 							text-align: center;
 							box-sizing: border-box;
 							float: left;
-							.floor-tags{
-								height: 32rpx;
-								box-sizing: border-box;
-								border-radius: 8rpx;
-								background-color: #FFFFFF;
-								line-height: 28rpx;
-								color: $color-system;
-								text-align: center;
-								display: inline-block;
-								padding:0 8rpx;
-								font-size: $font-size-20;
-								border: 1px solid #E15616;
-								float: left;
-							}
 						}
 					}
 					.product-price{

+ 30 - 84
pages/user/member/member.vue

@@ -100,17 +100,28 @@
 							{{ pro.name }}
 						</view>
 						<view class="product-tags">
-							<view class="floor-item-act" v-if="pro.actStatus==1">
+							<view class="floor-item-act">
 								<view class="coupon-tags">优惠券</view>
-								<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
-									{{pro.promotions.name}}
-									<text v-if="pro.priceFlag != 1">:¥{{ pro.price | NumFormat }}</text>
-								</view>
-								<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-else>
-								<view class="coupon-tags">优惠券</view>
-								<view class="floor-tags" v-if="pro.actStatus ==0  &&  pro.ladderPriceFlag==1">阶梯价格</view>	
+								<template v-if="pro.actStatus== 1">
+									<view class="svip-tags" v-if='pro.proType == 0'>
+										<view class="tags none">SVIP</view>
+									</view>
+									<view class="svip-tags" v-if='pro.proType == 1'>
+										<view class="tags">SVIP</view>
+										<view class="price">{{ pro.discount }}</view>
+									</view>
+									<view class="svip-tags" v-if='pro.proType == 2'>
+										<view class="tags">SVIP</view>
+										<view class="price">¥{{ pro.discountPrice | NumFormat }}</view>
+									</view>
+								</template>
+								<template  v-else>
+									<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
+										{{pro.promotions.name}}
+										<text v-if="pro.priceFlag != 1">:¥{{ pro.price | NumFormat }}</text>
+									</view>
+									<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
+								</template>
 							</view>
 						</view>
 						<view class="product-price">
@@ -118,19 +129,6 @@
 							<view class="list-none" v-else-if="pro.priceFlag == 2">¥价格仅会员可见</view>
 							<view class="list-none-price" v-else>¥{{ pro.price | NumFormat }}</view>
 						</view>
-						<view class="product-svip">
-							<view class="svip" v-if='pro.proType == 0'>
-								<view class="tags none">SVIP</view>
-							</view>
-							<view class="svip" v-if='pro.proType == 1'>
-								<view class="tags">SVIP</view>
-								<view class="price">{{ pro.discount }}</view>
-							</view>
-							<view class="svip" v-if='pro.proType == 2'>
-								<view class="tags">SVIP</view>
-								<view class="price">¥{{ pro.discountPrice | NumFormat }}</view>
-							</view>
-						</view>
 					</view>
 				</view>
 			</view>
@@ -253,8 +251,8 @@
 						ladderPriceFlag:0,
 						priceFlag:1,
 						originalPrice:100,
-						price:5000000,
-						actStatus:0,
+						price:500,
+						actStatus:1,
 						promotions:null,
 						isChecked:false,
 						productIds:1000,
@@ -268,7 +266,7 @@
 						ladderPriceFlag:1,
 						priceFlag:2,
 						originalPrice:100,
-						price:500000,
+						price:500,
 						actStatus:1,
 						promotions:{
 							type:1,
@@ -278,7 +276,7 @@
 						isChecked:false,
 						productIds:1001,
 						proType:2,
-						discountPrice:50000,
+						discountPrice:5000000,
 					},
 					{
 						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
@@ -297,7 +295,7 @@
 						isChecked:false,
 						productIds:1002,
 						proType:0,
-						discountPrice:50000,
+						discountPrice:5000000,
 					},
 					{
 						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
@@ -307,7 +305,7 @@
 						priceFlag:0,
 						originalPrice:100,
 						price:50000000,
-						actStatus:0,
+						actStatus:1,
 						promotions:null,
 						isChecked:false,
 						productIds:1003,
@@ -704,7 +702,7 @@
 			margin-top: 16rpx;
 			.product-list{
 				width: 339rpx;
-				height: 560rpx;
+				height: 516rpx;
 				border-radius: 16rpx;
 				float: left;
 				margin-right: 24rpx;
@@ -744,78 +742,26 @@
 					.product-tags{
 						width: 100%;
 						height: 32rpx;
-						margin-top: 4rpx;
+						margin-top: 6rpx;
 						.floor-item-act{
 							width: 100%;
 							height: 32rpx;
 							text-align: center;
 							box-sizing: border-box;
 							float: left;
-							.floor-tags{
-								height: 32rpx;
-								box-sizing: border-box;
-								border-radius: 8rpx;
-								background-color: #FFFFFF;
-								line-height: 28rpx;
-								color: $color-system;
-								text-align: center;
-								display: inline-block;
-								padding:0 8rpx;
-								font-size: $font-size-20;
-								border: 1px solid #E15616;
-								float: left;
-							}
 						}
 					}
 					.product-price{
 						width: 100%;
 						line-height: 37rpx;
 						font-size: $font-size-26;
-						color: #333333;
+						color: #F94B4B;
 						margin-top: 8rpx;
 						.list-none-price{
 							text-decoration: line-through;
 							color: #999999;
 						}
 					}
-					.product-svip{
-						width: 100%;
-						height: 32rpx;
-						margin-top: 10rpx;
-						.svip{
-							padding-left: 44rpx;
-							height: 32rpx;
-							position: relative;
-							.tags{
-								width: 60rpx;
-								height: 32rpx;
-								background-color: #333333;
-								text-align: center;
-								line-height: 32rpx;
-								font-size: $font-size-22;
-								color: #F0CB72;
-								position: absolute;
-								left: 0;
-								top: 0;
-								border-radius: 8rpx 16rpx 8rpx 8rpx;
-								&.none{
-									border-radius: 8rpx;
-								}
-							}
-							.price{
-								height: 32rpx;
-								box-sizing: border-box;
-								border-radius:0 8rpx 8rpx 0;
-								background-color: #F0CB72;
-								line-height: 32rpx;
-								color: #333333;
-								text-align: center;
-								padding:0 9rpx 0 25rpx;
-								font-size: $font-size-26;
-								float: left;
-							}
-						}
-					}
 				}
 			}
 		}

+ 0 - 26
pages/user/order/order-list.vue

@@ -750,19 +750,6 @@
 			float: left;
 			padding: 10rpx 0;
 			margin-right: 12rpx;
-			.floor-tags{
-				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{
 			width: 400rpx;
@@ -876,19 +863,6 @@
 			box-sizing: border-box;
 			float: left;
 			padding:0 0 10rpx 0;
-			.floor-tags{
-				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;
-			}
 		}
 	}
 	.order-footer{