From 4f6f6abaf557c26db425718a0d407fe9271525c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 26 Jul 2024 14:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/cika.vue               |  66 +++---
 pages/my/fuwuliaocheng.vue      |  58 +++---
 pages/my/fuwuxiangm.vue         |   1 -
 pages/my/index.vue              |  70 +++----
 pages/my/indextaociliaoList.vue | 236 ++++++++++-----------
 pages/my/miaoShaOderDrtail.vue  |  37 ++--
 pages/my/newTeaml.vue           |  49 +++--
 pages/my/newseckill.vue         |  28 ++-
 pages/my/orderDetailsList.vue   | 351 +++++++++++++++++++-------------
 pages/my/pinTuanOderDrtail.vue  |  36 ++--
 pages/my/serviceOderDrtail.vue  |  64 +++---
 pages/my/servicePackage.vue     |  93 +++++----
 pages/order/index.vue           |   1 -
 13 files changed, 606 insertions(+), 484 deletions(-)

diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index 320fa4d..fb9eb22 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -23,21 +23,21 @@
 					<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无法显示 -->
 			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
-			<template #refresher="{refresherStatus}" >
+<!--			<template #refresher="{refresherStatus}" >-->
 				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
-				<custom-refresher :status="refresherStatus" />
-			</template>
+<!--				<custom-refresher :status="refresherStatus" />-->
+<!--			</template>-->
 			<!-- 自定义没有更多数据view -->
 			<template #loadingMoreNoMore >
 				<!-- 此处的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>
@@ -73,10 +73,10 @@
 							查看
 						</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</z-paging>
-		
+
 	</view>
 </template>
 
@@ -100,12 +100,11 @@
 		},
 		onLoad(){
 			this.myId = uni.getStorageSync('userId')
-			this.getData()
+			// this.getData()
 		},
 		methods: {
 			input(res) {//搜索 输入框
 				this.searchValue=res;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -113,21 +112,22 @@
 				}
 			},
 			getData(){
-				let data = {
-						  userId: this.myId,
-						  type: this.typeData,
-						  page: this.page,
-						  limit:  this.limit,
-						  title:this.searchValue,
-						}
-				this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-					if (res.code == 0) {
-						this.dataList=res.data.records;
-						for(var i=0;i<this.dataList.length;i++){
-							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
-						}
-					}
-				})
+				// let data = {
+				// 		  userId: this.myId,
+				// 		  type: this.typeData,
+				// 		  page: this.page,
+				// 		  limit:  this.limit,
+				// 		  title:this.searchValue,
+				// 		}
+				// this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
+				// 	if (res.code == 0) {
+				// 		this.dataList=res.data.records;
+				// 		for(var i=0;i<this.dataList.length;i++){
+				// 			this.dataList[i].tagsData=this.dataList[i].labels.split(',');
+				// 		}
+				// 	}
+				// })
+        this.$refs.paging.reload(true);
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -145,10 +145,13 @@
 					page: pageNo,
 					limit: pageSize,
 					type: this.typeData,
-					title:''
+					title:this.searchValue,
 				}
 				this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
 					// 将请求的结果数组传递给z-paging
+          for(var i=0;i<res.data.records.length;i++){
+            res.data.records[i].tagsData=res.data.records[i].labels.split(',');
+          }
 					this.$refs.paging.complete(res.data.records);
 				}).catch(res => {
 					// 如果请求失败写this.$refs.paging.complete(false);
@@ -157,12 +160,11 @@
 					this.$refs.paging.complete(false);
 				})
 			},
-			
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/my/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -310,7 +312,7 @@
 		position: relative;
 	}
 	.item-img img{
-		border-radius: 14rpx;	
+		border-radius: 14rpx;
 	}
 	.img-span{
 		padding: 2px 5px;
@@ -343,7 +345,7 @@
 		align-items: center;
 		padding:12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -351,7 +353,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -397,13 +399,13 @@
 	/deep/.uni-searchbar__cancel{
 		display: none;
 	}
-	
+
 /deep/.uni-searchbar__box-icon-search,.search-btn{
 		width: 110rpx;
 		height: 50rpx;
 		background: #18A689;
 		border-radius: 31rpx;
-		
+
 	}
 	/deep/.uni-searchbar__box{
 		height: 30px;
diff --git a/pages/my/fuwuliaocheng.vue b/pages/my/fuwuliaocheng.vue
index b03db15..8641e2d 100644
--- a/pages/my/fuwuliaocheng.vue
+++ b/pages/my/fuwuliaocheng.vue
@@ -23,21 +23,21 @@
 					<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无法显示 -->
 			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
-			<template #refresher="{refresherStatus}">
+<!--			<template #refresher="{refresherStatus}">-->
 				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
-				<custom-refresher :status="refresherStatus" />
-			</template>
+<!--				<custom-refresher :status="refresherStatus" />-->
+<!--			</template>-->
 			<!-- 自定义没有更多数据view -->
 			<template #loadingMoreNoMore>
 				<!-- 此处的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>
@@ -72,10 +72,10 @@
 							查看
 						</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</z-paging>
-		
+
 	</view>
 </template>
 
@@ -112,21 +112,22 @@
 				}
 			},
 			getData(){
-				let data = {
-						  userId: this.myId,
-						  type: this.typeData,
-						  page: this.page,
-						  limit:  this.limit,
-						  title:this.searchValue,
-						}
-				this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-					if (res.code == 0) {
-						this.dataList=res.data.records;
-						for(var i=0;i<this.dataList.length;i++){
-							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
-						}
-					}
-				})
+				// let data = {
+				// 		  userId: this.myId,
+				// 		  type: this.typeData,
+				// 		  page: this.page,
+				// 		  limit:  this.limit,
+				// 		  title:this.searchValue,
+				// 		}
+				// this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
+				// 	if (res.code == 0) {
+				// 		this.dataList=res.data.records;
+				// 		for(var i=0;i<this.dataList.length;i++){
+				// 			this.dataList[i].tagsData=this.dataList[i].labels.split(',');
+				// 		}
+				// 	}
+				// })
+        this.$refs.paging.reload(true);
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -144,10 +145,13 @@
 					page: pageNo,
 					limit: pageSize,
 					type: this.typeData,
-					title:''
+					title:this.searchValue,
 				}
 				this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
 					// 将请求的结果数组传递给z-paging
+          for(var i=0;i<res.data.records.length;i++){
+            res.data.records[i].tagsData=res.data.records[i].labels.split(',');
+          }
 					this.$refs.paging.complete(res.data.records);
 				}).catch(res => {
 					// 如果请求失败写this.$refs.paging.complete(false);
@@ -156,12 +160,12 @@
 					this.$refs.paging.complete(false);
 				})
 			},
-			
+
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/my/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -338,7 +342,7 @@
 		align-items: center;
 		padding: 12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -346,7 +350,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index bd26bbe..a75232b 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -121,7 +121,6 @@
 			},
 			input(res) {//搜索 输入框
 				this.searchValue=res;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 8208fd7..4428d9b 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -15,7 +15,7 @@
 							<image v-if="vipNameType=='2'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership7.gif"></image>
 							<span>{{vipNameType=='0'?'':vipNameType=='1'?'':''}}</span>
 						</view>
-						
+
 					</view>
 					<view class="my-head-texa">
 						<span>{{phone}}</span>
@@ -38,9 +38,9 @@
 						<view>钱包金额(元)</view>
 						<view class="my-head-mian-top-yuE">{{money}}</view>
 					</view>
-					
+
 				</view>
-				
+
 				<view class="my-head-mian-top-view">
 					<view class="my-head-mian-top-view-chong" @click="chonghi('充值')">充值</view>
 					<!--<view class="my-head-mian-top-view-ming" @click="chonghi('明细')">明细</view>-->
@@ -106,11 +106,11 @@
 				</view>
 				<view class="my-serve-list" @click="tuangou()">
 					<image src="../../static/my-liaocheng2.png" mode=""></image>
-					<span class="my-serve-list-text">新人拼团</span>
+					<span class="my-serve-list-text">拼团</span>
 				</view>
 				<view class="my-serve-list" @click="miaoshao()">
 					<image src="../../static/my-liaocheng3.png" mode=""></image>
-					<span class="my-serve-list-text">秒杀</span>
+					<span class="my-serve-list-text">限时秒杀</span>
 				</view>
 			</view>
 		</view>
@@ -133,7 +133,7 @@
 					<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>
@@ -146,7 +146,7 @@
 						<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>
@@ -162,14 +162,14 @@
 						查看
 					</view>
 				</view>
-			</view>	
+			</view>
 		</view>
 		<view class="prompt-text">-当你累了 想起盛安到家-</view>
 		<view class="kefu" @click="goMsg">
 			<image src="../../static/kefu.png" mode=""></image>
 		</view>
 	</view>
-	
+
 </template>
 
 <script>
@@ -230,11 +230,11 @@
 			if (this.userId) {
 				this.isLogin = false
 				this.getUserInfo()
-		
+
 				this.getAmount()
 				this.getIsVip()
-				
-				
+
+
 			} else {
 				this.isShop = 0;
 				this.isAgency = 0;
@@ -247,7 +247,7 @@
 				this.avatar = '../../static/logo.png'
 				this.isVip = 0
 			}
-		
+
 		},
 		methods:{
 			goMsg() {//客服聊天
@@ -289,7 +289,7 @@
 				})
 			},
 			goChat() {
-				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 
+				let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信
 				let kefuPhone = this.$queue.getData('kefuPhone');
 				if (kefu == 1) {
 					uni.makePhoneCall({
@@ -373,7 +373,7 @@
 								that.isVip = 0
 								that.avatar = '../../static/logo.png'
 								that.userId = uni.getStorageSync('userId')
-			
+
 							} else if (res.cancel) {
 								console.log('用户点击取消');
 							}
@@ -395,8 +395,8 @@
 						}
 					})
 				}
-			
-			
+
+
 			},
 			//成为按摩师  跳转商户端
 			bindFb() {
@@ -492,11 +492,11 @@
 						this.avatar = res.data.avatar ? res.data.avatar : '../../static/logo.png'
 						this.isAuthentication = res.data.isAuthentication
 						this.isAgency = res.data.isAgency ? res.data.isAgency : 0; //是否是推广员 1是 2否
-			
-			
+
+
 						this.money = res.data.money
 						this.couponnum = res.data.member
-			
+
 						// uni.setStorageSync('isAuthentication', res.data.isAuthentication)
 						this.isShop = res.data.isShop ? res.data.isShop : 0;
 						uni.setStorageSync('avatar', res.data.avatar)
@@ -504,7 +504,7 @@
 						uni.setStorageSync('invitationCode', res.data.invitationCode)
 						uni.setStorageSync('zhiFuBao', res.data.zhiFuBao)
 						uni.setStorageSync('zhiFuBaoName', res.data.zhiFuBaoName)
-			
+
 						if (res.data.isAuthentication == 0 || res.data.isAuthentication == null) {
 							this.renzheng = 0
 							uni.setStorageSync("renzheng", this.renzheng)
@@ -527,10 +527,10 @@
 							this.renzheng = 6
 							uni.setStorageSync("renzheng", this.renzheng)
 						}
-			
+
 					}
 				});
-			
+
 				// #ifdef APP-PLUS
 				let clientid = plus.push.getClientInfo().clientid;
 				let sysPhone = 1;
@@ -547,7 +547,7 @@
 				}
 				//#endif
 			},
-			
+
 			getIsVip() {
 				this.$Request.get("/app/UserVip/selectUserVip").then(res => {
 					if (res.code == 0) {
@@ -584,9 +584,9 @@
 						}
 					})
 				}
-			
-				
-				
+
+
+
 			},
 			youhui(link){//优惠劵，券码兑换，积分兑换 跳页
 				if (this.userId) {
@@ -783,7 +783,7 @@
 			align-items: center;
 			padding: 0px 10px;
 		}
-		
+
 		.item-detail {
 			padding: 5rpx 15rpx;
 			border-radius: 10rpx;
@@ -791,7 +791,7 @@
 			color: white;
 			background-color: #007AFF;
 		}
-		
+
 		.item-line {
 			position: absolute;
 			bottom: 0rpx;
@@ -856,7 +856,7 @@
 		padding: 1px 2px;
 		border-radius: 6rpx;
 	}
-	
+
 	.prompt-text{
 		font-size: 21rpx;
 		color: #999999;
@@ -920,7 +920,7 @@
 		margin-top: 5px;
 		font-size: 26rpx;
 	}
-	
+
 	.my-serve-title,.my-use-title{
 		width: 95%;
 		font-weight: bold;
@@ -962,7 +962,7 @@
 	}
 	.my-head-mian-bottom-list-text{
 		font-size: 26rpx;
-		color: #6C6C6C;		
+		color: #6C6C6C;
 	}
 	.my-head-mian-bottom-list{
 		display: flex;
@@ -976,7 +976,7 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		padding-bottom: 30rpx;	
+		padding-bottom: 30rpx;
 		margin-top:30rpx;
 		border-top: 1px #F6F6F6 solid;
 		padding-top: 20rpx;
@@ -1139,7 +1139,7 @@
 		position: relative;
 	}
 	.div-with-background {
-	 
+
 	  width: 300px; /* 你的容器宽度 */
 	  height: 200px; /* 你的容器高度 */
 	}
@@ -1164,4 +1164,4 @@
 		color: #fff;
 		text-align: center;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 67613fa..e5830ec 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -1,71 +1,65 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-view">
-		<view class="tab-view">
-			<view class="service-head-top">
-				<view class="service-head-top-left">
-					<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
-					<span>{{typeData=='104'?'服务套餐':typeData=='105'?'项目次卡':'服务疗程'}}</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">
-						<image style="width:30rpx; height:30rpx; margin-right: 10rpx;" src="../../static/search.png"></image>
-						搜索
-					</view>
-				</view>
-			</view>
-			<view class="fenlei">
-				<z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
-			</view>
-		</view>
-		<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" style="padding-bottom: 100px;">
-			<template slot="content">
-				<view style="height: 10rpx;"></view>
-				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-					
-					<image :src="item.packageImg" mode="aspectFill"  class="item-img"></image>
-					<view class="item-view">
-						<view class="view-cata">
-							<view class="item-view-title">{{item.title}}</view>
-							<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
-						</view>
-						<view class="item-view-bottom-qian">
-							<span>￥</span>
-							<span>{{item.price}}</span>
-							<span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>	{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
-							<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!=''">
-							<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>
-			</template> 
-		</t-refresh>
-		<empty v-if="dataList.length==0"></empty>
+    <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>{{typeData=='104'?'服务套餐':typeData=='105'?'项目次卡':'服务疗程'}}</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">
+              <image style="width:30rpx; height:30rpx; margin-right: 10rpx;" src="../../static/search.png"></image>
+              搜索
+            </view>
+          </view>
+        </view>
+        <view class="fenlei">
+          <z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
+        </view>
+      </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="view-cata">
+            <view class="item-view-title">{{item.title}}</view>
+            <!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
+          </view>
+          <view class="item-view-bottom-qian">
+            <span>￥</span>
+            <span>{{item.price}}</span>
+            <span>/ <text v-if="item.type!='104'">{{item.serviceCount}}</text>	{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
+            <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!=''">
+            <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,
@@ -88,16 +82,16 @@
 			this.typeData=e.type
 			this.getName=e.name;
 			this.myId = uni.getStorageSync('userId')
-			this.getData();
+			// this.getData();
 			uni.setNavigationBarTitle({
 			   title: this.typeData=='104'?'服务套餐':this.typeData=='105'?'项目次卡':'服务疗程',
 			 })
 			this.tabNav()
 		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.getData()
-		},
+		// onPullDownRefresh: function() {
+		// 	this.page = 1;
+		// 	this.getData()
+		// },
 		methods: {
 			tabNav(){
 				let data = {
@@ -113,30 +107,21 @@
 					}
 				})
 			},
-			changeClick(index,item){
-				this.classifyId=item.id
-				this.searchValue=''
-				this.page = 1;
-				this.dataList = []
-				this.getData()
-			},
 			// 加载更多
-			loadMore: async function() {
-				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
-				if(this.loadingType==0){
-					this.loadingType=2
-					//模拟数据请求
-					setTimeout(()=>{
-						this.page++;
-						this.loadingType=0;
-						this.getData()
-					},1000)
-				}
-			},
-			
+			// 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)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -145,32 +130,57 @@
 				}
 			},
 			getData(){
-				var that=this;
-					that.$Request.get("/app/massage/package/findPage", {
-						type:that.typeData,
-						page:that.page,
-						limit:that.limit,
-						title:that.searchValue,
-						classifyId:that.classifyId
-					}).then(res => {
-						if (res.code == 0) {
-							if (res.data) {
-								if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
-								this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
-								for(var i=0;i<this.dataList.length;i++){
-									var tagsData=this.dataList[i].labels.split(',');
-									this.dataList[i].tagsData = tagsData;
-								}
-								uni.stopPullDownRefresh()
-							}
-						}
-					});
+				// var that=this;
+				// 	that.$Request.get("/app/massage/package/findPage", {
+				// 		type:that.typeData,
+				// 		page:that.page,
+				// 		limit:that.limit,
+				// 		title:that.searchValue,
+				// 		classifyId:that.classifyId
+				// 	}).then(res => {
+				// 		if (res.code == 0) {
+				// 			if (res.data) {
+				// 				if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+				// 				this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+				// 				for(var i=0;i<this.dataList.length;i++){
+				// 					var tagsData=this.dataList[i].labels.split(',');
+				// 					this.dataList[i].tagsData = tagsData;
+				// 				}
+				// 				uni.stopPullDownRefresh()
+				// 			}
+				// 		}
+				// 	});
+        this.$refs.paging.reload(true);
 			},
+      queryList(pageNo, pageSize) {
+        const params = {
+          page: pageNo,
+          limit: pageSize,
+          type:this.typeData,
+          title:this.searchValue,
+          classifyId:this.classifyId
+        }
+        this.$Request.get('/app/massage/package/findPage',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);
+        })
+      },
+      changeClick(index,item){
+        this.classifyId=item.id
+        this.searchValue=''
+        this.page = 1;
+        this.dataList = []
+        this.getData()
+      },
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/index/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -188,8 +198,6 @@
 						url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
 					})
 				}
-				
-				
 			}
 		}
 	}
@@ -362,7 +370,7 @@
 		position: relative;
 	}
 	.item-img img{
-		border-radius: 14rpx;	
+		border-radius: 14rpx;
 	}
 	.img-span{
 		padding: 2px 5px;
@@ -394,7 +402,7 @@
 		align-items: center;
 		padding:20rpx;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -402,7 +410,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -419,7 +427,7 @@
 		width: 95%;
 		margin: 0 auto;
 	}
-	
+
 	.index-fenl-title{
 		width: 81rpx;
 		text-align: center;
diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue
index 3a6f48a..894ac4f 100644
--- a/pages/my/miaoShaOderDrtail.vue
+++ b/pages/my/miaoShaOderDrtail.vue
@@ -9,7 +9,7 @@
 				<view class="header-bottom-top">
 					<view class="header-bottom-title">
 						<view class="header-bottom-title-text">
-							{{mainData.title}} 
+							{{mainData.title}}
 						</view>
 						<view class="header-bottom-title-num">
 							<span>{{mainData.sales}}</span>
@@ -88,13 +88,13 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="detail-foot-title">
-						服务项目{{index+1}}
+						服务项目
 					</view>
 				</view>
 				<view style="height: 70rpx;"></view>
-				
+
 			</view>
 		</view>
 		<view class="push-button">
@@ -165,7 +165,7 @@
 			that.getData();
 			that.isVip=this.$queue.getData('isVIP');
 		},
-		
+
 		methods:{
 			goNav(e) {
 				uni.navigateTo({
@@ -173,7 +173,7 @@
 				})
 			},
 			openpay(item) {
-				
+
 				uni.navigateTo({
 					url:'/my/order/payModifyTc?ordersId='+item.id
 				})
@@ -200,7 +200,7 @@
 							'&limit='+10
 					})
 				}
-				
+
 			},
 			getData(){
 				var that=this;
@@ -215,7 +215,7 @@
 							that.detailData=res.data.detailData;
 							that.backgroundImageUrl=that.mainData.packageImg;
 						}
-					})	
+					})
 			},
 		}
 	}
@@ -239,6 +239,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-around;
+
 	}
 	.detail-view-img{
 		width: 80px;
@@ -251,6 +252,8 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+    margin-top: 5px;
+    height: 100px;
 	}
 	/deep/uni-checkbox .uni-checkbox-input{
 		width: 26px;
@@ -350,7 +353,7 @@
 		/* #ifndef MP-WEIXIN */
 		/* height: 130px; */
 		/* #endif */
-	
+
 	}
 	.pay_btn {
 		width: 90%;
@@ -402,7 +405,7 @@
 		width: 34.03rpx;
 		height: 32.64rpx;
 	}
-	
+
 	.shouc{
 		display: flex;
 		align-items: center;
@@ -466,7 +469,7 @@
 		align-items: center;
 		padding: 15px 0px;
 	}
-	
+
 	.tese span:nth-child(1){
 		font-weight: bold;
 		font-size: 24rpx;
@@ -506,7 +509,7 @@
 		font-size: 30rpx;
 		color: #029d88;
 	}
-	
+
 	.detail-foot-mian{
 		width: 100%;
 		display: flex;
@@ -583,7 +586,7 @@
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center; 
+		align-items: center;
 		margin-top: 8rpx;
 	}
 	.header-bottom-money-jia{
@@ -594,7 +597,7 @@
 		margin-left: 5px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 26rpx;
@@ -611,7 +614,7 @@
 		flex-direction: row;
 		align-items: baseline;
 	}
-	
+
 	.header-bottom-money-view{
 		width: 100%;
 		display: flex;
@@ -660,7 +663,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	
+
 	.header{
 		width: 100%;
 		display: flex;
@@ -687,4 +690,4 @@
 		    justify-content: fex-end;
 			background: #eefffa;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/newTeaml.vue b/pages/my/newTeaml.vue
index a1b4e71..5427733 100644
--- a/pages/my/newTeaml.vue
+++ b/pages/my/newTeaml.vue
@@ -23,21 +23,21 @@
 					<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无法显示 -->
 			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
-			<template #refresher="{refresherStatus}" >
+<!--			<template #refresher="{refresherStatus}" >-->
 				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
-				<custom-refresher :status="refresherStatus" />
-			</template>
+<!--				<custom-refresher :status="refresherStatus" />-->
+<!--			</template>-->
 			<!-- 自定义没有更多数据view -->
 			<template #loadingMoreNoMore >
 				<!-- 此处的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>
@@ -49,7 +49,7 @@
 				</view>
 				<view class="item-view" v-if="text=='index'">
 					<view class="view-cata">
-						<view class="item-view-title">{{item.title}}</view>
+						<view class="item-view-title">{{item.title}}1111</view>
 					</view>
 					<view class="shop_label" v-if="item.tagsData!=''">
 						<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
@@ -70,7 +70,7 @@
 							<span class="seckill-text">去拼团</span>
 						</view>
 					</view>
-				</view>	
+				</view>
 				<view class="item-view" v-else>
 					<view class="view-cata">
 						<view class="item-view-title">{{item.title}}</view>
@@ -83,9 +83,12 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}</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}} <!-- | 好评{{item.esteemRate}}% --></span>
@@ -94,10 +97,10 @@
 							查看
 						</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</z-paging>
-		
+
 	</view>
 </template>
 
@@ -161,7 +164,7 @@
 				// 				}
 				// 			})
 				// 		}
-				this.$refs.paging.reload(true);	
+				this.$refs.paging.reload(true);
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -184,22 +187,24 @@
 				if(this.text=='index'){//首页进来的秒杀列表接口
 					this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => {
 						for(var i=0;i<res.data.list.length;i++){
-							var tagsData=res.data.list[i].labels.split(',');
-							res.data.list[i].tagsData = tagsData;
+              res.data.list[i].tagsData=res.data.list[i].labels.split(',');
 						}
-						this.$refs.paging.complete(res.data.list);	
+						this.$refs.paging.complete(res.data.list);
 					}).catch(res => {
 						this.$refs.paging.complete(false);
 					})
 				}else{
 					this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
+            for(var i=0;i<res.data.records.length;i++){
+              res.data.records[i].tagsData=res.data.records[i].labels.split(',');
+            }
 						this.$refs.paging.complete(res.data.records);
 					}).catch(res => {
 						this.$refs.paging.complete(false);
 					})
 				}
 			},
-			
+
 			backImg(){//返回上一页
 				if(this.text=='my'){
 					uni.reLaunch({
@@ -210,7 +215,7 @@
 						url:'/pages/index/index'
 					})
 				}
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -271,7 +276,7 @@
 	.pace-text span:nth-child(2){
 		color: #666;
 		}
-	
+
 	.pace{
 		width: 60%;
 		height: 30rpx;
@@ -289,7 +294,7 @@
 	.seckill-money{
 		width: 74%;
 		background: #fff8f0;
-		border-radius: 10rpx 0 0 10rpx;	
+		border-radius: 10rpx 0 0 10rpx;
 		padding: 14rpx 20rpx;
 	}
 	.seckill-money span:nth-child(1){
@@ -361,7 +366,7 @@
 		 font-size: 36.81rpx;
 		  color: #FF1200;
 	}
-	
+
 	.item-view-bottom{
 		width: 100%;
 		display: flex;
@@ -468,7 +473,7 @@
 		align-items: center;
 		padding: 0px 10px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -476,7 +481,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -536,7 +541,7 @@
 		height: 50rpx;
 		background: #18A689;
 		border-radius: 31rpx;
-		
+
 	}
 	/deep/.uni-searchbar__box{
 		height: 30px;
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index 392d495..caefc9f 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -66,11 +66,10 @@
 						<!-- <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>
-						</view>
+          <view class="item-view-bottom" v-if="text=='index'">
+            <view class="item-view-xiangmu">
+              <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
+            </view>
 						<view class="item-view-bottom-btn" v-if="item.isStart=='true'">
 							开抢
 						</view>
@@ -78,6 +77,14 @@
 							开抢
 						</view>
 					</view>
+          <view class="item-view-bottom"  v-if="text=='my'">
+            <view class="item-view-xiangmu">
+              <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
+            </view>
+            <view class="item-view-bottom-btn">
+              预约
+            </view>
+          </view>
 				</view>
 			</view>
 		</z-paging>
@@ -182,6 +189,10 @@
 					})
 				}else{
 					this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
+					  console.log(res.data.records);
+            for(var i=0;i<res.data.records.length;i++){
+              res.data.records[i].tagsData=res.data.records[i].labels.split(',');
+            }
 						this.$refs.paging.complete(res.data.records);
 					}).catch(res => {
 						this.$refs.paging.complete(false);
@@ -384,12 +395,15 @@
 	}
 	.item-view-xiangmu span:nth-child(2){
 		font-weight: normal;
-		color: #666666;
+		color: #333333;
+    font-size: 30rpx;
+
 	}
 	.item-view-xiangmu span:nth-child(1){
 		font-weight: normal;
-		color: #999;
+		color: #666666;
 		margin-right: 5rpx;
+    font-size: 30rpx;
 	}
 	.shop_label{
 		display: flex;
diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue
index e9d793c..ac74ab7 100644
--- a/pages/my/orderDetailsList.vue
+++ b/pages/my/orderDetailsList.vue
@@ -1,99 +1,90 @@
 <!-- 自定义下拉刷新与上拉加载演示(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>{{previousPage.name}}</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>
-		<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)">
-					<view class="flex justify-between st-title">
-						<view class="flex align-center profile-img">
-							
-							<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
-							</image>
-							<view class="margin-left-xs ">{{item.artificerName}}</view>
-						</view>
-						<view class="text-green"><span>{{item.ordersNo}}</span></view>
-						<!-- <view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view>
-						<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view>
-						<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view>
-						<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view>
-						<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view>
-						<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view>
-						<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view>
-						<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view>
-						<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view> -->
-						
-						<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
-					</view>
-					<view class="margin-top-sm"></view>
-					<view class=" u-flex" v-if="item.ordersMassageList[0].userPackageDetail==null">
-						<view class="u-m-r-10">
-							<image :src="item.ordersMassageList[0].massageType.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
-						</view>
-						
-						<view class="u-flex-1" style="margin-left: 20rpx;">
-							<view class="text-bold u-line-1" style="width: 560rpx;">
-								<view class=" text-lg "
-									style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-									{{item.entryName}}
-								</view>
-							</view>
-							<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
-								预约时间：{{item.serveTime}}
-							</view>
-							<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
-								实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
-							</view>
-						</view>
-					</view>
-					<view class=" u-flex" v-else>
-						<view class="u-m-r-10">
-							<image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
-						</view>
-						<view class="u-flex-1" style="margin-left: 20rpx;">
-							<view class="text-bold u-line-1" style="width: 560rpx;">
-								<view class=" text-lg "
-									style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
-									{{item.entryName}}
-								</view>
-							</view>
-							<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;">
-								预约时间：{{item.serveTime}}
-							</view>
-							<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;">
-								实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				
-				
-			</template> 
-		</t-refresh>
-		<empty v-if="dataList.length==0"></empty>
-			
+    <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>{{previousPage.name}}</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 #loadingMoreNoMore>
+        <custom-nomore />
+      </template>
+      <view class="pay-margin bg ding-view" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" style="border-radius: 20rpx;padding: 36rpx;">
+        <view class="flex justify-between">
+          <view class="flex align-center profile-img">
+            <image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
+            </image>
+            <view class="margin-left-xs ">{{item.artificerName}}</view>
+          </view>
+          <view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
+          <view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
+          <view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
+          <view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
+          <view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
+          <view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
+          <view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
+          <view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
+          <view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
+          <view  v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
+        </view>
+        <view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
+        <view class="u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null">
+          <view class="u-m-r-10">
+            <image :src="item.ordersMassageList[0].massageType.massageImg" mode="square" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
+          </view>
+          <view class="u-flex-1" style="margin-left: 20rpx;">
+            <view class="text-bold u-line-1">
+              <view class="text-lg"
+                    style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                {{item.entryName}}
+              </view>
+            </view>
+            <view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
+              <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
+            </view>
+            <view class="flex-sub u-font-13">
+              <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
+            </view>
+          </view>
+        </view>
+        <view class="u-flex u-p-t-30" v-else>
+          <view class="u-m-r-10">
+            <image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="square" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
+          </view>
+          <view class="u-flex-1" style="margin-left: 20rpx;">
+            <view class="text-bold u-line-1">
+              <view class="text-lg"
+                    style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+                {{item.entryName}}
+              </view>
+            </view>
+            <view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
+              <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
+            </view>
+            <view class="flex-sub u-font-13">
+              <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
+            </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,
@@ -117,26 +108,26 @@
 			that.previousPage=e;
 			that.isVIP=this.$queue.getData('isVIP');
 			that.myId = uni.getStorageSync('userId');
-			that.getData()
-		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.getData();
+			// that.getData()
 		},
+		// onPullDownRefresh: function() {
+		// 	this.page = 1;
+		// 	this.getData();
+		// },
 		methods: {
 			// 加载更多
-			loadMore: async function() {
-				//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
-				if(this.loadingType==0){
-					this.loadingType=2
-					//模拟数据请求
-					setTimeout(()=>{
-						this.page++;
-						this.loadingType=0;
-						this.getData()
-					},1000)
-				}
-			},
+			// 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;
 			},
@@ -146,21 +137,35 @@
 				}
 			},
 			getData(){
-				this.$Request.get("/app/artificer/selectAppOrdersList", {
-					page:this.page,
-					limit:this.limit,
-					title:this.searchValue,
-					userPackageId:this.previousPage.id
-				}).then(res => {
-					if (res.code == 0) {
-						if (res.data) {
-							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
-							this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
-							uni.stopPullDownRefresh()
-						}
-					}
-				});
+				// this.$Request.get("/app/artificer/selectAppOrdersList", {
+				// 	page:this.page,
+				// 	limit:this.limit,
+				// 	title:this.searchValue,
+				// 	userPackageId:this.previousPage.id
+				// }).then(res => {
+				// 	if (res.code == 0) {
+				// 		if (res.data) {
+				// 			if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
+				// 			this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
+				// 			uni.stopPullDownRefresh()
+				// 		}
+				// 	}
+				// });
+        this.$refs.paging.reload(true);
 			},
+      queryList(pageNo, pageSize) {
+        const params = {
+          page: pageNo,
+          limit: pageSize,
+          userPackageId:this.previousPage.id,
+          title:this.searchValue
+        }
+        this.$Request.get('/app/artificer/selectAppOrdersList',params).then(res => {
+          this.$refs.paging.complete(res.data.list);
+        }).catch(res => {
+          this.$refs.paging.complete(false);
+        })
+      },
 			backImg(){//返回上一页
 				if(this.previousPage.name=='次卡'){
 					uni.reLaunch({
@@ -171,8 +176,7 @@
 						url:'/pages/my/fuwuliaochengDetail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
 					})
 				}
-				
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -180,13 +184,22 @@
 				// uni.navigateTo({
 				// 	url:'/my/order/payCLDetail?ordersId='+item.ordersId
 				// })
-				
+
 			}
 		}
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+  .pay-margin{
+    margin: 20rpx 20rpx;
+  }
+  .bg {
+    background-color: #FFFFFF;
+  }
+  .profile-img{
+    margin-top: -20rpx;
+  }
 	.st-title{
 		padding-top:20rpx;
 	}
@@ -197,21 +210,19 @@
 		align-items: center;
 	}
 	/deep/.justify-between{
-		align-items: center;
+    height: 54rpx;
 	}
 	.ding-view{
 		position: relative;
 	}
 	.text-green span:nth-child(1){
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #7D7D7D;
+		font-size: 30rpx;
+		color: #333333;
 		margin-right: 10px;
 	}
 	.text-green span:nth-child(2){
-		font-weight: 400;
-		font-size: 25rpx;
-		color: #7D7D7D;
+		font-size: 30rpx;
+		color: #333333;
 		margin-right: 10px;
 	}
 	.header-bottom-title-liao{
@@ -377,13 +388,13 @@
 		width: 95%;
 		display: flex;
 		flex-direction: column;
-		height: 140px;
+		height: 200px;
 		background: #FFFFFF;
-		border-radius: 21rpx;
+		border-radius: 20rpx;
 		padding: 0px 12px;
 		margin: 20rpx auto 0px auto;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -391,7 +402,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -405,7 +416,7 @@
 		width:100%;
 	}
 	/deep/.zp-paging-container-content{
-		width: 95%;
+		width: 100%;
 		margin: 0 auto;
 	}
 	.fenlei{
@@ -500,5 +511,73 @@
 		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;
 	}
-	
+  .head-title{
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #333333;
+  }
+  .title-font{
+    font-size: 30rpx;
+    color: #666666;
+  }
+  .value-font{
+    font-size: 30rpx;
+    color: #333333;
+  }
+  .margin-left-xs{
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #111111;
+  }
+  /deep/.margin-top-sm{
+    margin-top: 3px;
+  }
+  .status-button{
+    font-weight: bold;
+    color: #019c88;
+    font-size: 31rpx;
+  }
+  .status-button-a{
+    font-weight: bold;
+    color: #ff932a;
+  }
+  .status-button-b{
+    font-weight: bold;
+    color: #7446fc;
+  }
+  .status-button-d{
+    font-weight: bold;
+    color: #888888;
+  }
+  .status-button-e{
+    font-weight: bold;
+    color: #999999;
+  }
+  .status-button-f{
+    font-weight: bold;
+    color: #019c88;
+  }
+  .status-button-g{
+    font-weight: bold;
+    color: #e04f3c;
+  }
+  .status-button-h{
+    font-weight: bold;
+    color: #965fb9;
+  }
+  .status-button-i{
+    font-weight: bold;
+    color: #002ea4;
+  }
+  .status-button-g{
+    font-weight: bold;
+    color: #43b943;
+  }
+  .status-button-h{
+    font-weight: bold;
+    color: #1bcada;
+  }
+  .status-num{
+    margin-right: 15rpx;
+  }
 </style>
diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue
index f3d6568..4678395 100644
--- a/pages/my/pinTuanOderDrtail.vue
+++ b/pages/my/pinTuanOderDrtail.vue
@@ -9,7 +9,7 @@
 				<view class="header-bottom-top">
 					<view class="header-bottom-title">
 						<view class="header-bottom-title-text">
-							{{mainData.title}} 
+							{{mainData.title}}
 						</view>
 						<view class="header-bottom-title-num">
 							<span>{{mainData.sales}}</span>
@@ -88,13 +88,13 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="detail-foot-title">
-						服务项目{{index+1}}
+						服务项目
 					</view>
 				</view>
 				<view style="height: 70rpx;"></view>
-				
+
 			</view>
 		</view>
 		<view class="push-button">
@@ -165,7 +165,7 @@
 			that.getData();
 			that.isVip=this.$queue.getData('isVIP');
 		},
-		
+
 		methods:{
 			goNav(e) {
 				uni.navigateTo({
@@ -173,7 +173,7 @@
 				})
 			},
 			openpay(item) {
-				
+
 				uni.navigateTo({
 					url:'/my/order/payModifyTc?ordersId='+item.id
 				})
@@ -200,7 +200,7 @@
 							'&limit='+10
 					})
 				}
-				
+
 			},
 			getData(){
 				var that=this;
@@ -215,7 +215,7 @@
 							that.detailData=res.data.detailData;
 							that.backgroundImageUrl=that.mainData.packageImg;
 						}
-					})	
+					})
 			},
 		}
 	}
@@ -251,6 +251,8 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+    margin-top: 5px;
+    height: 100px;
 	}
 	/deep/uni-checkbox .uni-checkbox-input{
 		width: 26px;
@@ -350,7 +352,7 @@
 		/* #ifndef MP-WEIXIN */
 		/* height: 130px; */
 		/* #endif */
-	
+
 	}
 	.pay_btn {
 		width: 90%;
@@ -402,7 +404,7 @@
 		width: 34.03rpx;
 		height: 32.64rpx;
 	}
-	
+
 	.shouc{
 		display: flex;
 		align-items: center;
@@ -466,7 +468,7 @@
 		align-items: center;
 		padding: 15px 0px;
 	}
-	
+
 	.tese span:nth-child(1){
 		font-weight: bold;
 		font-size: 24rpx;
@@ -506,7 +508,7 @@
 		font-size: 30rpx;
 		color: #029d88;
 	}
-	
+
 	.detail-foot-mian{
 		width: 100%;
 		display: flex;
@@ -583,7 +585,7 @@
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center; 
+		align-items: center;
 		margin-top: 8rpx;
 	}
 	.header-bottom-money-jia{
@@ -594,7 +596,7 @@
 		margin-left: 5px;
 	}
 	.header-bottom-money-zhen span{
-		color: #F95900;
+		color: #FF1200;
 	}
 	.header-bottom-money-zhen span:nth-child(1){
 		font-size: 26rpx;
@@ -611,7 +613,7 @@
 		flex-direction: row;
 		align-items: baseline;
 	}
-	
+
 	.header-bottom-money-view{
 		width: 100%;
 		display: flex;
@@ -660,7 +662,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	
+
 	.header{
 		width: 100%;
 		display: flex;
@@ -687,4 +689,4 @@
 		    justify-content: fex-end;
 			background: #eefffa;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 1929c86..3200ca1 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -9,7 +9,7 @@
 				<view class="header-bottom-top">
 					<view class="header-bottom-title">
 						<view class="header-bottom-title-text">
-							{{mainData.title}} 
+							{{mainData.title}}
 						</view>
 						<view class="header-bottom-title-num">
 							<span>{{mainData.sales}}</span>
@@ -89,13 +89,13 @@
 							</view>
 						</view>
 					</view>
-					
+
 					<view class="detail-foot-title">
 						服务项目{{index+1}}
 					</view>
 				</view>
 				<view style="height: 70rpx;"></view>
-				
+
 			</view>
 		</view>
 		<view class="push-button">
@@ -185,7 +185,7 @@
 				}],
 				this.openWay = 2;
 			// #endif
-		
+
 			// #ifdef MP-WEIXIN
 			this.openLists = [{
 					image: '../../static/images/icon_weixin.png',
@@ -221,7 +221,7 @@
 					} else {
 						that.$queue.showToast(res.msg)
 					}
-							
+
 				});
 			},
 			goOrder() {//生成orderId
@@ -250,7 +250,7 @@
 					} else {
 						that.$queue.showToast(res.msg)
 					}
-			
+
 				});
 			},
 			openpay(item) {
@@ -268,7 +268,7 @@
 			selectWay: function(item) {
 				this.openWay = item.id;
 			},
-			
+
 			payJZ() {
 				let that = this;
 				if (that.openWay == 1) { //零钱支付
@@ -325,7 +325,7 @@
 									})
 									that.getData()
 									// this.$queue.showToast('支付成功');
-			
+
 									// uni.switchTab({
 									// 	url: '/pages/my/index'
 									// })
@@ -341,7 +341,7 @@
 						}
 					});
 					// #endif
-			
+
 					// #ifdef H5
 					let ua = navigator.userAgent.toLowerCase();
 					if (ua.indexOf('micromessenger') != -1) {
@@ -383,9 +383,9 @@
 							}
 						});
 					}
-			
+
 					// #endif
-			
+
 					// #ifdef APP
 					let data = {
 						ordersId: that.order.ordersId,
@@ -415,7 +415,7 @@
 							that.getData()
 						});
 					// #endif
-			
+
 					// #ifdef APP-PLUS
 					let data = {
 						ordersId: that.tordersId,
@@ -429,7 +429,7 @@
 						});
 					// #endif
 				}
-			
+
 			},
 			// 支付订单
 			pay() {
@@ -468,7 +468,7 @@
 								console.log('用户点击取消');
 							}
 						}
-			
+
 					})
 				} else if (that.openWay == 2) { //微信支付
 					that.$queue.showLoading('支付中...')
@@ -496,7 +496,7 @@
 									})
 									that.getData()
 									// this.$queue.showToast('支付成功');
-			
+
 									// uni.switchTab({
 									// 	url: '/pages/my/index'
 									// })
@@ -512,7 +512,7 @@
 						}
 					});
 					// #endif
-			
+
 					// #ifdef H5
 					let ua = navigator.userAgent.toLowerCase();
 					if (ua.indexOf('micromessenger') != -1) {
@@ -560,9 +560,9 @@
 							}
 						});
 					}
-			
+
 					// #endif
-			
+
 					// #ifdef APP
 					let data = {
 						ordersId: that.order.ordersId,
@@ -593,7 +593,7 @@
 							that.getData()
 						});
 					// #endif
-			
+
 					// #ifdef APP-PLUS
 					let data = {
 						ordersId: that.order.ordersId,
@@ -629,8 +629,8 @@
 							'&name='+this.nameText
 					})
 				}
-				
-				
+
+
 			},
 			getData(){
 				var that=this;
@@ -647,7 +647,7 @@
 							that.backgroundImageUrl=that.mainData.packageImg;
 							that.nameText="my"
 						}
-					})	
+					})
 				}else{//从首页 推荐进入 请求的接口
 					let data = {
 							  mainId: that.serviData.id,
@@ -663,7 +663,7 @@
 						}
 					})
 				}
-				
+
 			},
 		}
 	}
@@ -699,6 +699,8 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
+    margin-top: 5px;
+    height: 100px;
 	}
 	/deep/uni-checkbox .uni-checkbox-input{
 		width: 26px;
@@ -798,7 +800,7 @@
 		/* #ifndef MP-WEIXIN */
 		/* height: 130px; */
 		/* #endif */
-	
+
 	}
 	.pay_btn {
 		width: 90%;
@@ -851,7 +853,7 @@
 		width: 34.03rpx;
 		height: 32.64rpx;
 	}
-	
+
 	.shouc{
 		display: flex;
 		align-items: center;
@@ -917,7 +919,7 @@
 		align-items: center;
 		padding: 15px 0px;
 	}
-	
+
 	.tese span:nth-child(1){
 		font-weight: bold;
 		font-size: 24rpx;
@@ -957,7 +959,7 @@
 		font-size: 30rpx;
 		color: #029d88;
 	}
-	
+
 	.detail-foot-mian{
 		width: 100%;
 		display: flex;
@@ -1038,7 +1040,7 @@
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		align-items: center; 
+		align-items: center;
 		margin-top: 8rpx;
 	}
 	.header-bottom-money-jia{
@@ -1066,7 +1068,7 @@
 		flex-direction: row;
 		align-items: baseline;
 	}
-	
+
 	.header-bottom-money-view{
 		width: 100%;
 		display: flex;
@@ -1115,7 +1117,7 @@
 		display: flex;
 		flex-direction: column;
 	}
-	
+
 	.header{
 		width: 100%;
 		display: flex;
@@ -1142,4 +1144,4 @@
 		    justify-content: fex-end;
 			background: #eefffa;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index f3200b7..727995c 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -23,21 +23,21 @@
 					<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无法显示 -->
 			<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
-			<template #refresher="{refresherStatus}">
+<!--			<template #refresher="{refresherStatus}">-->
 				<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
-				<custom-refresher :status="refresherStatus" />
-			</template>
+<!--				<custom-refresher :status="refresherStatus" />-->
+<!--			</template>-->
 			<!-- 自定义没有更多数据view -->
 			<template #loadingMoreNoMore>
 				<!-- 此处的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>
@@ -73,10 +73,10 @@
 							查看
 						</view>
 					</view>
-				</view>	
+				</view>
 			</view>
 		</z-paging>
-		
+
 	</view>
 </template>
 
@@ -100,7 +100,7 @@
 		},
 		onLoad(){
 			this.myId = uni.getStorageSync('userId')
-			this.getData()
+			// this.getData()
 		},
 		methods: {
 			input(res) {//搜索 输入框
@@ -112,21 +112,22 @@
 				}
 			},
 			getData(){
-				let data = {
-						  userId: this.myId,
-						  type: this.typeData,
-						  page: this.page,
-						  limit:  this.limit,
-						  title:this.searchValue,
-						}
-				this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
-					if (res.code == 0) {
-						this.dataList=res.data.records;
-						for(var i=0;i<this.dataList.length;i++){
-							this.dataList[i].tagsData=this.dataList[i].labels.split(',');
-						}
-					}
-				})
+				// let data = {
+				// 		  userId: this.myId,
+				// 		  type: this.typeData,
+				// 		  page: this.page,
+				// 		  limit:  this.limit,
+				// 		  title:this.searchValue,
+				// 		}
+				// this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
+				// 	if (res.code == 0) {
+				// 		this.dataList=res.data.records;
+				// 		for(var i=0;i<this.dataList.length;i++){
+				// 			this.dataList[i].tagsData=this.dataList[i].labels.split(',');
+				// 		}
+				// 	}
+				// })
+        this.$refs.paging.reload(true);
 			},
 			tabChange(index) {
 				this.tabIndex = index;
@@ -144,10 +145,13 @@
 					page: pageNo,
 					limit: pageSize,
 					type: this.typeData,
-					title:''
+					title:this.searchValue,
 				}
 				this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
 					// 将请求的结果数组传递给z-paging
+          for(var i=0;i<res.data.records.length;i++){
+            res.data.records[i].tagsData=res.data.records[i].labels.split(',');
+          }
 					this.$refs.paging.complete(res.data.records);
 				}).catch(res => {
 					// 如果请求失败写this.$refs.paging.complete(false);
@@ -156,12 +160,12 @@
 					this.$refs.paging.complete(false);
 				})
 			},
-			
+
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/my/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -169,28 +173,29 @@
 				uni.navigateTo({
 					url:'/pages/my/serviceOderDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my'
 				})
-				
+
 			}
 		}
 	}
 </script>
 
 <style scoped>
-	.shop_label{
-		display: flex;
-		flex-wrap: wrap;
-		margin-top: 10rpx;
-	}
-	.shop_label span{
-		background: #f3f3f3;
-		height: 34rpx;
-		line-height: 34rpx;
-		border-radius: 8rpx;
-		padding: 0 10rpx;
-		font-size: 22rpx;
-		margin-right: 8rpx;
-		margin-bottom: 8rpx;
-	}
+  .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;
+  }
 	.img-span{
 		padding: 2px 5px;
 		font-weight: 400;
@@ -337,7 +342,7 @@
 		align-items: center;
 		padding: 12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -345,7 +350,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 900da00..4dbe7a1 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -29,7 +29,6 @@
 				<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
 				<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
 				<view  v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
-
 				<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
 			</view>
 			<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>