From ff81695eb6072a4ff10f8aa9377fb318dbcae22b Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Wed, 17 Jul 2024 11:35:45 +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                          | 57 ++++++++++++-----------
 my/order/payModifyDd.vue                  | 56 ++++++++++++++--------
 uview-ui/components/u-button/u-button.vue |  1 -
 3 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/my/order/pay.vue b/my/order/pay.vue
index b18398e..3011430 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -153,7 +153,7 @@
 							<view class="add-con-cont" >{{order.technicianRate}}%</view>
 						</view>
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="add-con-title">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -200,7 +200,7 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
-							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
@@ -281,7 +281,7 @@
 							<view class="add-con-cont" >{{order.technicianRate}}%</view>
 						</view> -->
 						<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
-							<view style="color: #333;font-size: 26rpx;">
+							<view class="add-con-title">
 								小计：
 						    </view>
 							<view class="" style="color: #333;">
@@ -328,7 +328,7 @@
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">订单费用：</view>
-							<view class="add-con-cont">￥<text style="font-size: 26rpx; font-weight: bold;">{{order.massageMoney}}</text></view>
+							<view class="add-con-cont">￥<text>{{order.massageMoney}}</text></view>
 						</view>
 						<view class="flex justify-between add-lin">
 							<view class="add-con-title">出行费用：</view>
@@ -371,10 +371,10 @@
 					修改订单
 				</u-button> -->
 				<u-button @click="zhifu(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
-					class="dingshi">立即支付
+					class="btns">立即支付
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==2">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
@@ -385,35 +385,35 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 			
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==3">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true"
 					@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
-					class="dingshi">
+					class="btns">
 					去评价
 				</u-button>
 				<u-button :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-					class="dingshi">
+					class="btns">
 					去投诉
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==4">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==5">
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}">
 				<view class="gengduo" @click.stop="gengBtn">更多</view>
@@ -448,7 +448,7 @@
 				</view>
 				<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
 					<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-						class="dingshi">联系客服</u-button>
+						class="btns">联系客服</u-button>
 					<u-button @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false">
 						取消订单
 					</u-button>
@@ -461,7 +461,7 @@
 					<u-button :custom-style="customStyle2"
 						shape="circle" :plain="true"
 						@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
-						class="dingshi">
+						class="btns">
 						去投诉
 					</u-button>
 					
@@ -477,11 +477,11 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==8">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
@@ -493,25 +493,25 @@
 					:custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
-					class="dingshi">
+					class="btns">
 					修改订单
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==9">
-				<u-button class="dingshi" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
+				<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
 					>
 					取消订单
 				</u-button>
 				<u-button v-if="order.refusalContent" :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="toggleQ('center',order)"
-					class="dingshi">
+					class="btns">
 					拒单详情
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 			<view class="showBtn" v-if="order.status ==10">
 				<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
@@ -522,17 +522,17 @@
 					v-if="order.packageType=='104'||order.packageType=='105'||order.packageType=='106'"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
-					class="dingshi">
+					class="btns">
 					立即预约
 				</u-button>
 				<u-button v-else :custom-style="customStyle2"
 					shape="circle" :plain="true"
 					@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
-					class="dingshi">
+					class="btns">
 					立即预约
 				</u-button>
 				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
+					class="btns">联系客服</u-button>
 			</view>
 		</view>
 		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@@ -2311,7 +2311,7 @@
 <style lang="scss" scoped>
 	
 	/deep/.u-size-default{
-		width: 80px !important;
+		width: 85px !important;
 	}
 	/deep/.padding-bottom{
 		padding-bottom: 20rpx;
@@ -2493,8 +2493,9 @@
 		flex-direction: column;
 	}
 	/deep/.btns{
-		background: #019C88 !important;
-		color: #fff !important;
+		border: 1rpx solid #e5e5e5 ;
+		color: #333333 !important;
+		margin-left: 10rpx !important;
 	}
 	/deep/.u-size-default{
 		// margin: 5px 0px 0px 0px;
diff --git a/my/order/payModifyDd.vue b/my/order/payModifyDd.vue
index 5b0c544..2cd5291 100644
--- a/my/order/payModifyDd.vue
+++ b/my/order/payModifyDd.vue
@@ -108,10 +108,10 @@
 						</view> -->
 						<view class="flex align-center justify-between"
 							style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
-							<view class="flex justify-between margin-tb-sm" @click="openData()">
+							<view class="flex justify-between margin-tb-sm" @click="openData()" style="align-items: center;">
 								<view v-if="startTime">{{startTime}}</view>
-								<view class="tetx-sm" style="color:#999999; font-size: 30rpx;" v-else>请选择预约时间</view>
-								<u-icon name="arrow-right" color="#999999"></u-icon>
+								<view class="tetx-sm" v-else>请选择预约时间</view>
+								<span class="view-more"></span>
 							</view>
 						</view>
 					</view>
@@ -148,8 +148,9 @@
 			</view>
 
 
-			
-			<view class="pay_btn" style="margin-top: 12px;" @click="openpay()">去支付</view>
+			<view class="push-button">
+				<view class="que-btn" @click="openpay()">去支付</view>
+			</view>
 		
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@@ -1334,6 +1335,11 @@
 </script>
 
 <style lang="scss" scoped>
+	.tetx-sm{
+		color: #888888;
+		font-size: 30rpx;
+		margin-top: 10rpx;
+	}
 	.head-bottom{
 		width: 68%;
 		display: flex;
@@ -1535,7 +1541,7 @@
 	}
 	.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
 		font-weight: 400;
-		font-size: 29rpx;
+		font-size: 30rpx;
 		color: #888;
 	}
 	.fuwu-time-view,.liliao-top{
@@ -1546,7 +1552,7 @@
 	}
 	.fuwu-title,.liliao-top span:nth-child(1){
 		font-size: 29rpx;
-		color: #222222;
+		color: #999999;
 	}
 	.fuwu-time,.liliao{
 		width: 100%;
@@ -1593,8 +1599,8 @@
 		}
 	.header-view-text{
 		width: 170rpx;
-		font-size: 29rpx;
-		color: #222222;
+		font-size: 30rpx;
+		color: #999999;
 	}
 	.header-view{
 		background-color: #fff;
@@ -1989,17 +1995,27 @@
 
 	}
 
-	.pay_btn {
-	    width: 96%;
-	    margin-left: 2%;
-	    text-align: center;
-	    background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
-	    height: 40px;
-	    border-radius: 40px;
-	    color: #ffffff;
-	    line-height: 40px;
-	    font-size: 16px;
-	    position: fixed;
+	.push-button{
+		    width: 100%;
+		    height: 48px;
+		    position: fixed;
+		    bottom: 0px;
+		    display: flex;
+		    flex-direction: column;
+		    align-items: center;
+			margin: 0 auto;
+	}
+	.que-btn{
+		display: inline-block;
+		width: 90%;
+		text-align: center;
+		background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
+		height: 38px;
+		border-radius: 28px;
+		color: #ffffff;
+		line-height: 38px;
+		margin-top: 4px;
+		font-size: 34rpx;
 	}
 
 	.serverAddress {
diff --git a/uview-ui/components/u-button/u-button.vue b/uview-ui/components/u-button/u-button.vue
index 6a29e37..1d13cda 100644
--- a/uview-ui/components/u-button/u-button.vue
+++ b/uview-ui/components/u-button/u-button.vue
@@ -377,7 +377,6 @@ export default {
 	}
 	
 	&--primary {
-		color: #ffffff;
 		border-color: $u-type-primary;
 		background-color: $u-type-primary;
 	}