From fdd5c514533919075127c0e312f6314d07ae06f0 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 8 Aug 2024 16:00:19 +0800
Subject: [PATCH] =?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/cika.vue              | 14 --------
 pages/my/historyMy.vue         | 63 +++++++++++++++++++---------------
 pages/my/myCiLiaoDetail.vue    | 11 +++---
 pages/my/serviceOderDrtail.vue |  3 +-
 4 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/pages/my/cika.vue b/pages/my/cika.vue
index ebd0692..d222303 100644
--- a/pages/my/cika.vue
+++ b/pages/my/cika.vue
@@ -196,7 +196,6 @@
 		flex-wrap: wrap;
 		margin-top: 4rpx;
 	}
-
 	.shop_label span {
 		background: linear-gradient(90deg, #ffefde, #fff7ef);
 		height: 34rpx;
@@ -208,7 +207,6 @@
 		margin-bottom: 8rpx;
 		color: #f68607;
 	}
-
 	.item-view-bottom-btn {
 		text-align: center;
 		width: 131rpx;
@@ -343,18 +341,15 @@
 		justify-content: space-between;
 		padding: 5rpx 0;
 	}
-
 	.item-img {
 		width: 240rpx;
 		height: 200rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}
-
 	.item-img img {
 		border-radius: 14rpx;
 	}
-
 	.img-span {
 		padding: 2px 5px;
 		font-weight: 400;
@@ -368,13 +363,11 @@
 		margin-bottom: 5px;
 		margin-right: 5px;
 	}
-
 	.item-img image {
 		width: 100%;
 		height: 100%;
 		border-radius: 14rpx;
 	}
-
 	.item {
 		width: 100%;
 		margin: 0 auto;
@@ -388,7 +381,6 @@
 		align-items: center;
 		padding: 20rpx;
 	}
-
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -396,7 +388,6 @@
 		color: white;
 		background-color: #007AFF;
 	}
-
 	.item-line {
 		position: absolute;
 		bottom: 0rpx;
@@ -405,24 +396,20 @@
 		width: 100%;
 		background-color: #eeeeee;
 	}
-
 	/deep/.zp-paging-container {
 		background-color: #f7f7f7;
 		width: 100%;
 	}
-
 	/deep/.zp-paging-container-content {
 		width: 95%;
 		margin: 0 auto;
 	}
-
 	.fenlei {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
 	}
-
 	.index-fenl-title {
 		width: 81rpx;
 		text-align: center;
@@ -444,7 +431,6 @@
 		border-radius: 7rpx;
 		background: linear-gradient(-48deg, rgba(1, 156, 136, 0.35), rgba(45, 196, 142, 0.35));
 	}
-
 	/deep/.uni-searchbar__cancel {
 		display: none;
 	}
diff --git a/pages/my/historyMy.vue b/pages/my/historyMy.vue
index 08252c6..a45c684 100644
--- a/pages/my/historyMy.vue
+++ b/pages/my/historyMy.vue
@@ -1,7 +1,6 @@
 <!-- 自定义下拉刷新与上拉加载演示(vue) -->
 <template>
 	<view class="content-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)">
@@ -12,16 +11,13 @@
 						<view class="item-view-title">
 							<span class="item-view-title-text">{{item.title}}</span>
 							<span class="header-bottom-title-liao">
-								{{item.typeName}}
+								{{item.typeName?item.typeName:'项目'}}
 							</span>
 						</view>
 						<!-- <view class="item-view-xiangmu">
 							<span class="xiaoer item-view-biao">{{item.classifyName}}</span>
 							<span>已售{{item.sales}} | 好评{{item.esteemRate}}%</span>
 						</view> -->
-						<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">
 								<span>￥</span>
@@ -34,9 +30,12 @@
 									<span v-if="item.typeName!='项目'" style="color: #848484;">/{{item.typeName=='次卡'?'次':item.typeName=='疗程'?'次':item.typeName=='套餐'?'套':'套'}}</span>
 								</span>
 							</view>
-							<view class="item-view-bottom-btn">
-								查看
-							</view>
+						</view>
+						<view class="shop_label" v-if="tagsData">
+							<span v-for="tag in tagsData" :key="tag">{{tag}}</span>
+						</view>
+						<view class="flex" style="display: flex; justify-content: right;">
+							<span class="item-view-bottom-btn">查看</span>
 						</view>
 					</view>	
 				</view>
@@ -153,17 +152,21 @@
 </script>
 
 <style scoped>
-	.shop_label{
+	.shop_label {
 		display: flex;
 		flex-wrap: wrap;
+		margin-top: 4rpx;
 	}
-	.shop_label span{
-		background: #e5e5e5;
+	.shop_label span {
+		background: linear-gradient(90deg, #ffefde, #fff7ef);
+		height: 34rpx;
+		line-height: 34rpx;
 		border-radius: 8rpx;
-		padding: 3rpx 10rpx;
+		padding: 0 10rpx;
 		font-size: 22rpx;
 		margin-right: 8rpx;
 		margin-bottom: 8rpx;
+		color: #f68607;
 	}
 	.header-bottom-title-liao{
 		display: inline-block;
@@ -192,15 +195,15 @@
 		overflow: auto;
 		background-color: #f7f7f7;
 	}
-	.item-view-bottom-btn{
+	.item-view-bottom-btn {
 		text-align: center;
 		width: 131rpx;
-		height: 50rpx;
-		line-height: 50rpx;
+		height: 55rpx;
+		line-height: 55rpx;
 		background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
 		border-radius: 10rpx;
 		font-weight: bold;
-		font-size: 24rpx;
+		font-size: 28rpx;
 		color: #FFFFFF;
 	}
 	.item-view-bottom-qian span:nth-child(4){
@@ -228,6 +231,9 @@
 		 font-size: 23rpx;
 		 color: #848484;
 	}
+	.item-view-bottom-qian{
+		margin-top: 6rpx;
+	}
 	.item-view-bottom{
 		width: 100%;
 		display: flex;
@@ -295,20 +301,22 @@
 		align-items: center;
 	}
 	.item-view{
-		width: 55%;
+		width: 60%;
 		height: 100%;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		justify-content: space-between;
-		padding: 10rpx 0;
+		padding: 5rpx 0;
 	}
-	.item-img{
-		width: 285rpx;
-		height: 120px;
+	.item-img {
+		width: 240rpx;
+		height: 200rpx;
 		border-radius: 14rpx;
 		position: relative;
 	}
+	.item-img img {
+		border-radius: 14rpx;
+	}
 	.img-span{
 		padding: 2px 5px;
 		font-weight: 400;
@@ -329,18 +337,17 @@
 	}
 	.item {
 		width:96%;
-		margin:0 auto ;
+		margin: 0 auto;
 		display: flex;
 		flex-direction: row;
 		justify-content: space-between;
-		height: 140px;
+		/*height: 140px;*/
 		background: #FFFFFF;
 		border-radius: 21rpx;
-		margin-top:10px;
+		margin-top: 10px;
 		align-items: center;
-		padding:12px;
+		padding: 20rpx;
 	}
-	
 	.item-detail {
 		padding: 5rpx 15rpx;
 		border-radius: 10rpx;
@@ -361,7 +368,7 @@
 		background-color: #f7f7f7;
 		width:100%;
 	}
-	/deep/.zp-paging-container-content{
+	/deep/.zp-paging-container-content {
 		width: 95%;
 		margin: 0 auto;
 	}
diff --git a/pages/my/myCiLiaoDetail.vue b/pages/my/myCiLiaoDetail.vue
index 00260c8..e09af36 100644
--- a/pages/my/myCiLiaoDetail.vue
+++ b/pages/my/myCiLiaoDetail.vue
@@ -514,13 +514,11 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		padding: 1px 8px;
 		height: 22px;
 		line-height: 22px;
-		background-color: rgba(230, 246, 243, 1);
 		border-radius: 15px;
 		font-weight: 400;
-		font-size: 10px;
+		font-size: 11px;
 		color: #029c88;
 	}
 	.header-bottom-foot-title{
@@ -534,18 +532,21 @@
 		margin-top: 5px;
 	}
 	.header-bottom-foot-cont{
-		width: 100%;
+		width: 96%;
+		margin: 0 auto;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		margin-top: 40rpx;
 	}
 	.header-bottom-foot{
 		width: 100%;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
+		margin-top: 20rpx;
+		border-top: 1px solid #f7f7f7;
+		padding: 20rpx  0rpx 0rpx 0rpx;
 	}
 	.header-bottom-money-jia{
 		font-size: 28rpx;
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index 121aa0c..9b374fc 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -1206,7 +1206,8 @@
 		padding: 20rpx  0rpx 0rpx 0rpx;
 	}
 	.header-bottom-foot-cont{
-		width: 100%;
+		width: 96%;
+		margin: 0 auto;
 		display: flex;
 		flex-direction: row;
 		align-items: center;