diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 9bd71f5..41d1f67 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -1,32 +1,34 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-view">
-    <z-paging ref="paging" v-model="dataList" @query="queryList" >
-		<template #top>
+		<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 @service="serviceTrue" :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>
+							<image style="width:30rpx; height:30rpx; margin-right: 10rpx;"
+								src="../../static/search.png"></image>
 							搜索
 						</view>
 					</view>
 				</view>
-		</template>
-<!--      <template #refresher="{refresherStatus}" >
+			</template>
+			<!--      <template #refresher="{refresherStatus}" >
         <custom-refresher :status="refresherStatus" />
       </template> -->
-		<template #loadingMoreNoMore >
-			<custom-nomore />
-		</template>
-		<view v-if="getText=='企业'">
+			<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>
+					<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>
@@ -39,7 +41,7 @@
 						</view>
 						<view class="flex" style="margin-top: 10rpx;">
 							<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>
@@ -49,75 +51,75 @@
 							<view class="item-view-xiangmu">
 								<span>已售</span><span>{{item.sales}}</span>
 							</view>
-						<view class="item-view-bottom-btn">
-							查看
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
 						</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="flex" style="margin-top: 10rpx;">
-						<view class="shop_label" v-if="item.tagsData!=''">
-							<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+			<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="shop_label" v-else>
-							<span>助眠解压</span>
+						<view class="item-view-jianjie">
+							{{item.consortiaContent}}
 						</view>
-					</view>
-					<view class="item-view-bottom">
-						<view class="item-view-xiangmu">
-							<span></span>
+						<view class="flex" style="margin-top: 10rpx;">
+							<view class="shop_label" v-if="item.tagsData!=''">
+								<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
+							</view>
+							<view class="shop_label" v-else>
+								<span>助眠解压</span>
+							</view>
 						</view>
-						<view class="item-view-bottom-btn">
-							查看
+						<view class="item-view-bottom">
+							<view class="item-view-xiangmu">
+								<span></span>
+							</view>
+							<view class="item-view-bottom-btn">
+								查看
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
-	</z-paging>
+		</z-paging>
 	</view>
 </template>
 <script>
 	export default {
 		data() {
 			return {
-				loadingType:0,
+				loadingType: 0,
 				myId: '',
 				// v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
 				dataList: [],
-				typeData:'104',
+				typeData: '104',
 				tabIndex: 0,
-				searchValue:'',
-				serviceTrue:true,
-				page:1,
-				limit:10,
-				titleNmae:'',
-				classifyId:'',
-				getName:'',
-				getText:'',
-				tagsData:[]
+				searchValue: '',
+				serviceTrue: true,
+				page: 1,
+				limit: 10,
+				titleNmae: '',
+				classifyId: '',
+				getName: '',
+				getText: '',
+				tagsData: []
 			}
 		},
-		onLoad(e){
-			this.typeData=e.type
-			this.getName=e.name;
-			this.getText=e.text
+		onLoad(e) {
+			this.typeData = e.type
+			this.getName = e.name;
+			this.getText = e.text
 			this.myId = uni.getStorageSync('userId')
 			// this.getData();
-			// uni.setNavigationBarTitle({
-			//    title: this.getText,
-			//  })
+			uni.setNavigationBarTitle({
+				title: this.getText,
+			})
 		},
 		// onPullDownRefresh: function() {
 		// 	this.page = 1;
@@ -138,15 +140,15 @@
 			// 	}
 			// },
 
-			input(res) {//搜索 输入框
-				this.searchValue=res;
+			input(res) { //搜索 输入框
+				this.searchValue = res;
 			},
-			searchBtn(){//搜索按钮
-				if(this.searchValue!=""){
+			searchBtn() { //搜索按钮
+				if (this.searchValue != "") {
 					this.getData()
 				}
 			},
-			getData(){
+			getData() {
 				// var that=this;
 				// if(that.getText=='企业'){
 				// 	that.$Request.get("/app/artificer/selectMassageTypeQyPage", {
@@ -184,57 +186,59 @@
 				// 		}
 				// 	});
 				// }
-        this.$refs.paging.reload(true);
+				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);
-          })
-        }
+			queryList(pageNo, pageSize) {
+				if (this.getText == '企业') {
+					var 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 {
+					var 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].tags.split(',');
+						}
+						console.log("res.data.list",params)
+						this.$refs.paging.complete(res.data.list);
+					}).catch(res => {
+						this.$refs.paging.complete(false);
+					})
+				}
 
-      },
-			backImg(){//返回上一页
+			},
+			backImg() { //返回上一页
 				uni.reLaunch({
-					url:'/pages/index/index'
+					url: '/pages/index/index'
 				})
 			},
 			clear(res) {
 				this.getData()
 			},
 			itemClick(item) {
-				if(this.getText=='企业'){
+				if (this.getText == '企业') {
 					uni.navigateTo({
-						url:'/pages/my/fuwuDateil?id='+item.massageTypeId+'&limit='+this.limit+'&page='+this.page+'&name='+'index'+'&isCanCoupon='+item.isCanCoupon
+						url: '/pages/my/fuwuDateil?id=' + item.massageTypeId + '&limit=' + this.limit + '&page=' +
+							this.page + '&name=' + 'index' + '&isCanCoupon=' + item.isCanCoupon
 					})
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/shop/yueDaoDianDrtail?id='+item.consortiaId
+						url: '/pages/shop/yueDaoDianDrtail?id=' + item.consortiaId
 					})
 				}
 
@@ -244,22 +248,24 @@
 </script>
 
 <style scoped>
-
-	/deep/.refresh-body .content{
+	/deep/.refresh-body .content {
 		background-color: #f7f7f7;
 	}
-	/deep/.refresh-body{
+
+	/deep/.refresh-body {
 		height: 100% !important;
 		border-top: 2px solid #f7f7f7;
 	}
-	.content-view{
+
+	.content-view {
 		width: 100%;
 		height: 100vh;
 		overflow: auto;
 		background-color: #f7f7f7;
 		position: relative;
 	}
-	.item-view-bottom-btn{
+
+	.item-view-bottom-btn {
 		text-align: center;
 		width: 131rpx;
 		height: 55rpx;
@@ -270,95 +276,113 @@
 		font-size: 28rpx;
 		color: #FFFFFF;
 	}
-	.item-view-bottom-qian span:nth-child(5){
-	font-size: 28rpx;
-	color: #848484;
-	text-decoration-line: line-through;
+
+	.item-view-bottom-qian span:nth-child(5) {
+		font-size: 28rpx;
+		color: #848484;
+		text-decoration-line: line-through;
 	}
-	.item-view-bottom-qian span:nth-child(4){
-	font-size: 26rpx;
-	color: #848484;
-	text-decoration-line: line-through;
-	margin-left: 5px;
+
+	.item-view-bottom-qian span:nth-child(4) {
+		font-size: 26rpx;
+		color: #848484;
+		text-decoration-line: line-through;
+		margin-left: 5px;
 	}
-	.item-view-bottom-qian span:nth-child(3){
-	font-size: 26rpx;
-	color: #848484;
-	text-decoration-line: line-through;
-  }
-	.item-view-bottom-qian span:nth-child(2){
-	font-weight: bold;
-	font-size: 36.81rpx;
-	color: #FF6000;
+
+	.item-view-bottom-qian span:nth-child(3) {
+		font-size: 26rpx;
+		color: #848484;
+		text-decoration-line: line-through;
 	}
-	.item-view-bottom-qian span:nth-child(1){
-	font-weight: 400;
-	font-size: 26rpx;
-	color: #FF6000;
+
+	.item-view-bottom-qian span:nth-child(2) {
+		font-weight: bold;
+		font-size: 36.81rpx;
+		color: #FF6000;
 	}
-	.item-view-bottom-qian{
-	margin-top: 2px;
+
+	.item-view-bottom-qian span:nth-child(1) {
+		font-weight: 400;
+		font-size: 26rpx;
+		color: #FF6000;
 	}
-	.item-view-bottom{
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
+
+	.item-view-bottom-qian {
+		margin-top: 2px;
 	}
-	.item-view-jianjie{
-	font-weight: 400;
-	font-size: 24rpx;
-	color: #999999;
-	margin:5px 0px;
-	display: -webkit-box;
-	-webkit-box-orient: vertical;
-	-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
-	overflow: hidden;
-	text-overflow: ellipsis;
+
+	.item-view-bottom {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
 	}
-	.item-view-biao{
+
+	.item-view-jianjie {
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #999999;
+		margin: 5px 0px;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		/* 显示的行数，可以根据需要修改 */
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+	.item-view-biao {
 		border-radius: 15rpx 3rpx 15rpx 3rpx;
 	}
-	.tuina{
-		background-color:#d1f2df;
+
+	.tuina {
+		background-color: #d1f2df;
 		color: #17984d;
 	}
-	.xiaoer{
-		background-color:#f1f8d7;
+
+	.xiaoer {
+		background-color: #f1f8d7;
 		color: #58b314;
 		font-size: 22rpx;
 		padding: 3rpx 3rpx;
 		border-radius: 15rpx 15rpx 2rpx 2rpx;
 	}
-	.taishi{
-		background-color:#e5d5c6;
+
+	.taishi {
+		background-color: #e5d5c6;
 		color: #805d39;
 	}
-	.kangfu{
-		background-color:#fcf3da;
+
+	.kangfu {
+		background-color: #fcf3da;
 		color: #ff8600;
 	}
-	.item-view-xiangmu span:nth-child(2){
-    font-weight: normal;
-    color: #333333;
-    font-size: 30rpx;
+
+	.item-view-xiangmu span:nth-child(2) {
+		font-weight: normal;
+		color: #333333;
+		font-size: 30rpx;
 	}
-	.item-view-xiangmu span:nth-child(1){
-    font-weight: normal;
-    color: #666666;
-    margin-right: 5rpx;
-    font-size: 30rpx;
+
+	.item-view-xiangmu span:nth-child(1) {
+		font-weight: normal;
+		color: #666666;
+		margin-right: 5rpx;
+		font-size: 30rpx;
 	}
-  .item-view-xiangmu{
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    font-weight: 400;
-    font-size: 25rpx;
-    align-items: flex-end;
-  }
-	.item-view-title{
+
+	.item-view-xiangmu {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		font-weight: 400;
+		font-size: 25rpx;
+		align-items: flex-end;
+	}
+
+	.item-view-title {
 		width: 75%;
 		font-weight: bold;
 		font-size: 32rpx;
@@ -367,25 +391,29 @@
 		text-overflow: ellipsis;
 		white-space: nowrap;
 	}
-	.item-view{
-	width:60%;
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	justify-content: space-between;
-	padding:5rpx 0;
+
+	.item-view {
+		width: 60%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		justify-content: space-between;
+		padding: 5rpx 0;
 	}
-	.item-img{
-	width: 240rpx;
-	height: 200rpx;
-	border-radius: 14rpx;
-	position: relative;
+
+	.item-img {
+		width: 240rpx;
+		height: 200rpx;
+		border-radius: 14rpx;
+		position: relative;
 	}
-	.item-img img{
+
+	.item-img img {
 		border-radius: 14rpx;
 	}
-	.img-span{
+
+	.img-span {
 		padding: 2px 5px;
 		font-weight: 400;
 		font-size: 8px;
@@ -398,23 +426,26 @@
 		margin-bottom: 5px;
 		margin-right: 5px;
 	}
-	.item-img image{
+
+	.item-img image {
 		width: 100%;
 		height: 100%;
 	}
+
 	.item {
 		width: 100%;
-		margin: 0 auto ;
+		margin: 0 auto;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
 		/*height: 140px;*/
 		background: #FFFFFF;
 		border-radius: 21rpx;
-		margin-top:10px;
+		margin-top: 10px;
 		align-items: center;
-		padding:20rpx;
+		padding: 20rpx;
 	}
+
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -431,21 +462,25 @@
 		width: 100%;
 		background-color: #eeeeee;
 	}
-	/deep/.zp-paging-container{
+
+	/deep/.zp-paging-container {
 		background-color: #f7f7f7;
-		width:100%;
+		width: 100%;
 	}
-	/deep/.zp-paging-container-content{
+
+	/deep/.zp-paging-container-content {
 		width: 95%;
 		margin: 0 auto;
 	}
-	.fenlei{
+
+	.fenlei {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.index-fenl-title{
+
+	.index-fenl-title {
 		width: 81rpx;
 		text-align: center;
 		position: relative;
@@ -454,37 +489,43 @@
 		align-items: center;
 		font-weight: bold;
 		font-size: 34rpx;
-		color:#019C88;
+		color: #019C88;
 	}
-	.index-fenl-title-bottom{
+
+	.index-fenl-title-bottom {
 		position: absolute;
 		bottom: 0;
 		margin-bottom: 0px;
 		width: 81rpx;
 		height: 14rpx;
 		border-radius: 7rpx;
-		background: linear-gradient(-48deg,rgba(1, 156, 136, 0.35),rgba(45, 196, 142, 0.35));
+		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
 	}
-	/deep/.uni-searchbar__cancel{
+
+	/deep/.uni-searchbar__cancel {
 		display: none;
 	}
-	.search-btn{
+
+	.search-btn {
 		text-align: center;
 		color: #019c88;
 		font-weight: bold;
 		position: absolute;
-		right:40rpx;
+		right: 40rpx;
 		top: 20rpx;
 		font-size: 30rpx;
 		display: flex;
 		align-items: center;
 	}
-	/deep/.uni-searchbar__box-icon-search,.search-btn{
+
+	/deep/.uni-searchbar__box-icon-search,
+	.search-btn {
 		width: 110rpx;
 		height: 50rpx;
 	}
-	/deep/.uni-searchbar__box{
-		height:34px;
+
+	/deep/.uni-searchbar__box {
+		height: 34px;
 		border-radius: 30px !important;
 		background-color: #fff !important;
 		border: 1px solid #09a28a;
@@ -493,75 +534,87 @@
 		flex-flow: row-reverse;
 		position: relative;
 	}
-	/deep/.uni-searchbar{
-		width:250px;
+
+	/deep/.uni-searchbar {
+		width: 250px;
 		border-radius: 31rpx;
 		padding-right: 24rpx;
 	}
-	.service-head-top-left image{
+
+	.service-head-top-left image {
 		width: 20px;
 		height: 20rpx;
-		margin-right:5px;
+		margin-right: 5px;
 		margin-left: 10rpx;
 	}
-	.service-head-top-left span{
+
+	.service-head-top-left span {
 		width: 180rpx;
 		height: 60rpx;
-		background:url('../../static/images/headline.png') 0rpx 26rpx;
+		background: url('../../static/images/headline.png') 0rpx 26rpx;
 		background-repeat: no-repeat;
 		font-weight: bold;
 		font-size: 34rpx;
 		color: #171717;
 		margin-top: 14rpx;
 	}
-	.service-head-top-left{
+
+	.service-head-top-left {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.service-head-top{
-		height:90rpx;
+
+	.service-head-top {
+		height: 90rpx;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-	.view-cata{
+
+	.view-cata {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 	}
-	.shop_category{
+
+	.shop_category {
 		display: flex;
 		flex-wrap: wrap;
 		align-items: flex-end;
 		justify-content: space-between;
 		font-size: 26rpx;
 		padding: 8rpx 0;
-		margin-top:40rpx ;
+		margin-top: 40rpx;
 	}
-	.shop_category_a{
+
+	.shop_category_a {
 		color: #019c88;
 	}
-	.shop_item{
+
+	.shop_item {
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
 		width: 90%;
 		margin: 15rpx auto;
 	}
-	.shop_color{
-		color:#fb672b;
+
+	.shop_color {
+		color: #fb672b;
 		font-weight: bold;
 		font-size: 38rpx;
 	}
-	.shop_label{
+
+	.shop_label {
 		display: flex;
 		flex-wrap: wrap;
 		margin-top: 4rpx;
 	}
-	.shop_label span{
+
+	.shop_label span {
 		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
 		line-height: 34rpx;
@@ -572,16 +625,16 @@
 		margin-bottom: 8rpx;
 		color: #f68607;
 	}
-	.shop-arrow{
-		display: inline-block;
-		    border-top: 1px solid;
-		    border-right: 1px solid;
-		    width: 7px;
-		    height: 7px;
-		    border-color: #999;
-		    -webkit-transform: rotate(45deg);
-		    transform: rotate(45deg);
-		    margin-top: 7px;
-	}
 
-</style>
+	.shop-arrow {
+		display: inline-block;
+		border-top: 1px solid;
+		border-right: 1px solid;
+		width: 7px;
+		height: 7px;
+		border-color: #999;
+		-webkit-transform: rotate(45deg);
+		transform: rotate(45deg);
+		margin-top: 7px;
+	}
+</style>
\ No newline at end of file