2-19新增

pages.json

@@ -521,6 +521,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/index/good-quality-work/good-quality-work",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/index/good-quality-work/good-quality-work.css

@@ -0,0 +1,59 @@
+.share-btn {
+	width: fit-content;
+	color: #FD6820;
+	font-size: 28rpx;
+	display: flex;
+	align-items: center;
+}
+
+.share-btn image {
+	width: 38rpx;
+}
+
+.header-btn-box {
+	display: flex;
+	justify-content: flex-end;
+	padding: 0 20rpx;
+	box-sizing: border-box;
+	position: relative;
+}
+
+
+.swiper-box {
+	width: 100%;
+	margin-bottom: 30rpx;
+}
+
+.swiper {
+	width: 100%;
+	height: 300rpx;
+	border-radius: 16rpx;
+}
+
+.swiper-item {
+	width: 100%;
+	height: 100%;
+	box-sizing: border-box;
+	color: #fff;
+	padding: 0 10rpx;
+	box-sizing: border-box;
+} 
+
+.swiper-item-content {
+	width: 100%;
+	height: 100%;
+	background-color: #fff;
+	border-radius: 16rpx;
+	border-radius: 30rpx;
+	padding: 20rpx 38rpx;
+	box-sizing: border-box;
+}
+
+.bg {
+	width: 100%;
+	height: 556rpx;
+	position: absolute;
+	top: 0;
+	left: 0;
+	background-color: #F0754C;
+}

pages/index/good-quality-work/good-quality-work.vue

@@ -0,0 +1,77 @@
+<template>
+	<view :style="{paddingTop: headerHeight + 'px'}">
+
+		<HeaderViewBar ref='HeaderViewBar' title='品质良作' backgroundColor='#F0754C'
+			style="position: fixed; top: 0; z-index: 999999999;">
+
+			<view class="header-btn-box" :style="{width: headerContainerWidth + 'px'}">
+				<button class="share-btn">
+					<image src="../../../static/icon-4.png" mode="widthFix"></image>
+				</button>
+			</view>
+		</HeaderViewBar>
+		
+		<view class="bg"></view>
+		
+		<view class="swiper-box">
+			<swiper class="swiper" :circular="true" previous-margin="25rpx" next-margin="25rpx">
+				<swiper-item>
+					<view class="swiper-item">
+						<view class="swiper-item-content">
+							12
+						</view>
+					</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">
+						<view class="swiper-item-content">
+							2
+						</view>
+					</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">
+						<view class="swiper-item-content">
+							4
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import HeaderViewBar from '../../../components/header-view-bar/header-view-bar.vue';
+	export default {
+		components: {
+			HeaderViewBar,
+		},
+		data() {
+			return {
+				headerHeight: 0,
+				headerContainerWidth: '100%',
+
+			}
+		},
+		onShow() {
+			setTimeout(() => {
+				const {
+					headerHeight,
+					headerContainerWidth
+				} = this.$refs['HeaderViewBar'].getHeaderStyle();
+				this.headerHeight = headerHeight;
+				this.headerContainerWidth = headerContainerWidth;
+			}, 20);
+			this.getData();
+		},
+		methods: {
+
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./good-quality-work.css";
+</style>

pages/index/raise-five-internal-organs/raise-five-internal-organs.css

@@ -162,7 +162,7 @@
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
-	padding: 20rpx 24rpx;
+	padding: 20rpx 24rpx 0;
 	box-sizing: border-box;
 }
 
@@ -171,5 +171,121 @@
 	height: 500rpx;
 	border-radius: 12rpx;
 	background-color: #fff;
-	margin-bottom: 30rpx;
+	margin-bottom: 20rpx;
+}
+
+.bottom {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+	margin-top: 4rpx;
+}
+
+.bottom-label {
+	width: 100%;
+	position: relative;
+	color: #000000;
+	font-size: 32rpx;
+	font-weight: bold;
+	padding: 16rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.bottom-label::after {
+	content: "";
+	width: 6rpx;
+	height: 34rpx;
+	background-color: #F2501A;
+	position: absolute;
+	left: 0;
+	top: 50%;
+	transform: translate(0, -50%);
+}
+
+.featured-list {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.featured-item {
+	width: 100%;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+}
+
+.featured-item-top {
+	width: 100%;
+	height: 82rpx;
+	line-height: 82rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.featured-name {
+	width: 80%;
+	color: #202020;
+	font-size: 30rpx;
+	font-weight: bold;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+}
+
+.featured-msg {
+	width: 100%;
+	font-weight: bold;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #777777;
+	font-size: 26rpx;
+	margin-bottom: 20rpx;
+}
+
+.featured-img {
+	width: 100%;
+	height: 336rpx;
+	border-radius: 16rpx;
+}
+
+.look-btn {
+	width: 104rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	background-color: #fff;
+	border-radius: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #919191;
+	font-size: 24rpx;
+	border: 1px solid #E6E6E6;
+	box-sizing: border-box;
+}
+
+.featured-tag {
+	width: 100%;
+	height: 88rpx;
+	line-height: 88rpx;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-size: 26rpx;
+	font-weight: bold;
 }

pages/index/raise-five-internal-organs/raise-five-internal-organs.vue

@@ -60,6 +60,39 @@
 				</view>
 			</view>
 		</view>
+		<view class="bottom">
+			<view class="bottom-label">
+				精选搭配
+			</view>
+			<view class="featured-list">
+				<view class="featured-item">
+					<view class="featured-item-top">
+						<view class="featured-name">玫瑰平胃茶</view>
+						<button type="default" class="look-btn">查看</button>
+					</view>
+					<view class="featured-msg">
+						(胃痛）理气解郁、和胃散郁
+					</view>
+					<image src="../../../static/img-4.png" class="featured-img" mode="aspectFill"></image>
+					<view class="featured-tag">
+						石斛15g
+					</view>        
+				</view>
+				<view class="featured-item">
+					<view class="featured-item-top">
+						<view class="featured-name">玫瑰平胃茶</view>
+						<button type="default" class="look-btn">查看</button>
+					</view>
+					<view class="featured-msg">
+						(胃痛）理气解郁、和胃散郁
+					</view>
+					<image src="../../../static/img-4.png" class="featured-img" mode="aspectFill"></image>
+					<view class="featured-tag">
+						石斛15g
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 

pages/index/regulate-six-bowels/regulate-six-bowels.css

@@ -91,7 +91,6 @@
 
 .product-item-column2 {
 	width: 100%;
-	height: 100%;
 	border-radius: 12rpx;
 	display: flex;
 	flex-direction: column;
@@ -99,23 +98,19 @@
 
 .product-item-column2-img {
 	width: 100%;
-	height: 340rpx;
-	border-radius: 12rpx 12rpx 0 0;
+	height: 225rpx;
+	border-radius: 12rpx;
 }
 
 .product-item-column2-bottom {
 	width: 100%;
-	height: calc(100% - 340rpx);
 	display: flex;
 	flex-direction: column;
-	justify-content: space-between;
-	padding: 16rpx;
-	box-sizing: border-box;
-	border-radius: 0 0 12rpx 12rpx;
 }
 
 .product-item-column-name2 {
 	width: 100%;
+	height: 72rpx;
 	display: -webkit-box;
 	-webkit-line-clamp: 2;
 	overflow: hidden;
@@ -124,6 +119,8 @@
 	color: #202020;
 	font-weight: bold;
 	font-size: 26rpx;
+	margin-top: 10rpx;
+	margin-bottom: 12rpx;
 }
 
 .product-item-column2-row-between {
@@ -162,14 +159,140 @@
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: space-between;
-	padding: 20rpx 24rpx;
+	padding: 26rpx 24rpx 4rpx;
 	box-sizing: border-box;
+	background-color: #fff;
 }
 
 .product-item {
-	width: calc(50% - 11rpx);
-	height: 500rpx;
-	border-radius: 12rpx;
+	width: 32%;
+	margin-right: 2%;
+	margin-bottom: 14rpx;
 	background-color: #fff;
-	margin-bottom: 30rpx;
+}
+
+.product-item:nth-child(3n) {
+	margin-right: 0;
+}
+
+.del-price {
+	color: #919191;
+	font-size: 20rpx;
+	text-decoration: line-through;
+}
+
+.bottom {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	margin-top: 24rpx;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+}
+
+.bottom-label {
+	width: 100%;
+	position: relative;
+	color: #000000;
+	font-size: 32rpx;
+	font-weight: bold;
+	padding: 16rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.bottom-label::after {
+	content: "";
+	width: 6rpx;
+	height: 34rpx;
+	background-color: #F2501A;
+	position: absolute;
+	left: 0;
+	top: 50%;
+	transform: translate(0, -50%);
+}
+
+.featured-list {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.featured-item {
+	width: 100%;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+}
+
+.featured-item-top {
+	width: 100%;
+	height: 82rpx;
+	line-height: 82rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.featured-name {
+	width: 80%;
+	color: #202020;
+	font-size: 30rpx;
+	font-weight: bold;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+}
+
+.featured-msg {
+	width: 100%;
+	font-weight: bold;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #777777;
+	font-size: 26rpx;
+	margin-bottom: 20rpx;
+}
+
+.featured-img {
+	width: 100%;
+	height: 336rpx;
+	border-radius: 16rpx;
+}
+
+.look-btn {
+	width: 104rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	background-color: #fff;
+	border-radius: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #919191;
+	font-size: 24rpx;
+	border: 1px solid #E6E6E6;
+	box-sizing: border-box;
+}
+
+.featured-tag {
+	width: 100%;
+	height: 88rpx;
+	line-height: 88rpx;
+	display: -webkit-box;
+	-webkit-line-clamp: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-size: 26rpx;
+	font-weight: bold;
 }

pages/index/regulate-six-bowels/regulate-six-bowels.vue

@@ -1,4 +1,4 @@
-<!-- 调六腑 -->
+<!-- 调六腑 -->
 <template>
 	<view class="wrap">
 		<view class="tab-list">
@@ -15,12 +15,51 @@
 						<view class="product-item-column-name2">冻干柠檬片 蜂蜜柠檬茶 保留鲜度96% 美白神器</view>
 						<view class="product-item-column2-row-between">
 							<view class="product-item-column2-price">
-								￥<394 class="00"></394>
-								<text>￥34.00</text>
+								￥394.00
+							</view>
+							<text class="del-price">￥34.00</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="product-item">
+				<view class="product-item-column2">
+					<image src="../../../static/img-4.png" class="product-item-column2-img" mode="aspectFill"></image>
+					<view class="product-item-column2-bottom">
+						<view class="product-item-column-name2">冻干柠檬片 </view>
+						<view class="product-item-column2-row-between">
+							<view class="product-item-column2-price">
+								￥394.00
+							</view>
+							<text class="del-price">￥34.00</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="product-item">
+				<view class="product-item-column2">
+					<image src="../../../static/img-4.png" class="product-item-column2-img" mode="aspectFill"></image>
+					<view class="product-item-column2-bottom">
+						<view class="product-item-column-name2">冻干柠檬片 蜂蜜柠檬茶 保留鲜度96% 美白神器</view>
+						<view class="product-item-column2-row-between">
+							<view class="product-item-column2-price">
+								￥394.00
+							</view>
+							<text class="del-price">￥34.00</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="product-item">
+				<view class="product-item-column2">
+					<image src="../../../static/img-4.png" class="product-item-column2-img" mode="aspectFill"></image>
+					<view class="product-item-column2-bottom">
+						<view class="product-item-column-name2">冻干柠檬片 蜂蜜柠檬茶 保留鲜度96% 美白神器</view>
+						<view class="product-item-column2-row-between">
+							<view class="product-item-column2-price">
+								￥394.00
 							</view>
-							<button type="default" class="product-item-column2-btn">
-								<image src="../../../static/add-icon.png" mode=""></image>
-							</button>
+							<text class="del-price">￥34.00</text>
 						</view>
 					</view>
 				</view>
@@ -33,11 +72,8 @@
 						<view class="product-item-column2-row-between">
 							<view class="product-item-column2-price">
 								￥394.00
-								<text>￥34.00</text>
 							</view>
-							<button type="default" class="product-item-column2-btn">
-								<image src="../../../static/add-icon.png" mode=""></image>
-							</button>
+							<text class="del-price">￥34.00</text>
 						</view>
 					</view>
 				</view>
@@ -50,16 +86,46 @@
 						<view class="product-item-column2-row-between">
 							<view class="product-item-column2-price">
 								￥394.00
-								<text>￥34.00</text>
 							</view>
-							<button type="default" class="product-item-column2-btn">
-								<image src="../../../static/add-icon.png" mode=""></image>
-							</button>
+							<text class="del-price">￥34.00</text>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view class="bottom">
+			<view class="bottom-label">
+				精选搭配
+			</view>
+			<view class="featured-list">
+				<view class="featured-item">
+					<view class="featured-item-top">
+						<view class="featured-name">玫瑰平胃茶</view>
+						<button type="default" class="look-btn">查看</button>
+					</view>
+					<view class="featured-msg">
+						(胃痛）理气解郁、和胃散郁
+					</view>
+					<image src="../../../static/img-4.png" class="featured-img" mode="aspectFill"></image>
+					<view class="featured-tag">
+						石斛15g
+					</view>
+				</view>
+				<view class="featured-item">
+					<view class="featured-item-top">
+						<view class="featured-name">玫瑰平胃茶</view>
+						<button type="default" class="look-btn">查看</button>
+					</view>
+					<view class="featured-msg">
+						(胃痛）理气解郁、和胃散郁
+					</view>
+					<image src="../../../static/img-4.png" class="featured-img" mode="aspectFill"></image>
+					<view class="featured-tag">
+						石斛15g
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -88,9 +154,9 @@
 			}
 		},
 		methods: {
-			//选项卡
-			checked(index) {
-				this.isActive = index
+			//选项卡
+			checked(index) {
+				this.isActive = index
 			},
 		}
 	}
@@ -100,4 +166,3 @@
 <style scoped lang="scss">
 	@import "./regulate-six-bowels.css";
 </style>
-

pages/my/member/member.vue

@@ -91,7 +91,7 @@
 				会员权益
 				<image src="../../../static/tag-right.png" class="tag-img" mode="widthFix"></image>
 			</view>
-
+			
 			<view class="menu-list">
 				<view class="menu-item">
 					<image src="../../../static/icon-16.png" mode=""></image>