diff --git a/pages/index/index.vue b/pages/index/index.vue
index 517aadb..7b15581 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -167,16 +167,26 @@
 						<view class="index-card-view-title">
 							<image class="index-card-image" :src="item.packageImg?item.packageImg:item.massageImg" mode=""></image>
 							<!-- <view class="index-card-view-title-left">{{item.title}}</view> -->
-							<view class="index-card-view-title-right">助眠解压</view>
+							<view class="index-card-view-title-right" >
+								<text v-if="item.tagsData!=''">{{item.tagsData[0]}}</text>
+								<text v-else>助眠解压</text>
+							</view>							
+							<!-- <view class="index-card-view-title-right"  >助眠解压</view> -->						
 						</view>
 						<view class="index-card-mian">
 							<view class="index-card-mian-title marginTop">{{item.title}}</view>
 							<view class="index-card-mian-biao marginTop">
-								<view class="index-card-mian-biao-left">
-									助眠减压
+								<view class="shop_label" v-if="item.tagsData!=''">
+									<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 								</view>
-								<view class="index-card-mian-biao-right">
-									缓解疲劳
+								<view class="shop_label" v-else>
+									<view class="index-card-mian-biao-left">
+										助眠减压
+									</view>
+									<!-- <view class="index-card-mian-biao-right"> -->
+									<view class="index-card-mian-biao-left">
+										缓解疲劳
+									</view>
 								</view>
 							</view>
 							<view class="index-card-mian-time marginTop" v-if="item.duration">
@@ -1129,6 +1139,9 @@
 					if (res.code == 0) {
 						if (res.data) {
 							this.tjData = res.data.list
+							for(var i=0;i<this.tjData.length;i++){
+								this.tjData[i].tagsData=this.tjData[i].labels.split(',');
+							}
 						}
 					}
 				});
@@ -1143,6 +1156,9 @@
 					if (res.code == 0) {
 						if (res.data) {
 							this.tjData = res.data.list
+							for(var i=0;i<this.tjData.length;i++){
+								this.tjData[i].tagsData=this.tjData[i].labels.split(',');
+							}
 						}
 					}
 				});
@@ -1667,11 +1683,15 @@
 		margin-left: 10px;
 	}
 	.index-card-mian-biao-left{
-		background-color:rgba(253, 197, 128, 0.2);
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
 		border-radius: 8rpx;
-		font-weight: 400;
-		font-size: 23rpx;
-		color: #FFA12D;
+		padding: 0 10rpx;
+		font-size: 22rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.index-card-mian-biao{
 		width: 100%;
@@ -2158,4 +2178,20 @@
 		height: 100vh;
 		overflow: auto;
 	}
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+		margin-top: 10rpx;
+	}
+	.shop_label span{
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
+		border-radius: 8rpx;
+		padding: 0 10rpx;
+		font-size: 22rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+		color: #f68607;
+	}
 </style>
diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index cad4956..320fa4d 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -59,8 +59,11 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}/{{item.serviceCount}}次</span>
 					</view>
-					<view class="shop_label" v-if="tagsData">
-						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+					<view class="shop_label" v-if="item.tagsData!=''">
+						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+					</view>
+					<view class="shop_label" v-else>
+						<span>助眠解压</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -121,7 +124,7 @@
 					if (res.code == 0) {
 						this.dataList=res.data.records;
 						for(var i=0;i<this.dataList.length;i++){
-							this.tagsData=this.dataList[i].labels.split(',');
+							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 						}
 					}
 				})
@@ -179,7 +182,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -187,6 +190,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index f5cdabe..383f240 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -1,75 +1,76 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-view">
-		<view class="service-head-top">
-			<view class="service-head-top-left">
-				<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-				<span>更多推荐</span>
-			</view>
-			<view>
-				<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
-				 @clear="clear">
-				</uni-search-bar>
-				<view class="search-btn" @click="searchBtn">
-					搜索
-				</view>
-			</view>
-		</view>
-		<!-- <view class="fenlei">
-			<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
-		</view> -->
-		<t-refresh ref="refresh"  v-if="dataList.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0" >
-			<template slot="content">
-				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-					<image :src="item.packageImg" mode="" class="item-img"></image>
-					<view class="item-view">
-						<view class="item-view-title">
-							{{item.title}}
-						</view>
-						<!-- <view class="item-view-xiangmu">
-							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
-							<span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
-						</view> -->
-						
-						<view class="item-view-bottom">
-							<view class="item-view-bottom-qian">
-								<span>￥</span>
-								<span>{{item.price}}</span>
-								<span v-if="item.type!='104'">
+    <z-paging ref="paging" v-model="dataList" @query="queryList" >
+      <template #top>
+        <view class="service-head-top">
+          <view class="service-head-top-left">
+            <image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
+            <span>更多推荐</span>
+          </view>
+          <view>
+            <uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
+                            @clear="clear">
+            </uni-search-bar>
+            <view class="search-btn" @click="searchBtn">
+              搜索
+            </view>
+          </view>
+        </view>
+      </template>
+      <template #refresher="{refresherStatus}" >
+        <custom-refresher :status="refresherStatus" />
+      </template>
+      <template #loadingMoreNoMore >
+        <custom-nomore />
+      </template>
+      <view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+        <image :src="item.packageImg" mode="" class="item-img"></image>
+        <view class="item-view">
+          <view class="item-view-title">
+            {{item.title}}
+          </view>
+          <!-- <view class="item-view-xiangmu">
+            <span class="xiaoer item-view-biao">{{item.classifyName}}</span>
+            <span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
+          </view> -->
+
+          <view class="item-view-bottom">
+            <view class="item-view-bottom-qian">
+              <span>￥</span>
+              <span>{{item.price}}</span>
+              <span v-if="item.type!='104'">
 									/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}
 								</span>
-								<span v-if="item.type=='104'">/套
+              <span v-if="item.type=='104'">/套
 								</span>
-								<span v-if="item.type!='104'">￥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}</span>
-								<span v-if="item.type=='104'">￥{{item.oldPrice}}/套</span>
-							</view>
-							
-						</view>
-						<view class="shop_label" v-if="tagsData">
-							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
-						</view>
-						<view class="item-view-bottom">
-							<view class="item-view-xiangmu">
-								<span>已售</span><span>{{item.sales}}</span><!-- | 好评{{item.esteemRate}}% -->
-							</view>
-							<view class="item-view-bottom-btn">
-								查看
-							</view>
-						</view>
-					</view>	
-				</view>
-			</template> 
-		</t-refresh>
-		<empty v-if="dataList.length==0"></empty>
-			
+              <span v-if="item.type!='104'">￥{{item.oldPrice}}/{{item.serviceCount?item.serviceCount:''}}{{item.type=='105'||item.type=='106'?'次':'元'}}</span>
+              <span v-if="item.type=='104'">￥{{item.oldPrice}}/套</span>
+            </view>
+
+          </view>
+          <view class="shop_label" v-if="item.tagsData!=''">
+            <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+          </view>
+          <view class="shop_label" v-else>
+            <span>助眠解压</span>
+          </view>
+          <view class="item-view-bottom">
+            <view class="item-view-xiangmu">
+              <span>已售</span><span>{{item.sales}}</span><!-- | 好评{{item.esteemRate}}% -->
+            </view>
+            <view class="item-view-bottom-btn">
+              查看
+            </view>
+          </view>
+        </view>
+      </view>
+    </z-paging>
 	</view>
 </template>
 
 <script>
-	import empty from '@/components/empty.vue'
-	import tRefresh from "@/components/t-refresh/t-refresh.vue"
 	export default {
-		components:{tRefresh,empty},
 		data() {
 			return {
 				loadingType:0,
@@ -89,36 +90,33 @@
 			}
 		},
 		onLoad(e){
-			
 			this.myId = uni.getStorageSync('userId')
 			if(e){
 				this.searchValue=e.searchValue
 			}
-			this.getData()
-		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.getData()
+			// this.getData()
 		},
+		// onPullDownRefresh: function() {
+		// 	this.page = 1;
+		// 	this.getData()
+		// },
 		methods: {
+      input(res) {//搜索 输入框
+        this.searchValue=res;
+      },
 			// 加载更多
-			loadMore: async function() {
-				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
-				if(this.loadingType==0){
-					this.loadingType=2
-					//模拟数据请求
-					setTimeout(()=>{
-						this.page++;
-						this.loadingType=0;
-						this.getData()
-					},1000)
-				}
-			},
-			
-			input(res) {//搜索 输入框
-				this.searchValue=res;
-				console.log('----input:', res)
-			},
+			// loadMore: async function() {
+			// 	//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
+			// 	if(this.loadingType==0){
+			// 		this.loadingType=2
+			// 		//模拟数据请求
+			// 		setTimeout(()=>{
+			// 			this.page++;
+			// 			this.loadingType=0;
+			// 			this.getData()
+			// 		},1000)
+			// 	}
+			// },
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
 					this.getData()
@@ -136,23 +134,41 @@
 							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
 							this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
 							for(var i=0;i<this.dataList.length;i++){
-								this.tagsData=this.dataList[i].labels.split(',');
+								this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 							}
 							uni.stopPullDownRefresh()
 						}
 					}
 				});
+        this.$refs.paging.reload(true);
 			},
-			changeClick(index,item){
-				this.classifyId=item.id
-				this.searchValue=''
-				this.getData()
-			},
+			// changeClick(index,item){
+			// 	this.classifyId=item.id
+			// 	this.searchValue=''
+			// 	this.getData()
+			// },
+      queryList(pageNo, pageSize) {
+        console.log("queryList");
+        const params = {
+          city:'',
+          page:pageNo,
+          limit:pageSize,
+          title:this.searchValue
+        }
+        this.$Request.get('/app/massage/package/findPackageAndMassagePage',params).then(res => {
+          for(var i=0;i<res.data.list.length;i++){
+            res.data.list[i].tagsData=res.data.list[i].labels.split(',');
+          }
+          this.$refs.paging.complete(res.data.list);
+        }).catch(res => {
+          this.$refs.paging.complete(false);
+        })
+      },
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/index/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -174,7 +190,7 @@
 						url:'/pages/my/fuwuDateil?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
 					})
 				}
-				
+
 			}
 		}
 	}
@@ -329,19 +345,19 @@
 		height: 100%;
 	}
 	.item {
-		width: 96%;
-		margin: 0 2% ;
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		height: 140px;
-		background: #FFFFFF;
-		border-radius: 21rpx;
-		margin-top:12px;
-		align-items: center;
-		padding: 0px 10px;
+    width: 96%;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    height: 140px;
+    background: #FFFFFF;
+    border-radius: 21rpx;
+    margin-top:10px;
+    align-items: center;
+    padding: 12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -349,7 +365,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -363,7 +379,7 @@
 		width:100%;
 	}
 	/deep/.zp-paging-container-content{
-		width: 95%;
+		width: 100%;
 		margin: 0 auto;
 	}
 	.fenlei{
@@ -457,5 +473,5 @@
 		background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
 		border-bottom:1rpx solid #c4ede1;
 	}
-	
+
 </style>
diff --git a/pages/my/fuwuliaocheng.vue b/pages/my/fuwuliaocheng.vue
index 120eb2a..b03db15 100644
--- a/pages/my/fuwuliaocheng.vue
+++ b/pages/my/fuwuliaocheng.vue
@@ -58,9 +58,11 @@
 						<span>/{{item.serviceCount}}次</span>
 						<span style="text-decoration: line-through;">￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
 					</view>
-					
-					<view class="shop_label" v-if="tagsData">
-						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+					<view class="shop_label" v-if="item.tagsData!=''">
+						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+					</view>
+					<view class="shop_label" v-else>
+						<span>助眠解压</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -121,7 +123,7 @@
 					if (res.code == 0) {
 						this.dataList=res.data.records;
 						for(var i=0;i<this.dataList.length;i++){
-							this.tagsData=this.dataList[i].labels.split(',');
+							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 						}
 					}
 				})
@@ -179,7 +181,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -187,6 +189,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index 500d1ea..d0ad60c 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -41,10 +41,12 @@
 								<span>{{item.oldPrice}}</span>
 							</view>
 						</view>
-						<view class="shop_label" v-if="tagsData">
-							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+						<view class="shop_label" v-if="item.tagsData!=''">
+							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+						</view>
+						<view class="shop_label" v-else>
+							<span>助眠解压</span>
 						</view>
-						
 						<view class="item-view-bottom">
 							<view class="item-view-xiangmu" style="align-items: flex-end; ">
 								<span style="font-size: 26rpx; color: #999; margin-right: 8rpx;">已售</span><span style="font-size: 26rpx; color: #333;">{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@@ -144,7 +146,7 @@
 							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
 							this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
 							for(var i=0;i<this.dataList.length;i++){
-								this.tagsData=this.dataList[i].labels.split(',');
+								this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 							}
 							uni.stopPullDownRefresh()
 						}
@@ -210,7 +212,7 @@
 	/deep/.refresh-body{
 		height: 100% !important;
 		border-top: 2px solid #f7f7f7;
-		margin: 88px 0px;
+		margin: 80px 0px;
 	}
 	.content-view{
 		width: 100%;
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 535cb9a..a131e57 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -148,8 +148,11 @@
 					</view>
 					
 				</view>
-				<view class="shop_label" v-if="tagsData">
-					<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+				<view class="shop_label" v-if="item.tagsData!=''">
+					<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+				</view>
+				<view class="shop_label" v-else>
+					<span>助眠解压</span>
 				</view>
 				<view class="item-view-bottom">
 					<view class="item-view-xiangmu">
@@ -275,7 +278,7 @@
 						if (res.data) {
 							this.dataList = res.data.list||{}; //追加新数据
 							for(var i=0;i<this.dataList.length;i++){
-								this.tagsData=this.dataList[i].labels.split(',');
+								this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 							}
 						}
 					}
@@ -704,14 +707,18 @@
 	.shop_label{
 		display: flex;
 		flex-wrap: wrap;
+		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #e5e5e5;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
 		border-radius: 8rpx;
-		padding: 2rpx 8rpx;
-		font-size: 20rpx;
+		padding: 0 10rpx;
+		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.item-view-xiangmu span:nth-child(2){
 			font-weight: normal;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index a99f08b..ccc4519 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -39,9 +39,12 @@
 							<span>￥</span>
 							<span>{{item.oldPrice}}<text  v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
 						</view>
-						<view class="shop_label" v-if="item.tagsData">
+						<view class="shop_label" v-if="item.tagsData!=''">
 							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 						</view>
+						<view class="shop_label" v-else>
+							<span>助眠解压</span>
+						</view>
 						<view class="item-view-bottom">
 							<view class="item-view-xiangmu">
 								<span>已售</span><span>{{item.sales}}</span><!-- | 好评{{item.esteemRate}}% -->
@@ -233,7 +236,7 @@
 	/deep/.refresh-body{
 		height: 100% !important;
 		border-top: 2px solid #f7f7f7;
-		margin: 88px 0px;
+		margin: 80px 0px;
 	}
 	.content-view{
 		width: 100%;
diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue
index cdc547d..a1b4e71 100644
--- a/pages/my/newTeaml.vue
+++ b/pages/my/newTeaml.vue
@@ -51,9 +51,12 @@
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
 					</view>
-					<view class="shop_label" v-if="item.tagsData">
+					<view class="shop_label" v-if="item.tagsData!=''">
 						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 					</view>
+					<view class="shop_label" v-else>
+						<span>助眠解压</span>
+					</view>
 					<view class="pace-plan">
 						<view class="pace-text"><span>{{item.duration}}</span><span>分钟</span></view>
 					</view>
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index c6e06d9..d25ec1f 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -23,7 +23,7 @@
 					<z-tabs class="z-tabs-fenlei" :list="tabList" @change="tabChange" @changeClick="changeClick"/>
 				</view> -->
 			</template>
-			
+
 			<!-- 自定义下拉刷新view(如果use-custom-refresher为true且不设置下面的slot="refresher"，此时不用获取refresherStatus，会自动使用z-paging自带的下拉刷新view) -->
 
 			<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
@@ -37,7 +37,7 @@
 				<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
 				<custom-nomore />
 			</template>
-			
+
 			<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
 			<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" >
 				<!-- <view class="item-title">{{item.title}}</view>
@@ -53,9 +53,12 @@
 						<!-- <view class="xiaoer item-view-biao">{{item.classifyName}}</view> -->
 					</view>
 					<view class="flex" style="margin-top: 10rpx;">
-						<view class="shop_label" v-if="item.tagsData">
+						<view class="shop_label" v-if="item.tagsData!=''">
 							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 						</view>
+						<view class="shop_label" v-else>
+							<span>助眠解压</span>
+						</view>
 					</view>
 					<view class="item-view-bottom-qian">
 						<span>￥</span>
@@ -63,7 +66,7 @@
 						<!-- <span>/{{item.serviceCount}}次</span> -->
 						<span>￥{{item.oldPrice}}</span>
 					</view>
-					
+
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
 							<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@@ -75,10 +78,10 @@
 							开抢
 						</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</z-paging>
-		
+
 	</view>
 </template>
 
@@ -118,7 +121,7 @@
 			getData(){
 				// console.log("getData");
 				// let data = {
-				// 	  userId: this.myId,	  
+				// 	  userId: this.myId,
 				// 	  page: this.page,
 				// 	  limit:  this.limit,
 				// 	  type: '112',
@@ -144,7 +147,7 @@
 				// 		}
 				// 	})
 				// }
-				this.$refs.paging.reload(true);	
+				this.$refs.paging.reload(true);
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -184,9 +187,9 @@
 					}).catch(res => {
 						this.$refs.paging.complete(false);
 					})
-				}	
+				}
 			},
-			
+
 			backImg(){//返回上一页
 				if(this.text=='my'){
 					uni.reLaunch({
@@ -197,7 +200,7 @@
 						url:'/pages/index/index'
 					})
 				}
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -210,7 +213,7 @@
 					uni.navigateTo({
 						url:'/pages/my/miaoShaOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.text
 					})
-				}			
+				}
 			}
 		}
 	}
@@ -225,7 +228,7 @@
 	}
 	.pace-text{
 		font-size: 24rpx;
-	
+
 	}
 	.pace-text span:nth-child(1){
 		color: #666;
@@ -234,7 +237,7 @@
 		color: #019C88;
 		font-weight: bold;
 		}
-	
+
 	.pace{
 		/* width: 60%; */
 		padding: 0px 5px;
@@ -243,7 +246,7 @@
 		background: #f5f5f5;
 		font-size: 20rpx;
 		line-height: 30rpx;
-		
+
 	}
 	.seckill-entry{
 		display: flex;
@@ -253,7 +256,7 @@
 	.seckill-money{
 		color: #fc2d32;
 		background: #fff8f0;
-		border-radius: 30rpx;	
+		border-radius: 30rpx;
 		padding: 15rpx 20rpx;
 	}
 	.seckill-money span:nth-child(1){
@@ -275,7 +278,7 @@
 		padding-left: 55rpx;
 		line-height: 50rpx;
 		margin-top: 15rpx;
-		
+
 	}
 	.seckill-img{
 		width: 70rpx;
@@ -291,7 +294,7 @@
 		font-style:italic;
 	}
 	.item-view-bottom-qian{
-	
+
 		margin-top: 5px;
 	}
 	.item-view-bottom-btn{
@@ -337,7 +340,7 @@
 		 font-size: 36.81rpx;
 		  color: #FF1200;
 	}
-	
+
 	.item-view-bottom{
 		width: 100%;
 		display: flex;
@@ -465,7 +468,7 @@
 		align-items: center;
 		padding: 12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -473,7 +476,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -533,7 +536,7 @@
 		height: 50rpx;
 		background: #18A689;
 		border-radius: 31rpx;
-		
+
 	}
 	/deep/.uni-searchbar__box{
 		height: 30px;
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index 513617c..f3200b7 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -59,8 +59,11 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}/套</span>
 					</view>
-					<view class="shop_label" v-if="tagsData">
-						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+					<view class="shop_label" v-if="item.tagsData!=''">
+						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+					</view>
+					<view class="shop_label" v-else>
+						<span>助眠解压</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -120,7 +123,7 @@
 					if (res.code == 0) {
 						this.dataList=res.data.records;
 						for(var i=0;i<this.dataList.length;i++){
-							this.tagsData=this.dataList[i].labels.split(',');
+							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 						}
 					}
 				})
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 27cc6ec..278c2e6 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -31,8 +31,8 @@
 								<span>{{item.price}}</span>
 								<span style="color: #999;text-decoration: line-through;margin-left: 5px;">￥{{item.oldPrice}}</span>
 							</view>
-							<view class="shop_label" v-if="tagsData">
-								<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+							<view class="shop_label" v-if="item.tagsData">
+								<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 							</view>
 							<view class="item-view-bottom">
 								<view class="item-view-xiangmu">
@@ -52,8 +52,8 @@
 							<view class="item-view-jianjie">
 								{{item.consortiaContent}}
 							</view>
-							<view class="shop_label" v-if="tagsData">
-								<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+							<view class="shop_label" v-if="item.tagsData">
+								<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
 							</view>
 							<view class="item-view-bottom">
 								
@@ -150,9 +150,8 @@
 								if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
 								this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
 								for(var i=0;i<this.dataList.length;i++){
-									this.tagsData=this.dataList[i].labels.split(',');
+									this.dataList[i].tagsData=this.dataList[i].labels.split(',');
 								}
-								console.log("tagsData",this.tagsData)
 								uni.stopPullDownRefresh()
 							}
 						}
@@ -244,16 +243,16 @@
 	.item-view-bottom-qian span:nth-child(1){
 		 font-weight: 400;
 		 font-size: 25rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(2){
 		 font-weight: bold;
 		 font-size: 36.81rpx;
-		  color: #F95900;
+		  color: #FF1200;
 	}
 	.item-view-bottom-qian span:nth-child(3){
 		 font-size: 25rpx;
-		 color: #F95900;
+		 color: #FF1200;
 	}
 	.item-view-bottom{
 		width: 100%;
@@ -518,7 +517,7 @@
 		margin-top: 10rpx;
 	}
 	.shop_label span{
-		background: #f3f3f3;
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
 		border-radius: 8rpx;
@@ -526,6 +525,7 @@
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.shop-arrow{
 		display: inline-block;