2-18新增

pages.json

@@ -399,104 +399,124 @@
 				"navigationStyle": "custom"
 			}
 
+		}, {
+			"path": "pages/my-order/order-details/order-details",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
+		}, {
+			"path": "pages/my-order/refund-after-sale/refund-after-sale",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F6F6F6"
+			}
+
+		}, {
+			"path": "pages/my-order/select-service/select-service",
+			"style": {
+				"navigationBarTitleText": "选择服务",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my-order/apply-for-invoice/apply-for-invoice",
+			"style": {
+				"navigationBarTitleText": "申请开票",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my-order/apply-for-refund/apply-for-refund",
+			"style": {
+				"navigationBarTitleText": "申请退款",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my-order/evaluation/evaluation",
+			"style": {
+				"navigationBarTitleText": "评价",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/origin-direct-sales/origin-direct-sales",
+			"style": {
+				"navigationBarTitleText": "产地直销",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/limited-source-pre-sale/limited-source-pre-sale",
+			"style": {
+				"navigationBarTitleText": "限源预售",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/video-column/video-column",
+			"style": {
+				"navigationBarTitleText": "视频专栏",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/my-custom/my-custom",
+			"style": {
+				"navigationBarTitleText": "我的定制",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/gift-choice/gift-choice",
+			"style": {
+				"navigationBarTitleText": "礼品心选",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/gift-choice-list/gift-choice-list",
+			"style": {
+				"navigationBarTitleText": "送长辈",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/my-order/logistics-details/logistics-details",
+			"style": {
+				"navigationBarTitleText": "物流详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F6F6F6"
+			}
+
+		}, {
+			"path": "pages/my/member/member",
+			"style": {
+				"navigationBarTitleText": "会员",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#35313F",
+				"navigationBarTextStyle": "white"
+			}
+
 		}
 	    ,{
-            "path" : "pages/my-order/order-details/order-details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/my-order/refund-after-sale/refund-after-sale",
+            "path" : "pages/index/raise-five-internal-organs/raise-five-internal-organs",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "我的订单",
-                "enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#F6F6F6"
-            }
-            
-        }
-        ,{
-            "path" : "pages/my-order/select-service/select-service",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "选择服务",
+                "navigationBarTitleText": "养五脏",
                 "enablePullDownRefresh": false
             }
             
         }
         ,{
-            "path" : "pages/my-order/apply-for-invoice/apply-for-invoice",
+            "path" : "pages/index/regulate-six-bowels/regulate-six-bowels",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "申请开票",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/my-order/apply-for-refund/apply-for-refund",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "申请退款",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/my-order/evaluation/evaluation",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "评价",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/origin-direct-sales/origin-direct-sales",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "产地直销",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/limited-source-pre-sale/limited-source-pre-sale",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "限源预售",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/video-column/video-column",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "视频专栏",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/my-custom/my-custom",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的定制",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/gift-choice/gift-choice",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "礼品心选",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
             

pages/index/gift-choice-list/gift-choice-list.css

@@ -0,0 +1,89 @@
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+.product-item-column2 {
+	width: 100%;
+	height: 100%;
+	border-radius: 12rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.product-item-column2-img {
+	width: 100%;
+	height: 340rpx;
+	border-radius: 12rpx 12rpx 0 0;
+}
+
+.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%;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-weight: bold;
+	font-size: 26rpx;
+}
+
+.product-item-column2-row-between {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-item-column2-btn {
+	width: 40rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	border-radius: initial;
+}
+
+.product-item-column2-btn image {
+	width: 100%;
+	height: 100%;
+}
+
+.product-item-column2-price {
+	color: #F2501A;
+	font-size: 28rpx;
+}
+
+.product-item-column2-price>text {
+	color: #919191;
+	font-size: 24rpx;
+	margin-left: 6rpx;
+	text-decoration: line-through;
+}
+
+.product-list {
+	width: 100%;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+}
+
+.product-item {
+	width: calc(50% - 11rpx);
+	height: 500rpx;
+	border-radius: 12rpx;
+	background-color: #fff;
+	margin-bottom: 30rpx;
+}

pages/index/gift-choice-list/gift-choice-list.vue

@@ -0,0 +1,75 @@
+<!-- 礼品心选列表 -->
+<template>
+	<view class="wrap">
+		<view class="product-list">
+			<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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./gift-choice-list.css";
+</style>

pages/index/index.css

@@ -942,6 +942,62 @@ page {
 .product-item-column2-price>text {
 	color: #919191;
 	font-size: 24rpx;
-	margin-left: 6rpx;
+	margin-left: 6rpx;
 	text-decoration: line-through;
+}
+
+.mask {
+	position: fixed;
+	left: 0;
+	right: 0;
+	top: 0;
+	height: 100vh;
+	background-color: rgba(0, 0, 0, 0.15);
+	z-index: 99999998;
+}
+
+.window {
+	position: fixed;
+	width: 180rpx;
+	display: flex;
+	flex-direction: column;
+	top: 100rpx;
+	right: 22rpx;
+	border-radius: 12rpx;
+	background-color: #fff;
+	z-index: 99999999;
+	display: flex;
+	flex-direction: column;
+	padding: 26rpx 0 18rpx 34rpx;
+	box-sizing: border-box;
+}
+
+.window::after {
+	content: "";
+	position: absolute;
+	top: -35rpx;
+	right: 20rpx;
+	width: 0;
+	height: 0;
+	border: 20rpx solid transparent;
+	border-bottom-color: #fff;
+}
+
+.window-item {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	color: #202020;
+	font-size: 24rpx;
+	margin-bottom: 18rpx;
+}
+
+.window-item:last-child {
+	margin-bottom: 0;
+}
+
+.window-item image {
+	width: 24rpx;
+	height: 24rpx;
+	margin-right: 18rpx;
 }

pages/index/index.vue

@@ -18,7 +18,7 @@
 					<button type="default">
 						<image src="../../static/head-icon1.png" mode="widthFix"></image>
 					</button>
-					<button type="default">
+					<button type="default" @tap="show">
 						<image src="../../static/head-icon2.png" mode="widthFix"></image>
 					</button>
 				</view>
@@ -522,7 +522,28 @@
 			</view>
 			
 		</view>
-
+		
+		
+		<!-- 顶部-弹窗 -->
+		<view v-show="isShow">
+			<view class="mask" @tap="close"></view>
+			<view class="window">
+				<view class="window-item">
+					<image src="../../static/icon-20.png" mode="widthFix"></image>
+					扫一扫
+				</view>
+				<view class="window-item">
+					<image src="../../static/icon-18.png" mode="widthFix"></image>
+					分享
+				</view>
+				<view class="window-item">
+					<image src="../../static/icon-19.png" mode="widthFix"></image>
+					消息
+				</view>
+			</view>
+		</view>
+		<!-- 顶部-弹窗  -->
+		
 	</view>
 </template>
 
@@ -569,7 +590,10 @@
 					index: 3,
 					title: "养颜",
 					msg: '补气养颜'
-				}]
+				}],
+				
+				//顶部弹窗
+				isShow:true
 			}
 		},
 		onLoad() {
@@ -587,6 +611,13 @@
 		methods: {
 			checked(index) {
 				this.isActive = index
+			},
+			//顶部-弹窗
+			show() {
+				this.isShow = true;
+			},
+			close() {
+				this.isShow = false;
 			},
 		}
 	}

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

@@ -0,0 +1,175 @@
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding-top: 84rpx;
+}
+
+.tab-list {
+	width: 100%;
+	height: 84rpx;
+	display: flex;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	background-color: #F6F6F6;
+}
+
+.child {
+	flex: 1;
+	height: 84rpx;
+	line-height: 84rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 30rpx;
+	color: #202020;
+	position: relative;
+}
+
+.child.active {
+	color: #F2501A;
+	font-weight: bold;
+}
+
+.child.active::after {
+	content: "";
+	width: 72rpx;
+	height: 2px;
+	position: absolute;
+	bottom: 0;
+	left: 50%;
+	transform: translate(-50%, 0);
+	background-color: #F2501A;
+}
+
+.bg {
+	width: 100%;
+}
+
+.top-module {
+	width: 100%;
+	border-radius: 32rpx 32rpx 0 0;
+	background: linear-gradient(180deg, #FFFFFF, #F8F8F8, #FFFFFF);
+	margin-top: -20rpx;
+	z-index: 10;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 20rpx 24rpx 4rpx;
+	box-sizing: border-box;
+	margin-bottom: 30rpx;
+}
+
+.top-module-item {
+	width: calc(50% - 11rpx);
+	height: fit-content;
+	display: flex;
+	flex-direction: column;
+	background-color: #FFFFFF;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+	padding: 0 22rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.top-module-item-name {
+	width: 100%;
+	height: 82rpx;
+	display: flex;
+	align-items: center;
+	color: #202020;
+	font-size: 32rpx;
+}
+
+.top-module-item-img {
+	width: 100%;
+	height: 234rpx;
+	border-radius: 8rpx;
+}
+
+.product-item-column2 {
+	width: 100%;
+	height: 100%;
+	border-radius: 12rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.product-item-column2-img {
+	width: 100%;
+	height: 340rpx;
+	border-radius: 12rpx 12rpx 0 0;
+}
+
+.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%;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-weight: bold;
+	font-size: 26rpx;
+}
+
+.product-item-column2-row-between {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-item-column2-btn {
+	width: 40rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	border-radius: initial;
+}
+
+.product-item-column2-btn image {
+	width: 100%;
+	height: 100%;
+}
+
+.product-item-column2-price {
+	color: #F2501A;
+	font-size: 28rpx;
+}
+
+.product-item-column2-price>text {
+	color: #919191;
+	font-size: 24rpx;
+	margin-left: 6rpx;
+	text-decoration: line-through;
+}
+
+.product-list {
+	width: 100%;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 20rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.product-item {
+	width: calc(50% - 11rpx);
+	height: 500rpx;
+	border-radius: 12rpx;
+	background-color: #fff;
+	margin-bottom: 30rpx;
+}

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

@@ -0,0 +1,102 @@
+<!-- 养五脏 -->
+<template>
+	<view class="wrap">
+		<view class="tab-list">
+			<view :class="{ 'active' : isActive === index }" class="child" v-for="(item,index) in navList" :key="index"
+				@click="checked(index)">
+				{{item.title}}
+			</view>
+		</view>
+		<view class="product-list">
+			<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 class="00"></394>
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//选项卡
+				isActive: 0,
+				navList: [{
+					index: 0,
+					title: '养心',
+				}, {
+					index: 1,
+					title: "养肝",
+				}, {
+					index: 2,
+					title: "养脾",
+				}, {
+					index: 3,
+					title: "养肺",
+				}, {
+					index: 4,
+					title: "养肾",
+				}],
+			}
+		},
+		methods: {
+			//选项卡
+			checked(index) {
+				this.isActive = index
+			},
+		}
+	}
+</script>
+
+
+<style scoped lang="scss">
+	@import "./raise-five-internal-organs.css";
+</style>

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

@@ -0,0 +1,175 @@
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding-top: 84rpx;
+}
+
+.tab-list {
+	width: 100%;
+	height: 84rpx;
+	display: flex;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	background-color: #F6F6F6;
+}
+
+.child {
+	flex: 1;
+	height: 84rpx;
+	line-height: 84rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 30rpx;
+	color: #202020;
+	position: relative;
+}
+
+.child.active {
+	color: #F2501A;
+	font-weight: bold;
+}
+
+.child.active::after {
+	content: "";
+	width: 72rpx;
+	height: 2px;
+	position: absolute;
+	bottom: 0;
+	left: 50%;
+	transform: translate(-50%, 0);
+	background-color: #F2501A;
+}
+
+.bg {
+	width: 100%;
+}
+
+.top-module {
+	width: 100%;
+	border-radius: 32rpx 32rpx 0 0;
+	background: linear-gradient(180deg, #FFFFFF, #F8F8F8, #FFFFFF);
+	margin-top: -20rpx;
+	z-index: 10;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 20rpx 24rpx 4rpx;
+	box-sizing: border-box;
+	margin-bottom: 30rpx;
+}
+
+.top-module-item {
+	width: calc(50% - 11rpx);
+	height: fit-content;
+	display: flex;
+	flex-direction: column;
+	background-color: #FFFFFF;
+	border-radius: 16rpx;
+	margin-bottom: 20rpx;
+	padding: 0 22rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.top-module-item-name {
+	width: 100%;
+	height: 82rpx;
+	display: flex;
+	align-items: center;
+	color: #202020;
+	font-size: 32rpx;
+}
+
+.top-module-item-img {
+	width: 100%;
+	height: 234rpx;
+	border-radius: 8rpx;
+}
+
+.product-item-column2 {
+	width: 100%;
+	height: 100%;
+	border-radius: 12rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.product-item-column2-img {
+	width: 100%;
+	height: 340rpx;
+	border-radius: 12rpx 12rpx 0 0;
+}
+
+.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%;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-weight: bold;
+	font-size: 26rpx;
+}
+
+.product-item-column2-row-between {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.product-item-column2-btn {
+	width: 40rpx;
+	height: 40rpx;
+	line-height: 40rpx;
+	border-radius: initial;
+}
+
+.product-item-column2-btn image {
+	width: 100%;
+	height: 100%;
+}
+
+.product-item-column2-price {
+	color: #F2501A;
+	font-size: 28rpx;
+}
+
+.product-item-column2-price>text {
+	color: #919191;
+	font-size: 24rpx;
+	margin-left: 6rpx;
+	text-decoration: line-through;
+}
+
+.product-list {
+	width: 100%;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	padding: 20rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.product-item {
+	width: calc(50% - 11rpx);
+	height: 500rpx;
+	border-radius: 12rpx;
+	background-color: #fff;
+	margin-bottom: 30rpx;
+}

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

@@ -0,0 +1,103 @@
+<!-- 调六腑 -->
+<template>
+	<view class="wrap">
+		<view class="tab-list">
+			<view :class="{ 'active' : isActive === index }" class="child" v-for="(item,index) in navList" :key="index"
+				@click="checked(index)">
+				{{item.title}}
+			</view>
+		</view>
+		<view class="product-list">
+			<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 class="00"></394>
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</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
+								<text>￥34.00</text>
+							</view>
+							<button type="default" class="product-item-column2-btn">
+								<image src="../../../static/add-icon.png" mode=""></image>
+							</button>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//选项卡
+				isActive: 0,
+				navList: [{
+					index: 0,
+					title: '养心',
+				}, {
+					index: 1,
+					title: "养肝",
+				}, {
+					index: 2,
+					title: "养脾",
+				}, {
+					index: 3,
+					title: "养肺",
+				}, {
+					index: 4,
+					title: "养肾",
+				}],
+			}
+		},
+		methods: {
+			//选项卡
+			checked(index) {
+				this.isActive = index
+			},
+		}
+	}
+</script>
+
+
+<style scoped lang="scss">
+	@import "./regulate-six-bowels.css";
+</style>
+

pages/my-order/logistics-details/logistics-details.css

@@ -0,0 +1,254 @@
+.wrap {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding: 20rpx 24rpx;
+	box-sizing: border-box;
+}
+
+.item-content {
+	width: 100%;
+	display: flex;
+	align-items: center;
+	background-color: #fff;
+	margin-bottom: 24rpx;
+	border-radius: 16rpx;
+	padding: 24rpx 26rpx;
+	box-sizing: border-box;
+}
+
+.product-img {
+	width: 186rpx;
+	height: 186rpx;
+	border-radius: 12rpx;
+	margin-right: 28rpx;
+}
+
+.item-content-sidebar {
+	flex: 1;
+	height: 180rpx;
+	display: flex;
+	flex-direction: column;
+}
+
+.product-item-row-between {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 30rpx;
+}
+
+.product-item-name {
+	width: 71%;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-orient: vertical;
+	color: #202020;
+	font-size: 26rpx;
+
+}
+
+.row-end {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-end;
+}
+
+.product-item-price {
+	color: #202020;
+	font-size: 26rpx;
+}
+
+.product-item-num {
+	color: #A7A7A7;
+	font-size: 20rpx;
+}
+
+.product-item-num text {
+	font-size: 24rpx;
+}
+
+.product-item-tag {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	color: #A7A7A7;
+	font-size: 24rpx;
+}
+
+.product-item-msg {
+	width: 100%;
+	color: #F2501A;
+	font-size: 20rpx;
+}
+
+.status-msg {
+	color: #FFBD0B;
+	font-size: 30rpx;
+}
+
+.freight-insurance-row {
+	width: 100%;
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	font-size: 24rpx;
+	margin-bottom: 20rpx;
+}
+
+.bottom {
+	width: 100%;
+	background-color: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 44rpx 24rpx 38rpx;
+	box-sizing: border-box;
+	display: flex;
+	flex-direction: column;
+}
+
+.box-between {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 38rpx;
+}
+
+.box-between-sidebar {
+	flex: 1;
+	display: flex;
+	align-items: center;
+	color: #070707;
+	font-size: 24rpx;
+}
+
+.box-between-sidebar image {
+	width: 72rpx;
+	height: 72rpx;
+	border-radius: 50%;
+	margin-right: 22rpx;
+}
+
+.copy-btn {
+	color: #F2501A;
+	font-size: 24rpx;
+	background-color: initial;
+	display: flex;
+	align-items: center;
+}
+
+.timeLine {
+	width: 100%;
+	overflow: hidden;
+	position: relative;
+}
+
+.timeLine .timeLine_li {
+	width: 100%;
+	display: flex;
+}
+
+.timeLine_row {
+	width: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	flex-direction: column;
+	position: relative;
+	font-size: 28rpx;
+	color: #1296db;
+	padding: 26rpx 0;
+}
+
+.timeLine_row::after {
+	content: " ";
+	display: block;
+	height: 100%;
+	width: 1.5px;
+	background-color: #E0E0E0;
+	position: absolute;
+	top: 50rpx;
+	left: 50%;
+	transform: translate(-50%, 0);
+	/* 	right: 13rpx; */
+}
+
+.timeLine .timeLine_li:last-child>.timeLine_row::after {
+	top: -26rpx;
+	height: initial;
+
+}
+
+.timeLine_row text {
+	display: block;
+	background-color: #E0E0E0;
+	border-radius: 50%;
+	width: 28rpx;
+	height: 28rpx;
+	text-align: center;
+	position: relative;
+	z-index: 10;
+	z-index: 1000;
+}
+
+.timeLine_row text.active {
+	background-color: #F2501A;
+	border: 14rpx solid #F1805F;
+}
+
+.timeLine_box {
+	display: flex;
+	flex-direction: column;
+	padding: 26rpx;
+}
+
+.con {
+	font-size: 28rpx;
+	color: #A7A7A7;
+}
+
+.time-text {
+	font-size: 24rpx;
+	color: #999999;
+	margin-top: 15rpx;
+}
+
+.orange-text {
+	font-size: 24rpx;
+	color: #FF6600;
+	margin-top: 20rpx;
+}
+
+.msg-text {
+	font-size: 24rpx;
+	color: #666666;
+	margin-top: 20rpx;
+}
+
+.con.active {
+	color: #F2501A;
+}
+
+.time-row {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	color: #D6D7DB;
+	padding: 26rpx 0;
+}
+
+.time-row text:first-child {
+	font-size: 28rpx;
+}
+
+.time-row text:last-child {
+	font-size: 24rpx;
+}
+
+.time-row.active {
+	color: #F2501A;
+}

pages/my-order/logistics-details/logistics-details.vue

@@ -0,0 +1,128 @@
+<template>
+	<view class="wrap">
+		<view class="item-content">
+			<image src="../../../static/img-4.png" class="product-img" mode="aspectFill"></image>
+			<view class="item-content-sidebar">
+				<view class="product-item-row-between">
+					<view class="product-item-name">
+						冻干柠檬片 蜂蜜柠檬茶 保留鲜度96% 美白神器
+					</view>
+					<view class="row-end">
+						<text class="product-item-price">￥394.00</text>
+						<text class="product-item-num">x <text>1</text></text>
+					</view>
+				</view>
+				<view class="product-item-tag">
+					<text>一盒15g*20袋</text>
+				</view>
+			</view>
+		</view>
+		<view class="bottom">
+			<view class="box-between">
+				<view class="box-between-sidebar">
+					<image src="../../../static/icon-14.png" mode=""></image>
+					<text>圆通快递 YT5462737255128</text>
+				</view>
+				<button type="default" class="copy-btn">复制</button>
+			</view>
+			<view class="timeLine">
+				<view class="timeLine_li">
+					<view class="time-row active">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text class="active"></text></view>
+					<view class="timeLine_box">
+						<view class="con active">快件已到达 杭州滨州江区一部 </view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]杭州萧山散仓 已发出</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]快件已到达 杭州萧山散仓</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]杭州运转中心已发出</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">到杭州是[杭州运转中心]</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]快件已到达 杭州运转中心</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]快件已到达 杭州运转中心</view>
+					</view>
+				</view>
+				<view class="timeLine_li">
+					<view class="time-row">
+						<text>下午</text>
+						<text>13:50</text>
+					</view>
+					<view class="timeLine_row"><text></text></view>
+					<view class="timeLine_box">
+						<view class="con">[杭州市]快件已到达 杭州运转中心</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+<style scoped lang="scss">
+	@import "./logistics-details.css";
+</style>

pages/my/member/member.css

@@ -0,0 +1,242 @@
+page {
+	background-color: #35313F;
+}
+
+.bottom {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding: 0 24rpx;
+	box-sizing: border-box;
+}
+
+.label {
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #FFFFFF;
+	font-size: 36rpx;
+	line-height: 36rpx;
+	padding: 28rpx 0 36rpx;
+}
+
+.tag-img {
+	width: 173rpx;
+	margin: 0 22rpx;
+}
+
+.menu-list {
+	width: 100%;
+	display: flex;
+	margin-bottom: 40rpx;
+}
+
+.menu-item {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.menu-item image {
+	width: 100rpx;
+	height: 100rpx;
+	margin-bottom: 15rpx;
+}
+
+.menu-font1 {
+	color: #FFFFFF;
+	font-size: 28rpx;
+}
+
+.menu-font2 {
+	color: #D2A265;
+	font-size: 24rpx;
+}
+
+.module {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	background-color: #070606;
+	border-radius: 22rpx;
+	padding: 0 22rpx 30rpx;
+	box-sizing: border-box;
+	margin-bottom: 24rpx;
+}
+
+.module-label {
+	width: 100%;
+	height: 90rpx;
+	line-height: 90rpx;
+	display: flex;
+	align-items: center;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	font-size: 34rpx;
+	color: #FFFFFF;
+	position: relative;
+}
+
+.module-label::after {
+	position: absolute;
+	content: "";
+	left: 0;
+	top: 50%;
+	transform: translate(0, -50%);
+	background-color: #A17947;
+	border-radius: 50%;
+	width: 18rpx;
+	height: 18rpx;
+}
+
+.module-msg {
+	width: 100%;
+	color: #FFFFFF;
+	font-size: 28rpx;
+}
+
+.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%;
+	border-radius: 30rpx;
+	padding: 20rpx 38rpx;
+	box-sizing: border-box;
+}
+
+.yellow {
+	background: linear-gradient(90deg, #F8DC82, #F7D16B);
+}
+
+.blue {
+	background: linear-gradient(90deg, #F1F5FF, #D8E4FF);
+}
+
+.brown {
+	background: linear-gradient(90deg, #DA8E75, #E2A288);
+}
+
+.swiper-item-content-top {
+	width: 100%;
+	display: flex;
+	align-items: center;
+}
+
+.avatar {
+	width: 74rpx;
+	height: 74rpx;
+	border-radius: 50%;
+	border: 1px solid #fff;
+	box-sizing: border-box;
+	margin-right: 20rpx;
+}
+
+.swiper-item-content-top-sidebar {
+	flex: 1;
+	display: flex;
+	flex-direction: column;
+}
+
+.user-name {
+	color: #D49A16;
+	font-size: 20rpx;
+	margin-bottom: 4rpx;
+}
+
+.user-tag {
+	width: max-content;
+	height: 31rpx;
+	line-height: 31rpx;
+	display: flex;
+	align-items: center;
+	padding: 0 14rpx;
+	color: #FFFFFF;
+	font-size: 16rpx;
+	background-color: #FFBD0B;
+	border-radius: 40rpx;
+}
+
+.date-time {
+	color: #D49A16;
+	font-size: 20rpx;
+	margin: 16rpx 0 24rpx;
+}
+
+.date-time text {
+	margin-left: 20rpx;
+}
+
+.msg-list {
+	width: 100%;
+	display: flex;
+}
+
+.msg-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	margin-right: 37rpx;
+}
+
+.msg-item text:first-child {
+	color: #C88914;
+	font-size: 38rpx;
+	font-weight: bold;
+	margin-bottom: 7rpx;
+}
+
+.msg-item text:nth-child(2) {
+	color: #D49A16;
+	font-size: 24rpx;
+}
+
+.white {
+	color: #fff;
+}
+
+.brown-bg {
+	background-color: #E8AD94;
+}
+
+.msg-item.white text {
+	color: #fff;
+}
+
+.blue-font {
+	color: #919191;
+}
+
+.blue-bg {
+	background-color: #DCDCDC;
+	color: #454545;
+}
+
+.msg-item.blue-font text:first-child {
+	color: #808081;
+}
+
+
+.msg-item.blue-font text:nth-child(2) {
+	color: #C9C9CA;
+}

pages/my/member/member.vue

@@ -0,0 +1,156 @@
+<!-- 会员 -->
+<template>
+	<view class="wrap">
+
+		<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 blue">
+							<view class="swiper-item-content-top">
+								<image src="../../../static/avatar.png" class="avatar" mode="aspectFill"></image>
+								<view class="swiper-item-content-top-sidebar ">
+									<view class="user-name blue-font">真的灰常郝</view>
+									<view class="user-tag blue-bg">黄金会员</view>
+								</view>
+							</view>
+							<view class="date-time blue-font">
+								2021-05-27 <text>到期</text>
+							</view>
+							<view class="msg-list">
+								<view class="msg-item blue-font">
+									<text>79820</text>
+									<text>会员积分</text>
+								</view>
+								<view class="msg-item blue-font">
+									<text>79820</text>
+									<text>经验值</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">
+						<view class="swiper-item-content yellow">
+							<view class="swiper-item-content-top">
+								<image src="../../../static/avatar.png" class="avatar" mode="aspectFill"></image>
+								<view class="swiper-item-content-top-sidebar yellow">
+									<view class="user-name">真的灰常郝</view>
+									<view class="user-tag">黄金会员</view>
+								</view>
+							</view>
+							<view class="date-time">
+								2021-05-27 <text>到期</text>
+							</view>
+							<view class="msg-list">
+								<view class="msg-item">
+									<text>79820</text>
+									<text>会员积分</text>
+								</view>
+								<view class="msg-item">
+									<text>79820</text>
+									<text>经验值</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+				<swiper-item>
+					<view class="swiper-item">
+						<view class="swiper-item-content brown">
+							<view class="swiper-item-content-top">
+								<image src="../../../static/avatar.png" class="avatar" mode="aspectFill"></image>
+								<view class="swiper-item-content-top-sidebar ">
+									<view class="user-name white">真的灰常郝</view>
+									<view class="user-tag brown-bg">黄金会员</view>
+								</view>
+							</view>
+							<view class="date-time white">
+								2021-05-27 <text>到期</text>
+							</view>
+							<view class="msg-list">
+								<view class="msg-item white">
+									<text>79820</text>
+									<text>会员积分</text>
+								</view>
+								<view class="msg-item white">
+									<text>79820</text>
+									<text>经验值</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="bottom">
+			<view class="label">
+				<image src="../../../static/tag-left.png" class="tag-img" mode="widthFix"></image>
+				会员权益
+				<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>
+					<text class="menu-font1">商城特定商品</text>
+					<text class="menu-font2">优惠活动到点提醒</text>
+				</view>
+				<view class="menu-item">
+					<image src="../../../static/icon-17.png" mode=""></image>
+					<text class="menu-font1">生日礼包</text>
+					<text class="menu-font2">专属优惠</text>
+				</view>
+				<view class="menu-item">
+					<image src="../../../static/icon-15.png" mode=""></image>
+					<text class="menu-font1">积分抵现</text>
+					<text class="menu-font2">积分优惠多多</text>
+				</view>
+			</view>
+
+			<view class="module">
+				<view class="module-label">
+					会员权益
+				</view>
+				<view class="module-msg">
+					I.会员等级按经验值划分，不同经验值区间对应不同级别，后台可设置
+					II.经验值由消费积分+打卡积分综合产生，累计计算，不受积分消耗影响
+					III.累计经验值所产生的积分一年为限，一年内达到的最高值为等级标准
+					IV.从会员当前时间往前推年，超过一 年的积分视为过期不作计算
+					会员等级数、会员等级名称、以及每个等级的经验值区间都可通过后台设置
+				</view>
+			</view>
+
+			<view class="module">
+				<view class="module-label">
+					积分获取方式
+				</view>
+				<view class="module-msg">
+					I.购买商品可产生同价格相应积分
+					II.上线打卡可产生相应积分
+					III.平台针对不同级别用户赠送积分，或特殊日期赠送(不纳入经验值)
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "./member.css";
+</style>