From 065ec61c57a6b4a590732e18fd804788699ba1bf Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 23 Jul 2024 22:16:38 +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

---
 my/order/pay.vue              |   2 +-
 pages/my/orderDetailsList.vue |  54 +++++++++++++++++++---------------
 static/seckill4-2.png         | Bin 0 -> 4410 bytes
 3 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 static/seckill4-2.png

diff --git a/my/order/pay.vue b/my/order/pay.vue
index faa84f2..bc6c794 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -687,7 +687,7 @@
         <view class="popup-content">
           <view class="popup-head">
             <span>确认拒单</span>
-            <span @click="closePopupQ(type)">x</span>
+            <span @click="closePopup(type)"><image style="width: 50rpx; height:50rpx;" src="../../static/close.png"></image></span>
           </view>
           <view class="popup-mian">
             <view  class="popup-mian-textarea">
diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue
index 0665402..e9d793c 100644
--- a/pages/my/orderDetailsList.vue
+++ b/pages/my/orderDetailsList.vue
@@ -19,7 +19,7 @@
 			<template slot="content">
 				<!-- 升级订单 -->
 				<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
-					<view class="flex justify-between">
+					<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%;">
@@ -39,8 +39,8 @@
 						
 						<!-- <view class="u-tips-color">{{item.createTime}}</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="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>
@@ -60,7 +60,7 @@
 							</view>
 						</view>
 					</view>
-					<view class=" u-flex u-p-t-30" v-else>
+					<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>
@@ -187,6 +187,9 @@
 </script>
 
 <style scoped>
+	.st-title{
+		padding-top:20rpx;
+	}
 	.dingdan-cont{
 		width: 100%;
 		display: flex;
@@ -377,8 +380,8 @@
 		height: 140px;
 		background: #FFFFFF;
 		border-radius: 21rpx;
-		padding: 0px 5px;
-		margin: 20px auto 0px auto;
+		padding: 0px 12px;
+		margin: 20rpx auto 0px auto;
 	}
 	
 	.item-detail {
@@ -436,46 +439,50 @@
 	}
 	.search-btn{
 		text-align: center;
-		line-height: 31px;
+		line-height: 28px;
 		color: #fff;
 		position: absolute;
-		right: 0;
-		top: 0;
-		margin-top:9.4px;
-		margin-right: 11px;
-		height: 32px !important;
+		right:14rpx;
+		top: 25rpx;
+		height: 29px !important;
 	}
 	/deep/.uni-searchbar__box-icon-search,.search-btn{
-		width: 101rpx;
-		height: 60rpx;
+		width: 110rpx;
+		height: 50rpx;
 		background: #18A689;
 		border-radius: 31rpx;
-		
 	}
 	/deep/.uni-searchbar__box{
-		height: 31px;
-		border-radius: 15px !important;
+		height: 30px;
+		border-radius: 30px !important;
 		background-color: #fff !important;
-		border: 2px solid #E5E5E5;
+		border: 1px solid #09a28a;
 		padding: 0px;
 		display: flex;
 		flex-direction: row;
 		flex-flow: row-reverse;
 		position: relative;
+		margin-top: 4rpx;
 	}
 	/deep/.uni-searchbar{
 		width: 240px;
 		border-radius: 31rpx;
 	}
 	.service-head-top-left image{
-		width: 25px;
-		height: 30rpx;
-		margin-right: 10px;
+		width: 20px;
+		height: 20rpx;
+		margin-right:5px;
+		margin-left: 10rpx;
 	}
 	.service-head-top-left span{
+		width: 180rpx;
+		height: 60rpx;
+		background:url('../../static/images/headline.png') 0rpx 26rpx;
+		background-repeat: no-repeat;
 		font-weight: bold;
-		font-size: 44rpx;
+		font-size: 34rpx;
 		color: #171717;
+		margin-top: 16rpx;
 	}
 	.service-head-top-left{
 		display: flex;
@@ -490,7 +497,8 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		background-color: #fff;
+		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;
 	}
 	
 </style>
diff --git a/static/seckill4-2.png b/static/seckill4-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed47ea4ace4ce1fa59a494116c4000c4cb136993
GIT binary patch
literal 4410
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
Bxa<G`

literal 0
HcmV?d00001