commit -m 医疗器械

pages/goods/product.vue

@@ -80,6 +80,13 @@
 				<view class="container-product-main">
 					<view class="product-top">
 						<view class="banner-section">
+							<view class="cm-product-tags">
+								<!-- <view class="cm-product-cover" v-if="product.appletsActType === 1"
+									>云上美博会</view
+								> -->
+								<view class="cm-product-type" v-if="product.productType == 2">医疗器械</view>
+								<view class="cm-product-cover" v-if="product.appletsActType === 1"></view>
+							</view>
 							<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode">
 								<swiper
 									class="banner tui-banner tui-skeleton-rect"
@@ -90,14 +97,6 @@
 								>
 									<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item">
 										<image :src="item" @click="previewImg(index)" class="product-img" />
-										<view class="cm-product-tags">
-											<!-- <view class="cm-product-cover" v-if="product.appletsActType === 1"
-												>云上美博会</view
-											> -->
-											<view class="cm-product-type" v-if="product.productType == 2">医疗器械</view>
-											<view class="cm-product-cover" v-if="product.appletsActType === 1"></view>
-										</view>
-
 									</swiper-item>
 								</swiper>
 								<view class="swiper__dots-box">
@@ -1669,6 +1668,39 @@ page {
 	width: 100%;
 	height: 750rpx;
 	position: relative;
+	.cm-product-tags{
+		position: absolute;
+		right: 30rpx;
+		top: 0;
+	}
+	.cm-product-type{
+		width: 64rpx;
+		height: 64rpx;
+		text-align: justify;
+		box-sizing: border-box;
+		padding: 10rpx;
+		border-radius: 0 0 8rpx 8rpx;
+		background-color: #33CCBF;
+		font-size: $font-size-22;
+		color: #FFFFFF;
+		line-height: 25rpx;
+		float: left;
+	}
+	.cm-product-cover {
+	    width: 120rpx;
+	    height: 77rpx;
+		// right: 30rpx;
+		// top: 30rpx;
+		// width: 147rpx;
+		line-height: 57rpx;
+		font-size: 24rpx;
+		color: #fff;
+		text-align: center;
+		background: url(https://static.caimei365.com/app/img/icon2/cm_cover_bg_app.png) no-repeat center;
+		background-size: 120rpx;
+		float: left;
+		margin-left: 10rpx;
+	}
 }
 .banner {
 	width: 100%;
@@ -1682,39 +1714,6 @@ page {
 	}
 	.banner-item {
 		position: relative;
-		.cm-product-tags{
-			position: absolute;
-			right: 30rpx;
-			top: 0;
-		}
-		.cm-product-type{
-			width: 64rpx;
-			height: 64rpx;
-			text-align: justify;
-			box-sizing: border-box;
-			padding: 10rpx;
-			border-radius: 0 0 8rpx 8rpx;
-			background-color: #33CCBF;
-			font-size: $font-size-22;
-			color: #FFFFFF;
-			line-height: 25rpx;
-			float: left;
-		}
-		.cm-product-cover {
-            width: 120rpx;
-            height: 77rpx;
-			// right: 30rpx;
-			// top: 30rpx;
-			// width: 147rpx;
-			line-height: 57rpx;
-			font-size: 24rpx;
-			color: #fff;
-			text-align: center;
-			background: url(https://static.caimei365.com/app/img/icon2/cm_cover_bg_app.png) no-repeat center;
-			background-size: 120rpx;
-			float: left;
-			margin-left: 10rpx;
-		}
 	}
 }
 .swiper__dots-box {

pages/supplier/user/my-shop.vue

@@ -72,6 +72,7 @@
 						@click.stop="navToDetailPage(prop.productId)"
 					>
 						<image class="item-img tui-skeleton-fillet" :src="prop.image" mode="aspectFill"></image>
+						<view class="floor-item-type" v-if="prop.productType == 2">医疗器械</view>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
 								<text class="mclap-tag" v-if="prop.beautyActFlag == 1">美博会</text>
@@ -245,6 +246,7 @@
 						@click.stop="navToDetailPage(prop.productId)"
 					>
 						<image class="item-img tui-skeleton-fillet" :src="prop.image" mode="aspectFill"></image>
+						<view class="floor-item-type" v-if="prop.productType == 2">医疗器械</view>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
 								<text class="mclap-tag" v-if="prop.beautyActFlag == 1">美博会</text>
@@ -589,7 +591,6 @@ export default {
 			})
 				.then(response => {
 					this.productList = this.ReturnNewProducts(data, response.data)
-					console.log('合并价格后', this.productList)
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -902,9 +903,25 @@ page {
 			float: left;
 			box-sizing: border-box;
 			padding-bottom: 10rpx;
+			position: relative;
 			&:nth-child(2n) {
 				margin-right: 0;
 			}
+			.floor-item-type{
+				width: 64rpx;
+				height: 64rpx;
+				text-align: justify;
+				box-sizing: border-box;
+				padding: 10rpx;
+				border-radius: 0 0 8rpx 8rpx;
+				background-color: #33CCBF;
+				font-size: $font-size-22;
+				color: #FFFFFF;
+				line-height: 25rpx;
+				position: absolute;
+				top: 0;
+				right: 16rpx;
+			}
 			.item-img {
 				width: 341rpx;
 				height: 341rpx;