yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
kbing1981 2024-07-19 17:35:02 +08:00
parent 31befdcf2c
commit 7fd2148d95
2 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
my/order/pay.vue
View File

@ -59,21 +59,21 @@
</view> </view>
<view class="add-content"> <view class="add-content">
<view class="" v-if="order.artificer"> <view class="" v-if="order.artificer">
<view class="flex align-center justify-between add-lin"> <view class="jusitify-line">
<view class="add-con-title">下单人</view> <view class="line-word">下单人</view>
<view class="add-con-cont"> <view class="line-word-r">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex align-center justify-between add-lin"> <view class="jusitify-line">
<view class="add-con-title">联系方式</view> <view class="line-word">联系方式</view>
<view class="add-con-cont"> <view class="line-word-r">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}} {{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view> </view>
</view> </view>
<view class="serverAddress add-lin"> <view class="serverAddress jusitify-line">
<view class="add-con-title">服务地址</view> <view class="line-word">服务地址</view>
<view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view> <view class="line-word-r" style="width: 73%; text-align: right;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -111,50 +111,50 @@
<view class="justify-title">订单信息</view> <view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="jusitify-line">
<view class="add-con-title">订单编号</view> <view class="line-word">订单编号</view>
<view class="flex add-con-cont" @tap="copy(order.ordersNo)"> <view class="line-word-r flex" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view> <view class="">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon> <u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view> </view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="jusitify-line">
<view class="add-con-title">预约时间</view> <view class="line-word">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view> <view class="line-word-r" >{{order.serveTime}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="jusitify-line">
<view class="add-con-title">下单时间</view> <view class="line-word">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view> <view class="line-word-r">{{order.createTime}}</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav ">
<view class="justify-title">订单费用</view> <view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="jusitify-line" >
<view class="add-con-title">项目名称</view> <view class="line-word">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view> <view class="line-word-r">{{order.entryName}}</view>
</view>
<view class="jusitify-line">
<view class="line-word">服务时长</view>
<view class="line-word-r">{{order.duration}}分钟</view>
</view>
<view class="jusitify-line" >
<view class="line-word">项目价格</view>
<view class="line-word-r">￥{{order.priceMarkup}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">服务时长</view> <view class="line-word">会员减免</view>
<view class="add-con-cont">{{order.duration}}分钟</view> <view class="line-word-r" >-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex justify-between add-lin" >
<view class="add-con-title">项目价格</view>
<view class="add-con-cont">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-￥{{order.vipReductionMoney}}</view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;"> <view class="jusitify-line">
<view class="add-con-title"> <view class="line-word">
小计： 小计：
</view> </view>
<view class="" style="color: #333;"> <view class="line-word-r">
<text style="font-size: 35rpx;font-weight: bold;"> <text style="font-size: 35rpx;font-weight: bold;">
￥{{order.massageMoney}} ￥{{order.massageMoney}}
</text> </text>
@ -166,31 +166,33 @@
<view class="justify-title">出行费用</view> <view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.tripWay" > <view class="jusitify-line" v-if="order.tripWay" >
<view class="add-con-title">出行方式</view> <view class="line-word">出行方式</view>
<view class="add-con-cont" v-if="order.tripWay == 1">公交</view> <view class="line-word-r" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view> <view class="line-word-r" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view> <view class="line-word-r" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.km"> <view class="jusitify-line" v-if="order.km">
<view class="add-con-title">全程距离</view> <view class="line-word">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view> <view class="line-word-r">{{order.km}}km</view>
</view> </view>
<view class="flex justify-between add-lin" > <view class="jusitify-line" >
<view class="add-con-title">出行费用</view> <view class="line-word">出行费用</view>
<view class="add-con-cont">￥{{order.taxiMoney}}</view> <view class="line-word-r">￥{{order.taxiMoney}}</view>
</view> </view>
<view class="jusitify-line-end add-lin"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="justify-title">优惠券信息</view> <view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">优惠券</view> <view class="line-word">优惠券</view>
<view class="add-con-cont" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r" style="color: #F93731;font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view> <view class="" v-else>-</view>
</view> </view>
<view class="jusitify-line-end"></view> <view class="jusitify-line-end"></view>
<view class="justify-title-nav"> <view class="justify-title-nav">
<view class="justify-title">费用明细</view> <view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
@ -2619,6 +2621,7 @@
.zhuangtai{ .zhuangtai{
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
font-size: 30rpx;
} }
.head-title-right{ .head-title-right{
display: flex; display: flex;
@ -2635,7 +2638,7 @@
} }
.fei-view-list span,.fei-view-list-z span{ .fei-view-list span,.fei-view-list-z span{
font-weight: bold; font-weight: bold;
font-size: 25rpx; font-size: 26rpx;
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
@ -3001,10 +3004,23 @@
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line{
height: 74rpx;
padding: 20rpx 0;
font-size: 30rpx;
display: flex;
justify-content: space-between;
}
.jusitify-line-end{ .jusitify-line-end{
height: 1px; height:1px;
border-bottom: 1px #f4f4f4 solid; border-bottom: 1px #e5e5e5 solid;
margin: 15px 0; margin: 30rpx 0;
}
.line-word{
color: #666;
}
.line-word-r{
color: #333;
} }
.prompt-text{ .prompt-text{
width: 100%; width: 100%;

27
my/order/payJaZ.vue
View File

@ -448,7 +448,6 @@
<view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view> <view class="be-remarks">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view> </view>
</view> </view>
</view> </view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="flex tabber padding-top-sm padding-bottom-sm align-center">
@ -503,20 +502,20 @@
</view> </view>
</view> </view>
<view class="showBtn-mian" v-else> <view class="showBtn-mian" v-else>
<view class="showBtn" style="justify-content: center;"> <view class="flex">
<view :custom-style="customStyle2" <u-button :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)" @click="goNav('/my/order/complain?ordersId='+ordersId + '&byUserId=' + order.artificer.userId + '&byuserName=' + order.artificer.artificerName)"
class="eject-btns"> class="btns">
去投诉 去投诉
</view> </u-button>
<view :custom-style="customStyle2" shape="circle" :plain="true" <u-button :custom-style="customStyle2" shape="circle" :plain="true"
@click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)" @click="goNav('/my/order/feedback?artificerId='+order.artificerId+ '&ordersId='+order.ordersMassageList[0].ordersId)"
class="eject-btns"> class="btns">
去评价 去评价
</view> </u-button>
<view shape="circle" :plain="true" @click="goChat" <u-button shape="circle" :plain="true" @click="goChat"
class="eject-btns">联系客服</view> class="btns">联系客服</u-button>
</view> </view>
</view> </view>
@ -699,7 +698,7 @@
}, },
customStyle2: { customStyle2: {
backgroundColor: '', backgroundColor: '',
color: '#FFFFFF', color: '#019C88',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
// #endif // #endif
@ -2108,7 +2107,7 @@
} }
.fei-view-list span,.fei-view-list-z span{ .fei-view-list span,.fei-view-list-z span{
font-weight: bold; font-weight: bold;
font-size: 25rpx; font-size: 26rpx;
} }
.fei-view-list-z{ .fei-view-list-z{
height: 65rpx; height: 65rpx;
@ -2252,7 +2251,7 @@
background: #f7f7f7; background: #f7f7f7;
} }
.jusitify-line{ .jusitify-line{
height: 78rpx; height: 74rpx;
padding: 20rpx 0; padding: 20rpx 0;
font-size: 30rpx; font-size: 30rpx;
display: flex; display: flex;
@ -2264,7 +2263,7 @@
margin: 30rpx 0; margin: 30rpx 0;
} }
.line-word{ .line-word{
color: #999; color: #666;
} }
.line-word-r{ .line-word-r{
color: #333; color: #333;