From 466f80ae06f5105e97b871a4c6bd1cb6b58c9052 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 13 Jul 2024 14:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/cika.vue               | 22 +++++++++++++++++++---
 pages/my/fuwuGengduo.vue        | 22 +++++++++++++++++++---
 pages/my/fuwuliaocheng.vue      | 22 +++++++++++++++++++---
 pages/my/fuwuxiangm.vue         | 22 +++++++++++++++++++---
 pages/my/historyMy.vue          | 22 +++++++++++++++++++---
 pages/my/indextaociliaoList.vue | 20 ++++++++++++++++++--
 pages/my/servicePackage.vue     | 22 +++++++++++++++++++---
 pages/shop/index.vue            | 17 +++++++++--------
 8 files changed, 141 insertions(+), 28 deletions(-)

diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index d981b86..98b9b2b 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -59,8 +59,8 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}/{{item.serviceCount}}次</span>
 					</view>
-					<view class="item-view-jianjie">
-						{{item.content}}
+					<view class="shop_label" v-if="tagsData">
+						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -91,7 +91,8 @@
 				serviceTrue:true,
 				page:1,
 				limit:10,
-				titleNmae:''
+				titleNmae:'',
+				tagsData:[]
 			}
 		},
 		onLoad(){
@@ -119,6 +120,9 @@
 				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.tagsData=this.dataList[i].labels.split(',');
+						}
 					}
 				})
 			},
@@ -169,6 +173,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
 	}
diff --git a/pages/my/fuwuGengduo.vue b/pages/my/fuwuGengduo.vue
index 8c9807c..9637471 100644
--- a/pages/my/fuwuGengduo.vue
+++ b/pages/my/fuwuGengduo.vue
@@ -45,8 +45,8 @@
 							</view>
 							
 						</view>
-						<view class="item-view-jianjie">
-							{{item.content}}
+						<view class="shop_label" v-if="tagsData">
+							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 						</view>
 						<view class="item-view-bottom">
 							<view class="item-view-xiangmu">
@@ -84,7 +84,8 @@
 				page:1,
 				limit:10,
 				titleNmae:'',
-				classifyId:''
+				classifyId:'',
+				tagsData:[]
 			}
 		},
 		onLoad(e){
@@ -134,6 +135,9 @@
 						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].labels.split(',');
+							}
 							uni.stopPullDownRefresh()
 						}
 					}
@@ -177,6 +181,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	/deep/.refresh-body{
 		height: 845px !important;
 		background-color: #f7f7f7;
diff --git a/pages/my/fuwuliaocheng.vue b/pages/my/fuwuliaocheng.vue
index 545797e..7104889 100644
--- a/pages/my/fuwuliaocheng.vue
+++ b/pages/my/fuwuliaocheng.vue
@@ -59,8 +59,8 @@
 						<span style="text-decoration: line-through;">￥{{item.oldPrice}}/{{item.serviceCount}}次</span>
 					</view>
 					
-					<view class="item-view-jianjie">
-						{{item.content}}
+					<view class="shop_label" v-if="tagsData">
+						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -91,7 +91,8 @@
 				serviceTrue:true,
 				page:1,
 				limit:10,
-				titleNmae:''
+				titleNmae:'',
+				tagsData:[]
 			}
 		},
 		onLoad(){
@@ -119,6 +120,9 @@
 				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.tagsData=this.dataList[i].labels.split(',');
+						}
 					}
 				})
 			},
@@ -169,6 +173,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
 	}
diff --git a/pages/my/fuwuxiangm.vue b/pages/my/fuwuxiangm.vue
index 2b46680..9c895fe 100644
--- a/pages/my/fuwuxiangm.vue
+++ b/pages/my/fuwuxiangm.vue
@@ -38,8 +38,8 @@
 								<span style="text-decoration: line-through; color: #999;margin-left: 5px;">￥{{item.oldPrice}}</span>
 							</view>
 						</view>
-						<view class="item-view-jianjie">
-							{{item.jianjie}}
+						<view class="shop_label" v-if="tagsData">
+							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 						</view>
 						
 						<view class="item-view-bottom">
@@ -78,7 +78,8 @@
 				page:1,
 				limit:10,
 				titleNmae:'',
-				classifyId:''
+				classifyId:'',
+				tagsData:[]
 			}
 		},
 		onLoad(){
@@ -139,6 +140,9 @@
 						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].labels.split(',');
+							}
 							uni.stopPullDownRefresh()
 						}
 					}
@@ -169,6 +173,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	/deep/.z-tabs-item-title{
 		font-size: 30rpx;
 		color: #222;
diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index df32df8..c10a013 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -19,8 +19,8 @@
 							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
 							<span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
 						</view> -->
-						<view class="item-view-jianjie">
-							{{item.content}}
+						<view class="shop_label" v-if="tagsData">
+							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 						</view>
 						<view class="item-view-bottom">
 							<view class="item-view-bottom-qian">
@@ -66,7 +66,8 @@
 				page:1,
 				limit:10,
 				titleNmae:'',
-				classifyId:''
+				classifyId:'',
+				tagsData:[]
 			}
 		},
 		onLoad(){
@@ -111,6 +112,9 @@
 						if (res.data) {
 							if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
 							this.dataList = [...this.dataList, ...res.data.records]; //追加新数据
+							for(var i=0;i<this.dataList.length;i++){
+								this.tagsData=this.dataList[i].labels.split(',');
+							}
 							uni.stopPullDownRefresh()
 						}
 					}
@@ -149,6 +153,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.header-bottom-title-liao{
 		display: inline-block;
 		padding: 1px 10px;
diff --git a/pages/my/indextaociliaoList.vue b/pages/my/indextaociliaoList.vue
index 4eeca20..aa17d54 100644
--- a/pages/my/indextaociliaoList.vue
+++ b/pages/my/indextaociliaoList.vue
@@ -32,8 +32,8 @@
 							<span>￥</span>
 							<span>{{item.oldPrice}}<text  v-if="item.type!='104'">/{{item.serviceCount}}</text>{{typeData=='104'?'套':typeData=='105'?'次':'次'}}</span>
 						</view>
-						<view class="item-view-jianjie">
-							{{item.content}}
+						<view class="shop_label" v-if="tagsData">
+							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 						</view>
 						<view class="item-view-bottom">
 							<view class="item-view-xiangmu">
@@ -72,6 +72,7 @@
 				titleNmae:'',
 				classifyId:'',
 				getName:'',
+				tagsData:[]
 			}
 		},
 		onLoad(e){
@@ -120,6 +121,9 @@
 							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].labels.split(',');
+								}
 								uni.stopPullDownRefresh()
 							}
 						}
@@ -155,6 +159,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.item-view-bottom-qian{
 		margin-top: 5px;
 	}
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index facf681..2b88254 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -59,8 +59,8 @@
 						<span>￥</span>
 						<span>{{item.oldPrice}}/套</span>
 					</view>
-					<view class="item-view-jianjie">
-						{{item.content}}
+					<view class="shop_label" v-if="tagsData">
+						<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
 					</view>
 					<view class="item-view-bottom">
 						<view class="item-view-xiangmu">
@@ -91,7 +91,8 @@
 				serviceTrue:true,
 				page:1,
 				limit:10,
-				titleNmae:''
+				titleNmae:'',
+				tagsData:[]
 			}
 		},
 		onLoad(){
@@ -118,6 +119,9 @@
 				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.tagsData=this.dataList[i].labels.split(',');
+						}
 					}
 				})
 			},
@@ -169,6 +173,18 @@
 </script>
 
 <style scoped>
+	.shop_label{
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.img-span{
 		padding: 2px 5px;
 		font-weight: 400;
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 4ac0660..5376173 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -514,6 +514,14 @@
 		display: flex;
 		flex-wrap: wrap;
 	}
+	.shop_label span{
+		background: #e5e5e5;
+		border-radius: 8rpx;
+		padding: 2rpx 8rpx;
+		font-size: 20rpx;
+		margin-right: 8rpx;
+		margin-bottom: 8rpx;
+	}
 	.shop-arrow{
 		display: inline-block;
 		    border-top: 1px solid;
@@ -525,12 +533,5 @@
 		    transform: rotate(45deg);
 		    margin-top: 7px;
 	}
-	.shop_label span{
-		background: #e5e5e5;
-		border-radius: 8rpx;
-		padding: 2rpx 8rpx;
-		font-size: 20rpx;
-		margin-right: 8rpx;
-		margin-bottom: 8rpx;
-	}
+	
 </style>