From dc9460041441cdda472946afd8a018e32275d922 Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Thu, 4 Jul 2024 15:15:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/hongbao/xinrenhongbao.vue |  2 +-
 my/order/pay.vue             |  1 -
 my/order/payShengji.vue      | 45 +++++++++++++++++++++---------------
 my/order/paydingCi.vue       |  4 ++++
 my/order/paydingLiao.vue     |  4 ++++
 my/order/paydingTc.vue       |  6 ++++-
 6 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/my/hongbao/xinrenhongbao.vue b/my/hongbao/xinrenhongbao.vue
index 1974179..69b2aa0 100644
--- a/my/hongbao/xinrenhongbao.vue
+++ b/my/hongbao/xinrenhongbao.vue
@@ -7,7 +7,7 @@
 				<view class="" :class="tabIndex == index?'line':''"></view>
 			</view>
 		</view> -->
-		<t-refresh ref="refresh"  v-if="hongbao.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
+		<t-refresh ref="refresh" style="margin-bottom: 150px;" v-if="hongbao.length>0"  @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType"   :tPadding="0">
 			<template slot="content">
 				<checkbox-group @change="checkboxChange">
 					<view>
diff --git a/my/order/pay.vue b/my/order/pay.vue
index 35e1b86..aa48427 100644
--- a/my/order/pay.vue
+++ b/my/order/pay.vue
@@ -2017,7 +2017,6 @@
 		padding: 29rpx;
 	}
 	.content{
-		 padding-bottom: 140rpx;
 		 padding-top: 20px;
 		 width: 100%;
 		 background-color: #f7f7f7;
diff --git a/my/order/payShengji.vue b/my/order/payShengji.vue
index 711a2ec..b9d355a 100644
--- a/my/order/payShengji.vue
+++ b/my/order/payShengji.vue
@@ -276,12 +276,12 @@
 									style="font-size: 26rpx;font-weight: bold;">{{((order.oldMassagePrice*order.oldMassageNum)*(order.vipRate/100)*(1+order.technicianRate/100)).toFixed(2)}}</text></view>
 						</view>
 						<view class="flex justify-between jusitify-line">
-							<view class="line-word"">出行费用：</view>
+							<view class="line-word">出行费用：</view>
 							<view class="line-word-r">￥<text
 									>{{order.taxiMoney}}</text></view>
 						</view>
 						<view class="flex justify-between jusitify-line" v-if="order.couponMoney">
-							<view class="line-word"">优惠券：</view>
+							<view class="line-word">优惠券：</view>
 							<view class="" style="color: #F93731;">
 								-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney?order.couponMoney:0}}</text></view>
 						</view>
@@ -374,18 +374,17 @@
 					</view>
 				</view>
 			</view> -->
-
-			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
-				
-				<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
-					class="dingshi">联系客服</u-button>
-			</view>
-			<view class="flex tabber padding-top-sm padding-bottom-sm align-center">
+			<view style="position: relative;" class="flex tabber padding-top-sm padding-bottom-sm align-center">
 				<view class="showBtn-mian">
 					<view class="showBtn">
 						<view class="gengduo" @click.stop="gengBtn">更多</view>
-						<u-button shape="circle" :plain="true" @click="goChat"
-							class="btns">联系客服</u-button>
+						
+						<u-button
+							shape="circle" :plain="true"
+							@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
+							class="btns">
+							充值
+						</u-button>
 						<u-button
 							shape="circle" :plain="true"
 							@click="toggle('center',order)"
@@ -399,13 +398,9 @@
 							加钟
 						</u-button>
 					</view>
-					<view class="showBtn-view" v-show="btnShow">
-						<u-button
-							shape="circle" :plain="true"
-							@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
-							class="btns">
-							充值
-						</u-button>
+					<view class="yincang" v-show="btnShow==true">
+						<u-button style="margin:0px !important;" shape="circle" :plain="true" @click="goChat"
+							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)"
@@ -1627,6 +1622,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.yincang{
+		background-color: #fff;
+		position: absolute;
+		width: 100px;
+		height: 100px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		left: 0;
+		margin-bottom: 50px;
+		margin-left: 16px;
+	}
 	.dingshi,.btns{
 		width: 0px !important;
 		padding: 0px 42px !important;
@@ -1999,7 +2007,6 @@
 		padding: 29rpx;
 	}
 	.content{
-		 padding-bottom: 140rpx;
 		 padding-top: 20px;
 		 width: 100%;
 		 background-color: #f7f7f7;
diff --git a/my/order/paydingCi.vue b/my/order/paydingCi.vue
index 8482d74..43d3441 100644
--- a/my/order/paydingCi.vue
+++ b/my/order/paydingCi.vue
@@ -70,6 +70,10 @@
 							<span>优惠券</span>
 							<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
 						</view>
+						<view class="fei-view-list" v-if="order.vipRate">
+							<span>会员折扣</span>
+							<span>{{order.vipRate}}%</span>
+						</view>
 						<view class="fei-view-list-z">
 							<span>总金额</span>
 							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.payMoney}}</span>
diff --git a/my/order/paydingLiao.vue b/my/order/paydingLiao.vue
index a8c322e..6f09d53 100644
--- a/my/order/paydingLiao.vue
+++ b/my/order/paydingLiao.vue
@@ -70,6 +70,10 @@
 							<span>优惠券</span>
 							<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
 						</view>
+						<view class="fei-view-list" v-if="order.vipRate">
+							<span>会员折扣</span>
+							<span>{{order.vipRate}}%</span>
+						</view>
 						<view class="fei-view-list-z">
 							<span>总金额</span>
 							<span style="color: #FF3939;font-size: 29rpx;">￥{{order.payMoney}}</span>
diff --git a/my/order/paydingTc.vue b/my/order/paydingTc.vue
index 350f18b..8cb0601 100644
--- a/my/order/paydingTc.vue
+++ b/my/order/paydingTc.vue
@@ -63,6 +63,10 @@
 							<span>优惠券</span>
 							<span style="color: rgb(249, 55, 49);">-￥{{order.couponMoney}}</span>
 						</view>
+						<view class="fei-view-list" v-if="order.vipRate">
+							<span>会员折扣</span>
+							<span>{{order.vipRate}}%</span>
+						</view>
 						<view class="fei-view-list-z">
 							<span>总金额</span>
 							<span style="color: #FF3939;font-weight: bold;font-size: 32rpx; ">￥{{order.payMoney}}</span>
@@ -191,7 +195,7 @@
 			this.ordersId = e.ordersId
 			this.getOrder();
 			this.orderXm=this.$queue.getData('mainData');
-			console.log("asdsadsadsadasdsa111",this.orderXm)
+			console.log("orderXm=====>",this.orderXm)
 		},
 		onShow() {
 			this.addressId = this.$queue.getData('EditAddress');