From 56d5180a9567ac11aec3fe8add11f4f09dca41dd 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 10:45:31 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json            |   2 +-
 pages/my/fuwuGengduo.vue |   4 +-
 pages/my/fuwuxiangm.vue  | 217 +++++++++++++++++++++------------------
 pages/my/newseckill.vue  |   6 +-
 pages/shop/index.vue     |   4 +-
 5 files changed, 124 insertions(+), 109 deletions(-)

diff --git a/manifest.json b/manifest.json
index a21c9c4..d843a22 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "盛安到家",
-    "appid" : "__UNI__0A81F4F",
+    "appid" : "__UNI__807ED4C",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 101,
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 0cb8476..defa7d7 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -18,9 +18,9 @@
           </view>
         </view>
       </template>
-      <template #refresher="{refresherStatus}" >
+<!--      <template #refresher="{refresherStatus}" >
         <custom-refresher :status="refresherStatus" />
-      </template>
+      </template> -->
       <template #loadingMoreNoMore >
         <custom-nomore />
       </template>
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index d0ad60c..bd26bbe 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -1,74 +1,70 @@
 <!-- 自定义下拉刷新与上拉加载演示(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>服务项目</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>
-		</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="item-img">
-						<image :src="item.massageImg" mode=""></image>
-					</view>
-					<view class="item-view">
-						<view class="view-cata">
-							<span class="item-view-title">{{item.title}}</span>
-							<!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
-						</view>
-						<view class="item-view-xiangmu">
-							
-							<view class="item-view-bottom-qian">
-								<span>￥</span>
-								<span>{{item.price}}</span>
-								<span></span>
-								<span>￥</span>
-								<span>{{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" 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>
-							</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>服务项目</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>
+      </template>
+      <template #loadingMoreNoMore >
+        <custom-nomore />
+      </template>
+      <view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+        <view class="item-img">
+          <image :src="item.massageImg" mode=""></image>
+        </view>
+        <view class="item-view">
+          <view class="view-cata">
+            <span class="item-view-title">{{item.title}}</span>
+            <!-- <span class="xiaoer item-view-biao">{{item.classifyName}}</span> -->
+          </view>
+          <view class="item-view-xiangmu">
+
+            <view class="item-view-bottom-qian">
+              <span>￥</span>
+              <span>{{item.price}}</span>
+              <span></span>
+              <span>￥</span>
+              <span>{{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" 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>
+            </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,
@@ -91,24 +87,24 @@
 			this.myId = uni.getStorageSync('userId')
 			this.tabNav()
 		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.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)
+			// 	}
+			// },
 			tabNav(){
 				let data = {
 						  type: "服务类型",
@@ -133,26 +129,45 @@
 				}
 			},
 			getData(){
-				this.$Request.get("/app/artificer/selectMassageTypePage", {
-					by: '3',
-					status:'1',
-					classifyId:this.classifyId,
-					page:this.page,
-					limit:this.limit,
-					title:this.searchValue
-				}).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++){
-								this.dataList[i].tagsData=this.dataList[i].labels.split(',');
-							}
-							uni.stopPullDownRefresh()
-						}
-					}
-				});
+				// this.$Request.get("/app/artificer/selectMassageTypePage", {
+				// 	by: '3',
+				// 	status:'1',
+				// 	classifyId:this.classifyId,
+				// 	page:this.page,
+				// 	limit:this.limit,
+				// 	title:this.searchValue
+				// }).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++){
+				// 				this.dataList[i].tagsData=this.dataList[i].labels.split(',');
+				// 			}
+				// 			uni.stopPullDownRefresh()
+				// 		}
+				// 	}
+				// });
+        this.$refs.paging.reload(true);
 			},
+      queryList(pageNo, pageSize) {
+        const params = {
+          page: pageNo,
+          limit: pageSize,
+          by: '3',
+          status:'1',
+          classifyId:this.classifyId,
+          title:this.searchValue
+        }
+        this.$Request.get('/app/artificer/selectMassageTypePage',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=''
@@ -164,7 +179,7 @@
 				uni.reLaunch({
 					url:'/pages/index/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -361,7 +376,7 @@
 		align-items: center;
 		padding: 12px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -369,7 +384,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index be2972f..392d495 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -28,10 +28,10 @@
 
 			<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持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 -->
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 985b8f9..09c4b66 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -18,9 +18,9 @@
           </view>
         </view>
       </template>
-      <template #refresher="{refresherStatus}" >
+<!--      <template #refresher="{refresherStatus}" >
         <custom-refresher :status="refresherStatus" />
-      </template>
+      </template> -->
       <template #loadingMoreNoMore >
         <custom-nomore />
       </template>

From 104ead8dd5128e5bcdb5f09b947114144e858318 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 11:40:46 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/indextaociliaoList.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index ccc4519..660752b 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -26,7 +26,7 @@
 				<view style="height: 10rpx;"></view>
 				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
 					
-					<image :src="item.packageImg" mode=""  class="item-img"></image>
+					<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>
@@ -347,7 +347,7 @@
 		white-space: nowrap;
 	}
 	.item-view{
-		width: 55%;
+		width:63%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
@@ -356,8 +356,8 @@
 		padding: 26rpx 0;
 	}
 	.item-img{
-		width: 285rpx;
-		height: 120px;
+		width: 230rpx;
+		height: 200rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}
@@ -461,13 +461,14 @@
 	/deep/.uni-searchbar{
 		width:240px;
 		border-radius: 31rpx;
+		padding-right: 24rpx;
 	}
 	.search-btn{
 		text-align: center;
 		color: #111;
 		font-weight: bold;
 		position: absolute;
-		right:50rpx;
+		right:40rpx;
 		top: 26rpx;
 		font-size: 30rpx;
 		display: flex;

From 5a1e313d6afa7bd6b8494c8efaecb55badca0347 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 13:39:52 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/index.vue              |   5 ++---
 pages/my/indextaociliaoList.vue |  14 +++++++-------
 static/kefu.png                 | Bin 1252 -> 22992 bytes
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pages/my/index.vue b/pages/my/index.vue
index a131e57..8208fd7 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -167,7 +167,6 @@
 		<view class="prompt-text">-当你累了 想起盛安到家-</view>
 		<view class="kefu" @click="goMsg">
 			<image src="../../static/kefu.png" mode=""></image>
-			<span>联系客服</span>
 		</view>
 	</view>
 	
@@ -699,9 +698,8 @@
 		position: fixed;
 		right: 0;
 		bottom: 0;
-		margin-bottom: 20%;
+		margin-bottom:100rpx;
 		margin-right: 20px;
-		background-color: #fff;
 		border-radius: 5px;
 	}
 	.shop_label{
@@ -865,6 +863,7 @@
 		height: 170rpx;
 		text-align: top;
 		text-align: center;
+		padding: 20rpx 0;
 	}
 	.my-use-list-text{
 		color: #6C6C6C;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 660752b..5b15e32 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -208,8 +208,8 @@
 		flex-direction: column;
 		position: fixed;
 		z-index: 999;
-		background:#fff 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;
+		/*background:#fff 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;*/
 		padding-top: 6rpx;
 	}
 	.shop_label{
@@ -285,7 +285,7 @@
 		width: 100%;
 		display: flex;
 		flex-direction: row;
-		justify-content: space-between;
+		justify-content: center;
 	}
 	.item-view-jianjie{
 		font-weight: 400;
@@ -347,13 +347,13 @@
 		white-space: nowrap;
 	}
 	.item-view{
-		width:63%;
+		width:62%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		justify-content: space-between;
-		padding: 26rpx 0;
+		padding: 22rpx 0;
 	}
 	.item-img{
 		width: 230rpx;
@@ -387,7 +387,7 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		height: 140px;
+		height: 130px;
 		background: #FFFFFF;
 		border-radius: 21rpx;
 		margin-top:10px;
@@ -469,7 +469,7 @@
 		font-weight: bold;
 		position: absolute;
 		right:40rpx;
-		top: 26rpx;
+		top: 27rpx;
 		font-size: 30rpx;
 		display: flex;
 		align-items: center;
diff --git a/static/kefu.png b/static/kefu.png
index fee7dcd7f48e6aa93112f6b65d59d6e23d2967bb..bdadc42ba7ec9e7f6c4a2995b88e429bcc674f25 100644
GIT binary patch
literal 22992
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
W<|$HTKz&jG0000<MNUMnLSTXrmuEBp

literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000E5Nkl<ZSVzT{
ze`r-@7{|ZQd$;U|%<bGQSt8iF?-Vr(%q);l(nv>!gcCt3NSF8AHCt2sqd(d(uxL<B
z@3}6ggCq$19Y#N_9E41$U<gij&)u3oFs9pkmzKZgeV;gI_ulU2-ThV30~hW&@B2L8
z&w0-KoaZ6@&qjsnPj9m;iU<q%Hk|$aI?ka%UN0n8&H%<<dp<Nh5AZ?&&TsZ4!7~7#
z0Xzqkd0%I)Fj)bNHoF8K{R&7l0w_rYX2wMV1|Tp4j5z>qPp$!7#0aW@{3shpMgZ@g
zzO^jGP5=wyfjXIJfAMt@x$tt;P-^fQR=BDdv``b8z<A7EV;oWexjqxblmOmP-^0w}
zTflij{*;8?Gvc53gA=U0eX#Q8jj_3IV8NrfQ9L->c<*RJ$OwkFf~YC}nmUvzH%|qT
z7Qh?oo5c`cfpI^8ca$le^rOs*)Dh`gFg<>2KpF(03*ZlwUw%^>3_mD{jshqJs8yN1
z?dc%W0vJ~0Fu*ko`YdYt)*6<*j)5HnEXwvy<Lmpy<ya$67b}_Q<M_SJ%9I_G{cizq
z!~h%u=mb%0wPsHZf!lKw{(Bo^h{^K=NIyx;Z-VHU^81$N0&obxI%eJ>NL*!bTi)U+
z4#jk3=9s?o1PC)hSg-ujiJ!Cy85pm1oOBPc5H+Orm;Xe3yb$mO0T%#l0^@5HkgKK!
z2=+CD#A`%2%*+H(O`ZTJ!8i}X$_XM`uV5j*ivx9W3@xKC$u8$QnE}JHy8%2BcN_pv
zm8ZD#xCcC-T`^*Nf-mzC5GA1)=!%+hc@n_8yKf$Q#HqXmCpj=-W7IF-H>_|wKy{ho
z=@^zfS#UE@y4zkRJaB5ZKx0Lq))7<gasqhwgqN_O<NqbVSps^PsfVC@#-`oTb!pRV
zl`3dhwga$aDu_Zd(8(mer<m?h_0p}BOy&)SUuB}#{|$i4I)*igQ=3gVv0namZ>64A
zd_E_DioN|Zrgb>o=F}6Lt9W9cVc9&DkAP?1uvyiYQihQu0I!HUI4K@)!K_<UU~Y51
z;?DjAfb$Rp`U&88L*iCtR=fX`03{t~4bRxMRbaX+YWm(Sv+Sb;ECX;_nbH|J@-nxh
zvN-38Fh4UAsQ$!jg+mOwmgue%047H-x9l|<_&k2UR+;j{d<e?g`<GHo{|Lf9<(GBk
z*1%ki*v~|<rxSBUMgV8A%(4#>u#tg-QByvf4}kkIVtQ2b*i)nR^G_RAWG6GPjt1m}
zmY#hkw8C!zw2hg!L<7}1wPp9iR)l~W@@+sf-AuOlH0LQRfSZY6{{|x60!F<GNM}sT
zXhz7ssQj`beh|m!3#K*|@NJ#!m=i$4$s39^jQD*S=Yw)9vS`@!{eosLD!V(<M8F#i
zycad)bLpt_0!R(uR?Us8FA&iQX9i4NGeUMPn708m3#|8LD&v9xN<*jS2rl|HMYNWP
zD>c(%B0K~}i6bnErnL{hIOn%a@2emHcRHRpCtd>34c5mYL^sCJts10rFRK*<5YNCd
z0QUem34vO*MfPS@OS7RMfaIYJ_Af5F@<;E`_6PnfL_F(<sL-JK`27V`vGFio{;i<^
O0000<MNUMnLSTaC+(c*q


From 433037dee6437a7407574929ec8050588749f833 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 14:04:39 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/serviceOderDrtail.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index a8ca5f0..1929c86 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -30,13 +30,14 @@
 					</view>
 				</view>
 				<view class="header-bottom-mian">
-					<view class="header-bottom-mian-title">
+					<!--<view class="header-bottom-mian-title">
 						<image src="../../static/servicePackage/jianjie.png" mode=""></image>
 						<span>套餐简介</span>
-					</view>
+					</view>-->
 					<view class="jianjie">
 						{{mainData.content}}
 					</view>
+					<span class="jianjie-more">更多</span>
 				</view>
 				<view class="header-bottom-foot">
 					<view><image class="header-bottom-foot-title" src="../../static/dituzhaoren1.png" ></image></view>
@@ -876,16 +877,18 @@
 		position: relative;
 	}
 	.detail-foot-title{
-		    width: 115px;
-		    height: 32px;
-			background-image: url(../../static/servicePackage/horn.png);
+		    width: 100px;
+		    height:28px;
+			/*background-image: url(../../static/servicePackage/horn.png);
 		    background-repeat: no-repeat;
-		    background-size: 100% 100%;
+		    background-size: 100% 100%;*/
+			background: linear-gradient(90deg, #ffdf96, #feca76);
+			border-radius: 0 15rpx 0  30rpx;
 		    font-weight: 400;
-		    font-size: 13px;
-		    color: #FFFFFF;
+		    font-size: 14px;
+		    color: #a13504;
 		    text-align: right;
-		    line-height: 32px;
+		    line-height: 28px;
 		    padding-right: 15px;
 			position: absolute;
 			    right: 0;
@@ -973,6 +976,10 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
+	.jianjie-more{
+	color: #029d88;
+	font-size: 24rpx;
+	}
 	.header-bottom-mian{
 		margin: 3px 0px;
 	}

From 4213dca1a6c93cbb4d8ebd09fd9287b19c9b9923 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 14:13:59 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/indextaociliaoList.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 5b15e32..e2a0b7c 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -353,11 +353,11 @@
 		flex-direction: column;
 		justify-content: center;
 		justify-content: space-between;
-		padding: 22rpx 0;
+		padding:5rpx 0;
 	}
 	.item-img{
-		width: 230rpx;
-		height: 200rpx;
+		width: 240rpx;
+		height: 210rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}
@@ -387,12 +387,12 @@
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		height: 130px;
+		/*height: 140px;*/
 		background: #FFFFFF;
 		border-radius: 21rpx;
 		margin-top:10px;
 		align-items: center;
-		padding: 0px 10px;
+		padding:20rpx;
 	}
 	
 	.item-detail {
@@ -469,7 +469,7 @@
 		font-weight: bold;
 		position: absolute;
 		right:40rpx;
-		top: 27rpx;
+		top: 26rpx;
 		font-size: 30rpx;
 		display: flex;
 		align-items: center;

From aad9d12b4b9de6597c70c1815944a2da32ca7cc5 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 14:21:46 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5033c0..12c0ad1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -262,7 +262,7 @@
 		</uni-popup>
 		<view>
 			<!-- 提前结束 -->
-			<uni-popup ref="popup" background-color="#fff">
+			<uni-popup class="popup-view" ref="popup" background-color="#fff">
 				<view class="popup-content">
 					<view class="popup-close"><image @click="closePopup(type)" class="popup-close-img" src="../../static/close.png"></image></view>
 					<!--<view class="popup-head">
@@ -401,7 +401,8 @@
 				cuowu:'',
 				type:'center',
 				parType:'',
-				contentVideo:''
+				contentVideo:'',
+				type:'center'
 			}
 		},
 		onShareAppMessage(res) { //发送给朋友
@@ -695,7 +696,7 @@
 				this.$refs.popup.close(type);
 			},
 			gangBtn(type){
-				this.$refs.popup.open(type)
+				this.$refs.popup.open('center')
 			},
 			qidai(){
 				uni.showToast({
@@ -1171,6 +1172,11 @@
 </script>
 
 <style scoped>
+	.popup-view /deep/.uni-popup__wrapper-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 	 /deep/.uni-video-fullscreen {
 	   display: none;
 	 }

From c0753f1fcb2ecc2fdee442c8dcdf728f5ef0409a Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 14:26:50 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/indextaociliaoList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index e2a0b7c..67613fa 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -347,7 +347,7 @@
 		white-space: nowrap;
 	}
 	.item-view{
-		width:62%;
+		width:60%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
@@ -357,7 +357,7 @@
 	}
 	.item-img{
 		width: 240rpx;
-		height: 210rpx;
+		height: 200rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}

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 08/10] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=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>

From a4f6f5f8b7bb4058512f9102575d18d8d2820598 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 14:52:39 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/indextaociliaoList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index e5830ec..e5ab203 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -477,7 +477,7 @@
 		font-weight: bold;
 		position: absolute;
 		right:40rpx;
-		top: 26rpx;
+		top: 20rpx;
 		font-size: 30rpx;
 		display: flex;
 		align-items: center;

From cacdfd4e896906b51a8255fac3a2bb3329158c92 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 26 Jul 2024 15:00:04 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/indextaociliaoList.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index e5ab203..f90614e 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -355,7 +355,7 @@
 		white-space: nowrap;
 	}
 	.item-view{
-		width:60%;
+		width:59%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
@@ -364,8 +364,8 @@
 		padding:5rpx 0;
 	}
 	.item-img{
-		width: 240rpx;
-		height: 200rpx;
+		width: 246rpx;
+		height: 206rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}
@@ -390,8 +390,8 @@
 		height: 100%;
 	}
 	.item {
-		width: 96%;
-		margin: 0 2% ;
+		width: 100%;
+		margin:0 auto;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
@@ -400,7 +400,7 @@
 		border-radius: 21rpx;
 		margin-top:10px;
 		align-items: center;
-		padding:20rpx;
+		padding:16rpx;
 	}
 
 	.item-detail {
@@ -477,7 +477,7 @@
 		font-weight: bold;
 		position: absolute;
 		right:40rpx;
-		top: 20rpx;
+		top: 19rpx;
 		font-size: 30rpx;
 		display: flex;
 		align-items: center;