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

修改

This commit is contained in:
kbing1981 2024-07-17 11:35:45 +08:00
parent a7abc5551d
commit ff81695eb6
3 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
my/order/pay.vue
View File

@ -153,7 +153,7 @@
<view class="add-con-cont" >{{order.technicianRate}}%</view> <view class="add-con-cont" >{{order.technicianRate}}%</view>
</view> </view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;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 class="add-con-title">
小计： 小计：
</view> </view>
<view class="" style="color: #333;"> <view class="" style="color: #333;">
@ -200,7 +200,7 @@
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view> <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>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">出行费用：</view> <view class="add-con-title">出行费用：</view>
@ -281,7 +281,7 @@
<view class="add-con-cont" >{{order.technicianRate}}%</view> <view class="add-con-cont" >{{order.technicianRate}}%</view>
</view> --> </view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;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 class="add-con-title">
小计： 小计：
</view> </view>
<view class="" style="color: #333;"> <view class="" style="color: #333;">
@ -328,7 +328,7 @@
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">订单费用：</view> <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>
<view class="flex justify-between add-lin"> <view class="flex justify-between add-lin">
<view class="add-con-title">出行费用：</view> <view class="add-con-title">出行费用：</view>
@ -371,10 +371,10 @@
修改订单 修改订单
</u-button> --> </u-button> -->
<u-button @click="zhifu(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button @click="zhifu(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
class="dingshi">立即支付 class="btns">立即支付
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==2"> <view class="showBtn" v-if="order.status ==2">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"> <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
@ -385,35 +385,35 @@
:custom-style="customStyle2" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi"> class="btns">
修改订单 修改订单
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==3"> <view class="showBtn" v-if="order.status ==3">
<u-button :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="dingshi"> class="btns">
去评价 去评价
</u-button> </u-button>
<u-button :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="dingshi"> class="btns">
去投诉 去投诉
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==4"> <view class="showBtn" v-if="order.status ==4">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==5"> <view class="showBtn" v-if="order.status ==5">
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}"> <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> <view class="gengduo" @click.stop="gengBtn">更多</view>
@ -448,7 +448,7 @@
</view> </view>
<view class="showBtn-view" v-if="gengBtnShow==true" :style="gengNum==index?{display:'inline-block'}:{display:'none'}"> <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" <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 @click="cancelOrder(order)" shape="circle" class="btns" :hair-line="false">
取消订单 取消订单
</u-button> </u-button>
@ -461,7 +461,7 @@
<u-button :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="dingshi"> class="btns">
去投诉 去投诉
</u-button> </u-button>
@ -477,11 +477,11 @@
:custom-style="customStyle2" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi"> class="btns">
修改订单 修改订单
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==8"> <view class="showBtn" v-if="order.status ==8">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"
@ -493,25 +493,25 @@
:custom-style="customStyle2" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="dingshi"> class="btns">
修改订单 修改订单
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==9"> <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>
<u-button v-if="order.refusalContent" :custom-style="customStyle2" <u-button v-if="order.refusalContent" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="toggleQ('center',order)" @click="toggleQ('center',order)"
class="dingshi"> class="btns">
拒单详情 拒单详情
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn" v-if="order.status ==10"> <view class="showBtn" v-if="order.status ==10">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false" <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'" v-if="order.packageType=='104'||order.packageType=='105'||order.packageType=='106'"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)" @click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi"> class="btns">
立即预约 立即预约
</u-button> </u-button>
<u-button v-else :custom-style="customStyle2" <u-button v-else :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)" @click="goNav('/my/order/payModifyDd?ordersId='+order.ordersId,order)"
class="dingshi"> class="btns">
立即预约 立即预约
</u-button> </u-button>
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="dingshi">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
</view> </view>
<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
@ -2311,7 +2311,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.u-size-default{ /deep/.u-size-default{
width: 80px !important; width: 85px !important;
} }
/deep/.padding-bottom{ /deep/.padding-bottom{
padding-bottom: 20rpx; padding-bottom: 20rpx;
@ -2493,8 +2493,9 @@
flex-direction: column; flex-direction: column;
} }
/deep/.btns{ /deep/.btns{
background: #019C88 !important; border: 1rpx solid #e5e5e5 ;
color: #fff !important; color: #333333 !important;
margin-left: 10rpx !important;
} }
/deep/.u-size-default{ /deep/.u-size-default{
// margin: 5px 0px 0px 0px; // margin: 5px 0px 0px 0px;

50
my/order/payModifyDd.vue
View File

@ -108,10 +108,10 @@
</view> --> </view> -->
<view class="flex align-center justify-between" <view class="flex align-center justify-between"
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;"> 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 v-if="startTime">{{startTime}}</view>
<view class="tetx-sm" style="color:#999999; font-size: 30rpx;" v-else>请选择预约时间</view> <view class="tetx-sm" v-else>请选择预约时间</view>
<u-icon name="arrow-right" color="#999999"></u-icon> <span class="view-more"></span>
</view> </view>
</view> </view>
</view> </view>
@ -148,8 +148,9 @@
</view> </view>
<view class="push-button">
<view class="pay_btn" style="margin-top: 12px;" @click="openpay()">去支付</view> <view class="que-btn" @click="openpay()">去支付</view>
</view>
</view> </view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> --> <!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
@ -1334,6 +1335,11 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.tetx-sm{
color: #888888;
font-size: 30rpx;
margin-top: 10rpx;
}
.head-bottom{ .head-bottom{
width: 68%; width: 68%;
display: flex; display: flex;
@ -1535,7 +1541,7 @@
} }
.fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){ .fuwu-time-view span:nth-child(1),.liliao-bottom span:nth-child(1){
font-weight: 400; font-weight: 400;
font-size: 29rpx; font-size: 30rpx;
color: #888; color: #888;
} }
.fuwu-time-view,.liliao-top{ .fuwu-time-view,.liliao-top{
@ -1546,7 +1552,7 @@
} }
.fuwu-title,.liliao-top span:nth-child(1){ .fuwu-title,.liliao-top span:nth-child(1){
font-size: 29rpx; font-size: 29rpx;
color: #222222; color: #999999;
} }
.fuwu-time,.liliao{ .fuwu-time,.liliao{
width: 100%; width: 100%;
@ -1593,8 +1599,8 @@
} }
.header-view-text{ .header-view-text{
width: 170rpx; width: 170rpx;
font-size: 29rpx; font-size: 30rpx;
color: #222222; color: #999999;
} }
.header-view{ .header-view{
background-color: #fff; background-color: #fff;
@ -1989,17 +1995,27 @@
} }
.pay_btn { .push-button{
width: 96%; width: 100%;
margin-left: 2%; 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; text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px; height: 38px;
border-radius: 40px; border-radius: 28px;
color: #ffffff; color: #ffffff;
line-height: 40px; line-height: 38px;
font-size: 16px; margin-top: 4px;
position: fixed; font-size: 34rpx;
} }
.serverAddress { .serverAddress {

1
uview-ui/components/u-button/u-button.vue
View File

@ -377,7 +377,6 @@ export default {
} }
&--primary { &--primary {
color: #ffffff;
border-color: $u-type-primary; border-color: $u-type-primary;
background-color: $u-type-primary; background-color: $u-type-primary;
} }