diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 383f240..0cb8476 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -123,23 +123,23 @@
 				}
 			},
 			getData(){
-				this.$Request.get("/app/massage/package/findPackageAndMassagePage",{
-					city:'',
-					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/massage/package/findPackageAndMassagePage",{
+				// 	city:'',
+				// 	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);
 			},
 			// changeClick(index,item){
@@ -148,7 +148,6 @@
 			// 	this.getData()
 			// },
       queryList(pageNo, pageSize) {
-        console.log("queryList");
         const params = {
           city:'',
           page:pageNo,
diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue
index d25ec1f..be2972f 100644
--- a/pages/my/newseckill.vue
+++ b/pages/my/newseckill.vue
@@ -156,7 +156,6 @@
 				this.$refs.paging.reload(true);
 			},
 			queryList(pageNo, pageSize) {
-				console.log("queryList");
 				const params = {
 					userId: this.myId,
 					page: pageNo,
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 278c2e6..985b8f9 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -1,83 +1,92 @@
 <!-- 自定义下拉刷新与上拉加载演示(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>{{getText}}</span>
-			</view>
-			<view>
-				<uni-search-bar @service="serviceTrue" :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 v-if="getText=='企业'">
-					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-						<image :src="item.massageImg" 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.classifyName}}</span>
-							</view>
-							
-							<view class="item-view-bottom-qian">
-								<span>￥</span>
-								<span>{{item.price}}</span>
-								<span style="color: #999;text-decoration: line-through;margin-left: 5px;">￥{{item.oldPrice}}</span>
-							</view>
-							<view class="shop_label" v-if="item.tagsData">
-								<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
-							</view>
-							<view class="item-view-bottom">
-								<view class="item-view-xiangmu">
-									<span>已售</span><span>{{item.sales}}</span>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-if="getText=='商家'">
-					<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-						<image :src="item.logo" mode=""  class="item-img"></image>
-						<view class="item-view">
-							<view class="view-cata">
-								<view class="item-view-title">{{item.consortiaName}}</view>
-							</view>
-							<view class="item-view-jianjie">
-								{{item.consortiaContent}}
-							</view>
-							<view class="shop_label" v-if="item.tagsData">
-								<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
-							</view>
-							<view class="item-view-bottom">
-								
-								<!--<view class="item-view-bottom-btn">
-									预约
-								</view>-->
-							</view>
-							
-						</view>
-					</view>
-				</view>
-				
-				<empty v-if="dataList.length==0"></empty>
-			</template> 
-		</t-refresh>
-			
+    <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>{{getText}}</span>
+          </view>
+          <view>
+            <uni-search-bar @service="serviceTrue" :cancelext="'取消'" v-model="searchValue" @input="input"
+                            @clear="clear">
+            </uni-search-bar>
+            <view class="search-btn" @click="searchBtn">
+              搜索
+            </view>
+          </view>
+        </view>
+      </template>
+      <template #refresher="{refresherStatus}" >
+        <custom-refresher :status="refresherStatus" />
+      </template>
+      <template #loadingMoreNoMore >
+        <custom-nomore />
+      </template>
+      <view v-if="getText=='企业'">
+        <view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+          <image :src="item.massageImg" 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.classifyName}}</span>
+            </view>
+            <view class="item-view-bottom-qian">
+              <span>￥</span>
+              <span>{{item.price}}</span>
+              <span style="color: #999;text-decoration: line-through;margin-left: 5px;">￥{{item.oldPrice}}</span>
+            </view>
+            <view class="shop_label" v-if="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>
+              </view>
+              <view class="item-view-bottom-btn">
+                查看
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view v-if="getText=='商家'">
+        <view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
+          <image :src="item.logo" mode=""  class="item-img"></image>
+          <view class="item-view">
+            <view class="view-cata">
+              <view class="item-view-title">{{item.consortiaName}}</view>
+            </view>
+            <view class="item-view-jianjie">
+              {{item.consortiaContent}}
+            </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>
+              </view>
+              <view class="item-view-bottom-btn">
+                查看
+              </view>
+            </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,
@@ -102,34 +111,32 @@
 			this.getName=e.name;
 			this.getText=e.text
 			this.myId = uni.getStorageSync('userId')
-			this.getData();
-			uni.setNavigationBarTitle({
-			   title: this.getText,
-			 })
-			
-		},
-		onPullDownRefresh: function() {
-			this.page = 1;
-			this.getData()
+			// this.getData();
+			// uni.setNavigationBarTitle({
+			//    title: this.getText,
+			//  })
 		},
+		// 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;
-				console.log('----input:', res)
 			},
 			searchBtn(){//搜索按钮
 				if(this.searchValue!=""){
@@ -137,50 +144,83 @@
 				}
 			},
 			getData(){
-				var that=this;
-				if(that.getText=='企业'){
-					that.$Request.get("/app/artificer/selectMassageTypeQyPage", {
-						city:'长春',
-						page:that.page,
-						limit:that.limit,
-						title:that.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()
-							}
-						}
-					});
-				}else{//约到店
-					that.$Request.get("/app/consortia/selectConsortiaList", {
-						page:that.page,
-						limit:that.limit,
-						consortiaName:that.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.tagsData=this.dataList[i].tags.split(',');
-								}
-								uni.stopPullDownRefresh()
-							}
-						}
-					});
-				}
-					
+				// var that=this;
+				// if(that.getText=='企业'){
+				// 	that.$Request.get("/app/artificer/selectMassageTypeQyPage", {
+				// 		city:'长春',
+				// 		page:that.page,
+				// 		limit:that.limit,
+				// 		title:that.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()
+				// 			}
+				// 		}
+				// 	});
+				// }else{//约到店
+				// 	that.$Request.get("/app/consortia/selectConsortiaList", {
+				// 		page:that.page,
+				// 		limit:that.limit,
+				// 		consortiaName:that.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.tagsData=this.dataList[i].tags.split(',');
+				// 				}
+				// 				uni.stopPullDownRefresh()
+				// 			}
+				// 		}
+				// 	});
+				// }
+        this.$refs.paging.reload(true);
 			},
+      queryList(pageNo, pageSize) {
+        if(this.getText=='企业'){
+          const params = {
+            page: pageNo,
+            limit: pageSize,
+            city:'长春',
+            title: this.searchValue
+          }
+          this.$Request.get('/app/artificer/selectMassageTypeQyPage',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);
+          })
+        }else{
+          const params = {
+            page: pageNo,
+            limit: pageSize,
+            title: this.searchValue
+          }
+          this.$Request.get('/app/consortia/selectConsortiaList',params).then(res => {
+            for(var i=0;i<res.data.list.length;i++){
+              res.data.list[i].tagsData=res.data.list[i].labels.split(',');
+            }
+            this.$refs.paging.complete(res.data.list);
+          }).catch(res => {
+            this.$refs.paging.complete(false);
+          })
+        }
+
+      },
 			backImg(){//返回上一页
 				uni.reLaunch({
 					url:'/pages/index/index'
 				})
-			},	
+			},
 			clear(res) {
 				this.getData()
 			},
@@ -194,7 +234,7 @@
 						url:'/pages/shop/yueDaoDianDrtail?id='+item.consortiaId
 					})
 				}
-				
+
 			}
 		}
 	}
@@ -334,7 +374,7 @@
 		position: relative;
 	}
 	.item-img img{
-		border-radius: 14rpx;	
+		border-radius: 14rpx;
 	}
 	.img-span{
 		padding: 2px 5px;
@@ -366,7 +406,7 @@
 		align-items: center;
 		padding: 0px 10px;
 	}
-	
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -374,7 +414,7 @@
 		color: white;
 		background-color: #007AFF;
 	}
-	
+
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -388,7 +428,7 @@
 		width:100%;
 	}
 	/deep/.zp-paging-container-content{
-		width: 95%;
+		width: 100%;
 		margin: 0 auto;
 	}
 	.fenlei{
@@ -538,5 +578,5 @@
 		    transform: rotate(45deg);
 		    margin-top: 7px;
 	}
-	
+
 </style>