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

修改

This commit is contained in:
kbing1981 2024-07-01 15:11:07 +08:00
parent d37076d00c
commit 2652079d95
3 changed files with 198 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
my/order/pay.vue
View File

@ -15,7 +15,7 @@
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
<view class="margin-right-xs u-skeleton-fillet head-title" style="font-size: 30rpx;">
{{order.ordersMassageList[0].massageType.title}}
</view>
<view class="zhuangtai">
@ -53,23 +53,23 @@
</view>
</view>
</view>
<view class="" style="background-color: #ffffff;border-radius: 24rpx;margin-top: 24rpx;padding: 29rpx;">
<view class="add-content">
<view class="" v-if="order.artificer">
<view class="flex align-center justify-between">
<view class="" style="color: #999;font-size: 26rpx;">下单人</view>
<view style="color: #333;font-size: 26rpx;">
<view class="flex align-center justify-between add-lin">
<view class="add-con-title">下单人</view>
<view class="add-con-cont">
{{order.userName}}
</view>
</view>
<view class="flex align-center justify-between" style="margin-top: 19rpx;">
<view class="" style="color: #999;font-size: 26rpx;">联系方式</view>
<view style="color: #333;font-size: 26rpx;">
<view class="flex align-center justify-between add-lin">
<view class="add-con-title">联系方式</view>
<view class="add-con-cont">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress">
<view style="color: #999;font-size: 26rpx;margin-top: 19rpx;">服务地址</view>
<view style="color: #333333;margin-top: 8rpx;font-size: 26rpx;width: 73%;">{{order.address}}</view>
<view class="serverAddress add-lin">
<view class="add-con-title">服务地址</view>
<view class="add-con-cont" style="width: 73%;">{{order.address}}</view>
</view>
</view>
</view>
@ -88,7 +88,7 @@
@click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
<view>{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':'资深'}}</view>
</view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right">
@ -102,54 +102,61 @@
</view>
</view>
<view class="list-pay">
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单信息</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)"
style="color: #333;font-size: 26rpx;">
<view class="justify-title-nav">
<view class="justify-title">订单信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">订单编号</view>
<view class="flex add-con-cont" @tap="copy(order.ordersNo)">
<view class="">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx; "></u-icon>
</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">预约时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.serveTime}}</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont" >{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.startTime">
<view class="add-con-title">开始服务时间</view>
<view class="add-con-cont">{{order.startTime}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTimes" >
<view class="add-con-title">结束服务时间</view>
<view class="add-con-cont">{{order.endTimes}}</view>
</view>
<view class="flex justify-between add-lin" v-if="order.endTime">
<view class="add-con-title">预估结束时间</view>
<view class="add-con-cont" >{{order.endTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">订单费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">下单时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.createTime}}</view>
</view>
<view class="flex justify-between" v-if="order.startTime" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">开始服务时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.startTime}}</view>
</view>
<view class="flex justify-between" v-if="order.endTimes" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">结束服务时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.endTimes}}</view>
</view>
<view class="flex justify-between" v-if="order.endTime" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #999;font-size: 26rpx;">预估结束时间</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.endTime}}</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">订单费用</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">项目名称</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.title}}</view>
<view class="add-con-title">项目名称</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.title}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">服务时长</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.ordersMassageList[0].massageType.duration}}分钟</view>
<view class="add-con-title">服务时长</view>
<view class="add-con-cont" >{{order.ordersMassageList[0].massageType.duration}}分钟</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">项目价格</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.massagePrice}}</view>
<view class="add-con-title">项目价格</view>
<view class="add-con-cont" >￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">会员折扣</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.vipRate}}%</view>
<view class="add-con-title">会员折扣</view>
<view class="add-con-cont" >{{order.vipRate}}%</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<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>
@ -159,8 +166,12 @@
</text>
</view>
</view>
<view class="jusitify-line-end"></view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">出行费用</view>
<view class="justify-title-nav">
<view class="justify-title">出行费用</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" v-if="order.tripWay" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 26rpx;">出行方式</view>
<view v-if="order.tripWay == 1">公交</view>
@ -171,22 +182,25 @@
<view style="color: #999;font-size: 26rpx;">全程距离</view>
<view class="" style="color: #333;font-size: 26rpx;">{{order.km}}km</view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin-bottom: 5px;">
<view class="flex justify-between" style="margin-top: 19rpx;padding-bottom:5px ;margin-bottom: 5px;">
<view style="color: #999;font-size: 26rpx;">出行费用</view>
<view class="" style="color: #333;font-size: 26rpx;">￥{{order.taxiMoney}}</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">优惠券信息</view>
<view class="flex justify-between" style="margin-top: 19rpx;border-bottom:1px solid #ccc;padding-bottom:5px ;margin: 5px 0px;">
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">优惠券信息</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between" style="margin-top: 19rpx;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #999;font-size: 26rpx;">优惠券</view>
<view class="" style="color: #F93731;font-size: 26rpx;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="" v-else>-</view>
</view>
<view style="font-size: 14px;font-weight: bold;margin-bottom: 10px;">费用明细</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav">
<view class="justify-title">费用明细</view>
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex align-center margin-top-lg justify-between">
<view style="color: #333;font-size: 26rpx;">订单费用：</view>
<view class="" style="color: #333;">￥<text
@ -213,7 +227,7 @@
</view>
<view class="flex justify-between" style="margin-top: 19rpx;">
<view style="color: #999;font-size: 12px;">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
<view class="prompt-text">温馨提示：费用随会员等级及技师等级不同而上下浮动</view>
</view>
</view>
</view>
@ -331,6 +345,7 @@
<view class="showBtn-mian">
<view class="showBtn">
<view class="gengduo" @click.stop="gengBtn">更多</view>
<view class="show-btn-lin">
<u-button shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button>
<u-button
@ -340,6 +355,13 @@
class="btns">
提前结束
</u-button>
<u-button
v-if="order.status == 6"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
充值
</u-button>
<u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent" :custom-style="customStyle1"
shape="circle" :plain="true"
@ -348,14 +370,9 @@
修改订单
</u-button>
</view>
</view>
<view class="showBtn-view" v-show="btnShow">
<u-button
v-if="order.status == 6"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId)"
class="btns">
充值
</u-button>
<u-button
v-if="order.addNum ==null && order.status == 6"
shape="circle" :plain="true"
@ -1735,7 +1752,7 @@
flex-direction: row;
justify-content: space-between;
align-items: center;
margin-top: 10px;
margin-top: 28px;
}
.popup-mian-textarea{
width: 525.69rpx;
@ -1755,7 +1772,7 @@
font-size: 24px;
color: #15AB8D;
border-radius: 50%;
border: 3px solid #15AB8D;
border: 1px solid #15AB8D;
}
.popup-head span:nth-child(1){
font-weight: bold;
@ -1776,7 +1793,7 @@
width: 613rpx;
height: 479rpx;
background: #FFFFFF;
border-radius: 56rpx;
border-radius: 36rpx;
display: flex;
flex-direction: column;
}
@ -1799,13 +1816,17 @@
font-weight: 400;
font-size: 25rpx;
color: #7D7D7D;
margin-left: 20rpx;
}
.showBtn-view{
width: 100%;
justify-content: flex-end;
display: flex;
flex-direction: row;
flex-direction: column;
align-items: center;
position: absolute;
background-color: #fff;
padding: 10px;
margin-bottom: 50px;
left:0
}
.showBtn,.hideBtn{
width: 100%;
@ -1904,15 +1925,15 @@
}
.list-pay{
width: 100%;
padding: 0px 29rpx;
padding:0 15px 15px 29rpx;
}
.pay-ding-top{
width: 100%;
height: 80rpx;
background-image: linear-gradient(to bottom, rgba(8, 162, 138, 0.5), #fff);
border-top-left-radius: 24rpx;
border-top-right-radius: 24rpx;
padding: 0px 29rpx;
height: 50px;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px;
border-top-right-radius: 12px;
padding: 0px 14px;
}
.pay-ding,.feiuong{
background-color: #ffffff;
@ -1926,8 +1947,9 @@
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;
@ -1948,7 +1970,7 @@
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-size: 36rpx;
font-weight: bold;
}
.money-pay-zhen{
@ -1975,9 +1997,10 @@
}
.pay-title{
font-weight: bold;
font-size: 28rpx;
font-size: 32rpx;
color: #333333;
margin-bottom: 5px;
margin-bottom: 22rpx;
}
page {
background: #f7f7f7;
@ -2109,7 +2132,7 @@
.tabber {
width: 100%;
background: #ffffff;
background: #fff;
position: fixed;
bottom: 0;
left: 0;
@ -2156,4 +2179,67 @@
justify-content: space-between;
align-items: center;
}
.add-content{
background: #fff;
padding: 34rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.add-lin{
height: 80rpx;
line-height: 80rpx;
}
.add-con-title{
color: #999;
font-size: 28rpx;
}
.add-con-cont{
color: #666;
font-size: 28rpx;
}
.level_button{
padding: 5rpx 20rpx;
background: linear-gradient(to right, #fe9130, #ff9869);
border-radius: 8rpx 20rpx 8rpx 20rpx;
color: #fff;
}
.justify-title-nav{
width: 90%;
display: flex;
flex-direction: column;
position: relative;
margin: 10px 0;
}
.justify-title-nav-bor{
width: 64px;
height: 5px;
border-radius: 3px;
position: absolute;
bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
}
.justify-title{
font-weight: bold;
font-size: 32rpx;
color: #333;
}
.jusitify-line-end{
height: 1px;
border-bottom: 1px #f4f4f4 solid;
margin: 15px 0;
}
.prompt-text{
width: 100%;
padding: 4px 7px;
border: #FE912E 1px dashed;
color: #fe912E;
border-radius: 5px;
font-size: 12px;
margin-top: 15px;
}
.show-btn-lin{
width: 86%;
display: flex;
justify-content: space-between;
}
</style>

2
my/wallet/index.vue
View File

@ -1332,7 +1332,7 @@
}
.amount-balance{
padding: 15rpx;
background: linear-gradient(to right, #fff5eb, #fbe3d2);
background:#ffe1d4;
border-radius:10rpx;
display: flex;
justify-content: space-between;

15
pages/order/index.vue
View File

@ -37,7 +37,7 @@
<view class="u-m-r-10">
<u-avatar
:src="(item.ordersMassageList && item.ordersMassageList.length > 0 && item.ordersMassageList[0].massageType && item.ordersMassageList[0].massageType.massageImg)?item.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
mode="square" size="100" style="height: 132rpx;width: 132rpx;flex: 0 0 132rpx;">
mode="square" size="100" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;">
</u-avatar>
</view>
<view class="u-flex-1" style="margin-left: 20rpx;">
@ -713,6 +713,7 @@
align-items: center;
flex-wrap: wrap;
justify-content: flex-end;
margin: 30rpx 0;
}
.popup-mian-btn span:nth-child(1){
@ -786,17 +787,16 @@
background: #fff !important;
// border: 1px solid #d7d7d7 !important;
color: #d7d7d7 !important;
width: 131rpx !important;
width: 145rpx !important;
height: 47rpx !important;
line-height: 47px !important;
border-radius: 23rpx !important;
margin: 0px !important;
}
/deep/.btns{
background: #fff !important;
// border: 1px solid #019C88 !important;
color: #019C88 !important;
width: 131rpx !important;
width: 145rpx !important;
height: 47rpx !important;
line-height: 47px !important;
border-radius: 23rpx !important;
@ -807,6 +807,13 @@
color: #7D7D7D;
margin-right: 10px;
}
.text-green span:nth-child(2){
font-weight: 400;
font-size: 25rpx;
color: #019c88;
margin-right: 10px;
font-weight: bold;
}
/deep/.margin-top-sm{
margin-top: 3px;
}