美博会专题

components/cm-module/pageFloorTemplate/templateA.vue

@@ -19,7 +19,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -282,6 +283,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -292,6 +294,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageFloorTemplate/templateB.vue

@@ -31,7 +31,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -294,6 +295,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -304,6 +306,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageFloorTemplate/templateC.vue

@@ -31,7 +31,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -327,6 +328,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -337,6 +339,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageFloorTemplate/templateD.vue

@@ -43,7 +43,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -317,6 +318,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -327,6 +329,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageFloorTemplate/templateE.vue

@@ -19,7 +19,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -295,6 +296,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -305,6 +307,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageFloorTemplate/templateF.vue

@@ -7,7 +7,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -267,6 +268,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -277,6 +279,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateA.vue

@@ -19,7 +19,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act" >
@@ -282,6 +283,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -292,6 +294,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateB.vue

@@ -31,7 +31,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -294,6 +295,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -304,6 +306,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateC.vue

@@ -31,7 +31,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -327,6 +328,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -337,6 +339,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateD.vue

@@ -43,7 +43,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -317,6 +318,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -327,6 +329,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateE.vue

@@ -19,7 +19,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -295,6 +296,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -305,6 +307,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateF.vue

@@ -7,7 +7,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -313,6 +314,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -323,6 +325,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateG.vue

@@ -7,7 +7,8 @@
 			</view>
 			<view class="floor-item-content">
 				<view class="title tui-skeleton-rect">
-					<text class="mclap">{{item.name}}</text>
+					<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+					<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 				</view>
 				<view class="floor-item-price" v-if="item.listType == 1">
 					<view class="floor-item-act">
@@ -268,6 +269,7 @@
 				flex-direction: column;
 				margin: 8rpx 0;
 				padding: 0;
+				position: relative;
 				.mclap{
 					width: 100%;
 					line-height:35rpx;
@@ -278,6 +280,23 @@
 					-webkit-line-clamp: 2;
 					overflow: hidden;
 					font-size: 26rpx;
+					&.indent{
+						text-indent: 95rpx;
+					}
+				}
+				.mclap-tag{
+					display: block;
+					width: 84rpx;
+					height: 32rpx;
+					background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+					border-radius: 4rpx 48rpx 4px 4px;
+					line-height: 32rpx;
+					font-size: $font-size-22;
+					color: #FFFFFF;
+					text-align: center;
+					position: absolute;
+					left: 0;
+					top: 0;
 				}
 			}
 			.no-price{

components/cm-module/pageTemplate/templateH.vue

@@ -10,7 +10,8 @@
 						</view>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
-								<text class="mclap">{{item.name}}</text>
+								<text class="mclap-tag" v-if="item.product.beautyActFlag == '1'">美博会</text>
+								<text class="mclap" :class="item.product.beautyActFlag == '1' ? 'indent' : ''">{{item.name}} </text>
 							</view>
 							<view class="floor-item-price" v-if="item.listType == 1">
 								<view class="floor-item-act">
@@ -300,6 +301,7 @@
 						flex-direction: column;
 						margin: 8rpx 0;
 						padding: 0;
+						position: relative;
 						.mclap{
 							width: 100%;
 							line-height:35rpx;
@@ -310,6 +312,23 @@
 							-webkit-line-clamp: 2;
 							overflow: hidden;
 							font-size: 26rpx;
+							&.indent{
+								text-indent: 95rpx;
+							}
+						}
+						.mclap-tag{
+							display: block;
+							width: 84rpx;
+							height: 32rpx;
+							background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+							border-radius: 4rpx 48rpx 4px 4px;
+							line-height: 32rpx;
+							font-size: $font-size-22;
+							color: #FFFFFF;
+							text-align: center;
+							position: absolute;
+							left: 0;
+							top: 0;
 						}
 					}
 					.no-price{

pages/goods/goods-classify.vue

@@ -44,7 +44,10 @@
 					<view v-for="(item,index) in listData" :key="index" :id="item.p_id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
 						<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
 						<view class="list-details-info">
-							<text class="list-details-title">{{item.p_name}}</text>
+							<text class="list-details-title">
+								<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
+								<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{ item.p_name }}</text>
+							</text>
 							<text class="list-details-specs">规格：{{item.p_unit}}</text>
 							<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">商品编码：{{item.p_code}}</view>
 							<view class="list-details-price">
@@ -575,13 +578,33 @@
 		font-size: 26rpx;
 		position: relative;
 		.list-details-title {
-			line-height: 38rpx;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			line-clamp: 2;
-			-webkit-box-orient: vertical;
+			position: relative;
+			.mclap{
+				line-height: 38rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				line-clamp: 2;
+				-webkit-box-orient: vertical;
+				&.indent{
+					text-indent: 95rpx;
+				}
+			}
+			.mclap-tag{
+				display: block;
+				width: 84rpx;
+				height: 32rpx;
+				background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+				border-radius: 4rpx 48rpx 4px 4px;
+				line-height: 32rpx;
+				font-size: $font-size-22;
+				color: #FFFFFF;
+				text-align: center;
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
 		}
 		.list-details-specs {
 			margin-top: 8rpx;

search/pages/search/search.vue

@@ -58,7 +58,10 @@
 				<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
 					<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
 					<view class="list-details-info">
-						<view class="list-details-title">{{isInterceptHtmlFn(item.p_name)}}</view>
+						<view class="list-details-title">
+							<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
+							<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.p_name)}}</text>
+						</view>
 						<text class="list-details-specs">规格：{{item.p_unit}}</text>
 						<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">
 							<view>商品编码：{{item.p_code}}</view>
@@ -751,13 +754,33 @@
 		font-size: 26rpx;
 		position: relative;
 		.list-details-title {
-			line-height: 38rpx;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 2;
-			line-clamp: 2;
-			-webkit-box-orient: vertical;
+			position: relative;
+			.mclap{
+				line-height: 38rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				line-clamp: 2;
+				-webkit-box-orient: vertical;
+				&.indent{
+					text-indent: 95rpx;
+				}
+			}
+			.mclap-tag{
+				display: block;
+				width: 84rpx;
+				height: 32rpx;
+				background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);
+				border-radius: 4rpx 48rpx 4px 4px;
+				line-height: 32rpx;
+				font-size: $font-size-22;
+				color: #FFFFFF;
+				text-align: center;
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
 		}
 		.list-details-specs {
 			margin-top: 8rpx;