From 103842d40e2e58befbac20c8ddf4fe6ef2bf53f2 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Tue, 2 Jul 2024 15:56:40 +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

---
 App.vue                                       |  3 +++
 .../mescroll-uni/components/mescroll-down.css | 10 +++++----
 my/order/revenueDetails.vue                   | 22 ++++++++++++-------
 pages/order/index.vue                         | 15 ++++++++-----
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/App.vue b/App.vue
index 863e6a2..b08ce22 100644
--- a/App.vue
+++ b/App.vue
@@ -757,6 +757,9 @@ export default {
 // /deep/.uni-scroll-view-content{
 // 		height: 350px !important;
 // 	}
+/deep/uni-page-body {
+    background-color: #f7f7f7 !important;
+}
 page {
 	background-color: #FFFFFF;
 	color: #343546;
diff --git a/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css b/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css
index 72bf106..3a8a210 100644
--- a/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css
+++ b/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css
@@ -1,22 +1,24 @@
 /* 下拉刷新区域 */
 .mescroll-downwarp {
-	position: absolute;
+	/* position: absolute;
 	top: -100%;
 	left: 0;
 	width: 100%;
 	height: 100%;
-	text-align: center;
+	text-align: center; */
+	    height: 25px;
+	    text-align: center;
 }
 
 /* 下拉刷新--内容区,定位于区域底部 */
 .mescroll-downwarp .downwarp-content {
-	position: absolute;
+	/* position: absolute;
 	left: 0;
 	bottom: 0;
 	width: 100%;
 	min-height: 60rpx;
 	padding: 20rpx 0;
-	text-align: center;
+	text-align: center; */
 }
 
 /* 下拉刷新--提示文本 */
diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 1d046fd..c5f9254 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -1516,9 +1516,12 @@
 			<!-- 普通弹窗 -->
 			<uni-popup ref="popupW" type="bottom" background-color="#fff">
 				<view class="popup-content">
-					<view class="popup-head">
+					<!--<view class="popup-head">
 						<span></span>
 						<span @click="closePopup(type)">x</span>
+					</view>-->
+					<view class="popup-head">
+						<image src="../../static/closeimg.png" class="popup-img" @click="closePopup(type)"></image>
 					</view>
 					<view class="popup-mian">
 						<view class="popup-view">
@@ -1561,9 +1564,12 @@
 			<!-- 普通弹窗 -->
 			<uni-popup ref="popup" type="bottom" background-color="#fff">
 				<view class="popup-content" style="height: 255px;">
-					<view class="popup-head">
+					<!--<view class="popup-head">
 						<span></span>
 						<span @click="closePopupJ(type)">x</span>
+					</view>-->
+					<view class="popup-head">
+						<image src="../../static/closeimg.png" class="popup-img"  @click="closePopupJ(type)"></image>
 					</view>
 					<view class="popup-mian">
 						<view class="popup-view">
@@ -2809,12 +2815,12 @@
 	.popup-head span:nth-child(2){
 		width: 50rpx;
 		height: 50rpx;
-		line-height: 19px;
-		text-align: center;
-		font-size: 24px;
-		color: #15AB8D;
-		border-radius: 50%;
-		border: 3px solid #15AB8D;
+	}
+	.popup-img{
+		width: 55rpx;
+		height: 55rpx;
+		position: absolute;
+		right:22rpx;
 	}
 	.popup-head span:nth-child(1){
 		font-weight: bold;
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 4a8a66b..dd3b319 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -58,11 +58,11 @@
 				inactive-color="#999999" :customStyle="{ 'background-color': '#050505' }" isShowImg textClass="">
 			</u-tabs>
 		<mescroll-body :sticky="true" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-			style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5;">
+			style="padding: 0 16px;width: 100%;min-height: 100vh; background: #f5f5f5; margin-top: 34px;">
 			<!-- 数据列表 -->
 			<!-- <view v-if="goods.length > 0" class="margin-sm padding-sm bg radius" v-for="(item,index) in goods"
 				:key='index' @click="clickItem(item)"> -->
-			<view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index'
+			<view class="bgwhite radius margin-bottom-sm padding-order " v-for="(item, index) in goods" :key='index' style="position: relative;"
 				@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
 				<view class="flex justify-between padding-sm">
 					<view v-if="item.overTimeOrders == 1" style="color: red;font-size: 26rpx">(订单已超时)</view>
@@ -85,7 +85,8 @@
 					</view>
 				</view>
 				<view class="xian"></view>
-				<view class=" u-flex padding-sm mescroll-downwarp">
+				 <!-- mescroll-downwarp -->
+				<view class=" u-flex padding-sm">
 					<view class="u-m-r-10">
 						<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
 							size="100">
@@ -970,11 +971,12 @@
 	.popup-head span:nth-child(2){
 		width: 50rpx;
 		height: 50rpx;
-		
 	}
 	.popup-img{
-		width: 50rpx;
-		height: 50rpx;
+		width: 55rpx;
+		height: 55rpx;
+		position: absolute;
+		right:22rpx;
 	}
 	.popup-head{
 		width: 100%;
@@ -985,6 +987,7 @@
 		align-items: center;
 		justify-content: space-between;
 		padding: 0 15px;
+		position: relative;
 	}
 	.popup-content{
 		width: 100%;