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

订单页面调整

This commit is contained in:
曹磊 2024-07-22 23:50:15 +08:00
parent 47399a7647
commit fd95ca0fca
6 changed files with 3477 additions and 3233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

236
my/order/pay.vue
View File

@ -12,8 +12,8 @@
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="order.ordersMassageList[0].massageType.massageImg" <image :src="order.ordersMassageList[0].massageType.massageImg"
v-if="order.userPackageDetailId==null" style="width: 100%;height: 100%;border-radius: 19upx;"></image> v-if="order.userPackageDetailId==null" style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image :src="order.ordersMassageList[0].userPackageDetail.massageImg" <image :src="order.ordersMassageList[0].userPackageDetail.massageImg" v-else
v-else style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
@ -35,7 +35,7 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text> <text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view> </view>
@ -83,9 +83,7 @@
<image :src="order.artificer.artificerImg" class="d-touxiang"></image> <image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm" style="width: 90%;"> <view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 100%;justify-content: space-between;"> <view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title"> <view class="d-title"><span>{{order.artificer.artificerName}}</span></view>
<span>{{order.artificer.artificerName}}</span>
</view>
<!-- <image <!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;" src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
@ -94,7 +92,7 @@
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
<view class="level_button">{{order.technicianTypeName}}</view> <view class="level_button">{{order.technicianTypeName}}</view>
</view> </view>
<view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount"> <!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;"> <image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
</image> </image>
@ -102,7 +100,7 @@
style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text> style="color: #F93731;margin-left: 5rpx;">{{order.artificer.ordersCount}}</text>
</view> </view>
<text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text> <text class="margin-bottom-xs box" style="margin-right: 10upx;">健康技师</text>
</view> </view> -->
</view> </view>
</view> </view>
<!-- 普通项目信息 --> <!-- 普通项目信息 -->
@ -119,7 +117,6 @@
</view> </view>
</view> </view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">预约时间</view> <view class="line-word title-font">预约时间</view>
<view class="line-word-r value-font">{{order.serveTime}}</view> <view class="line-word-r value-font">{{order.serveTime}}</view>
@ -129,7 +126,6 @@
<view class="line-word-r value-font">{{order.createTime}}</view> <view class="line-word-r value-font">{{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>
@ -157,13 +153,10 @@
<view class="flex align-center jusitify-line" style="justify-content: flex-end;"> <view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view> <view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;"> <view class="value-font" style="font-weight: bold;">
<text> <text>￥{{order.massageMoney}}</text>
￥{{order.massageMoney}}
</text>
</view> </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>
@ -189,8 +182,9 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
<view class="value-font" v-else>-</view> -￥{{order.couponMoney}}</view>
<view class="value-font value-font" 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">
@ -199,12 +193,13 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view> <view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view> <view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view> <view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view> <view class="line-word title-font">优惠券</view>
@ -252,8 +247,11 @@
<view class="justify-title-nav-bor"></view> <view class="justify-title-nav-bor"></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称</view> <view class="line-word title-font">
<view class="line-word-r value-font">{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view> {{order.packageType=='104'?'套餐':order.packageType=='105'?'次卡':order.packageType=='106'?'疗程':'其他'}}名称
</view>
<view class="line-word-r value-font">
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}</view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目名称</view> <view class="line-word title-font">项目名称</view>
@ -265,19 +263,19 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目价格</view> <view class="line-word title-font">项目价格</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">应付金额</view>
<view class="line-word-r value-font">￥{{order.massagePrice}}</view> <view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="flex align-center jusitify-line" style="justify-content: flex-end;"> <view class="line-word title-font">实付金额：</view>
<view class="line-word title-font">小计：</view> <view class="line-word-r value-font" style="font-weight: bold;">
<view class="value-font" style="font-weight: bold;"> ￥<text>0</text>
<text>
￥{{order.massagePrice}}
</text>
</view> </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>
@ -296,16 +294,17 @@
<view class="line-word title-font">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
</view> </view>
<view class="jusitify-line-end jusitify-line"></view> <!-- <view class="jusitify-line-end jusitify-line"></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 jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-￥{{order.couponMoney}}</view>
<view class="value-font" v-else>-</view> <view class="value-font" 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>
@ -313,23 +312,24 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view> <view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.massageMoney}}</text></view> <view class="add-con-cont value-font"><text style="font-weight: bold;">￥0</text></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view> <view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text style="font-weight: bold;">￥{{order.taxiMoney}}</text></view> <view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view> </view>
<view class="flex justify-between jusitify-line"> <!-- <view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney"> <view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view> -<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view> <view class="value-font" v-else>-</view>
</view> </view> -->
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计：</view> <view class="line-word title-font">合计：</view>
<view class="value-font"> <view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;"> <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
￥{{order.payMoneyTotal}} ￥{{order.taxiMoney}}
</text> </text>
</view> </view>
</view> </view>
@ -359,12 +359,8 @@
<u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false"> <u-button @click="cancelOrder(order)" :custom-style="customStyle" shape="circle" :hair-line="false">
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button v-if="order.btnShow == 'true'" :custom-style="customStyle2" shape="circle" :plain="true"
v-if="order.btnShow == 'true'" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" class="btns">
:custom-style="customStyle2"
shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
class="btns">
修改订单 修改订单
</u-button> </u-button>
@ -377,8 +373,7 @@
class="btns"> 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="btns"> class="btns">
去投诉 去投诉
@ -394,50 +389,41 @@
<u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" <u-button :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat"
class="btns">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn tabber" v-if="order.status==6" :style="{'justify-content':order.status ==6||order.status ==1?'space-between':'flex-end'}"> <view class="showBtn tabber" 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>
<view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end"> <view style="display: flex;flex-direction: row;align-items: center;justify-content: flex-end">
<u-button <u-button shape="circle" :plain="true" @click="toggle('center',order)" class="btns">
shape="circle" :plain="true"
@click="toggle('center',order)"
class="btns">
提前结束 提前结束
</u-button> </u-button>
<u-button v-if="order.isSupplement!=2" <u-button v-if="order.isSupplement!=2" shape="circle" :plain="true"
shape="circle" :plain="true" @tap="saveJZS(order.artificerId)" class="btns">
@tap="saveJZS(order.artificerId)"
class="btns">
服务升级 服务升级
</u-button> </u-button>
<u-button <u-button v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" shape="circle"
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" :plain="true" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" class="btns">
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns">
加钟 加钟
</u-button> </u-button>
<u-button <u-button v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail" shape="circle"
v-if="order.addNum ==null&&order.ordersMassageList[0].userPackageDetail" :plain="true" @tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].userPackageDetail.massageTypeId)"
class="btns"> class="btns">
加钟 加钟
</u-button> </u-button>
</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"
<view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" :style="gengNum==index?{display:'inline-block'}:{display:'none'}">
class="eject-btns">联系客服</view> <view :custom-style="customStyle2" shape="circle" :plain="true" @click="goChat" class="eject-btns">
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns" :hair-line="false"> 联系客服</view>
<view :custom-style="customStyle2" @click="cancelOrder(order)" shape="circle" class="eject-btns"
:hair-line="false">
取消订单 取消订单
</view> </view>
<view <view shape="circle" :plain="true"
shape="circle" :plain="true"
@click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)" @click="goNav('/my/wallet/index?artificerId='+order.artificerId+'&ordersId='+order.ordersId,)"
class="eject-btns"> class="eject-btns">
充值 充值
</view> </view>
<view :custom-style="customStyle2" <view :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="eject-btns">
去投诉 去投诉
@ -461,7 +447,7 @@
class="btns">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn tabber" v-if="order.status ==8"> <view class="showBtn tabber" v-if="order.status ==8">
<u-button class="btns" @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"> <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
取消订单 取消订单
</u-button> </u-button>
<u-button <u-button
@ -489,7 +475,7 @@
class="btns">联系客服</u-button> class="btns">联系客服</u-button>
</view> </view>
<view class="showBtn tabber" v-if="order.status ==10"> <view class="showBtn tabber" v-if="order.status ==10">
<u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false"S> <u-button @click="cancelOrder(order)" shape="circle" :custom-style="customStyle" :hair-line="false">
取消订单 取消订单
</u-button> </u-button>
<u-button :custom-style="customStyle2" <u-button :custom-style="customStyle2"
@ -804,8 +790,7 @@ export default {
this.openWay = 2; this.openWay = 2;
// #endif // #endif
}, },
mounted() { mounted() {},
},
methods: { methods: {
zhifu() { //立即支付 zhifu() { //立即支付
this.showpayL = true this.showpayL = true
@ -1414,9 +1399,10 @@ export default {
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
massageTypeId: that.order.massageTypeId, massageTypeId: that.order.massageTypeId,
// userPackageDetailId:that.order.userPackageDetailId, // userPackageDetailId:that.order.userPackageDetailId,
ordersMassageList:[ ordersMassageList: [{
{massageId: item.massageTypeId,num: 1}, massageId: item.massageTypeId,
], num: 1
}, ],
} }
that.$Request.postJson("/app/artificer/updateOrders", data).then(res => { that.$Request.postJson("/app/artificer/updateOrders", data).then(res => {
that.showorder = false that.showorder = false
@ -1887,11 +1873,13 @@ export default {
if (that.jiazhong == '加钟') { if (that.jiazhong == '加钟') {
uni.navigateTo({ uni.navigateTo({
url:'/my/order/payJaZ?ordersId='+that.order.ordersId url: '/my/order/payJaZ?ordersId=' + that.order
.ordersId
}) })
} else if (that.shengji == '升级') { } else if (that.shengji == '升级') {
uni.navigateTo({ uni.navigateTo({
url:'/my/order/payShengji?ordersId='+that.tordersId url: '/my/order/payShengji?ordersId=' + that
.tordersId
}) })
} }
@ -2336,13 +2324,13 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.u-size-default { /deep/.u-size-default {
width: 85px !important; width: 85px !important;
height: 34rpx; height: 34rpx;
line-height: 34rpx; line-height: 34rpx;
font-size: 28rpx; font-size: 28rpx;
} }
/deep/.padding-bottom { /deep/.padding-bottom {
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
@ -2350,12 +2338,14 @@ export default {
/deep/.u-drawer { /deep/.u-drawer {
z-index: 11 !important; z-index: 11 !important;
} }
.xiangmu-cont-top-left { .xiangmu-cont-top-left {
font-weight: normal; font-weight: normal;
font-size: 23rpx; font-size: 23rpx;
color: #049E89; color: #049E89;
margin-top: 1px; margin-top: 1px;
} }
.xiangmu-cont-top-time { .xiangmu-cont-top-time {
width: 100%; width: 100%;
display: flex; display: flex;
@ -2363,6 +2353,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.xiadan { .xiadan {
width: 122rpx; width: 122rpx;
height: 48rpx; height: 48rpx;
@ -2374,30 +2365,37 @@ export default {
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.xiangmu-foot-left { .xiangmu-foot-left {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-end; align-items: flex-end;
} }
.xiangmu-foot-left-shiji span { .xiangmu-foot-left-shiji span {
color: #F95900; color: #F95900;
} }
.xiangmu-foot-left-shiji span:nth-child(1) { .xiangmu-foot-left-shiji span:nth-child(1) {
font-size: 25rpx; font-size: 25rpx;
} }
.xiangmu-foot-left-shiji span:nth-child(2) { .xiangmu-foot-left-shiji span:nth-child(2) {
font-weight: bold; font-weight: bold;
font-size: 36.81rpx; font-size: 36.81rpx;
} }
.xiangmu-foot-left-shiji span:nth-child(3) { .xiangmu-foot-left-shiji span:nth-child(3) {
font-size: 25rpx; font-size: 25rpx;
} }
.xiangmu-foot-left-dazhe { .xiangmu-foot-left-dazhe {
font-size: 30rpx; font-size: 30rpx;
color: #848484; color: #848484;
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.xiangmu-foot { .xiangmu-foot {
width: 100%; width: 100%;
display: flex; display: flex;
@ -2405,6 +2403,7 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.xiangmu-about { .xiangmu-about {
width: 100%; width: 100%;
text-align: left; text-align: left;
@ -2418,6 +2417,7 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 5px 0px; margin: 5px 0px;
} }
.xiangmu-cont-top-title { .xiangmu-cont-top-title {
font-weight: bold; font-weight: bold;
font-size: 33rpx; font-size: 33rpx;
@ -2429,18 +2429,21 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.xiangmu-cont { .xiangmu-cont {
width: 55%; width: 55%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.xiangmu-img { .xiangmu-img {
width: 285rpx; width: 285rpx;
height: 218rpx; height: 218rpx;
background: #9F9F9F; background: #9F9F9F;
border-radius: 14rpx; border-radius: 14rpx;
} }
.xiangmu { .xiangmu {
width: 95%; width: 95%;
height: 263rpx; height: 263rpx;
@ -2457,9 +2460,11 @@ export default {
.popup-mian-btn span:nth-child(1) { .popup-mian-btn span:nth-child(1) {
background: linear-gradient(90deg, #FE912E, #FF9970); background: linear-gradient(90deg, #FE912E, #FF9970);
} }
.popup-mian-btn span:nth-child(2) { .popup-mian-btn span:nth-child(2) {
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
} }
.popup-mian-btn span { .popup-mian-btn span {
width: 247rpx; width: 247rpx;
height: 77rpx; height: 77rpx;
@ -2470,6 +2475,7 @@ export default {
color: #FFFEFE; color: #FFFEFE;
border-radius: 39rpx; border-radius: 39rpx;
} }
.popup-mian-btn { .popup-mian-btn {
width: 100%; width: 100%;
display: flex; display: flex;
@ -2478,25 +2484,30 @@ export default {
align-items: center; align-items: center;
margin-top: 28px; margin-top: 28px;
} }
.popup-mian-textarea { .popup-mian-textarea {
width: 525.69rpx; width: 525.69rpx;
height: 211.81rpx; height: 211.81rpx;
} }
.popup-mian { .popup-mian {
width: 88%; width: 88%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 5px auto 0px auto; margin: 5px auto 0px auto;
} }
.popup-head span:nth-child(2) { .popup-head span:nth-child(2) {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
} }
.popup-head span:nth-child(1) { .popup-head span:nth-child(1) {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.popup-head { .popup-head {
width: 100%; width: 100%;
height: 99.38rpx; height: 99.38rpx;
@ -2507,6 +2518,7 @@ export default {
justify-content: space-between; justify-content: space-between;
padding: 0 15px; padding: 0 15px;
} }
.popup-content { .popup-content {
width: 613rpx; width: 613rpx;
height: 479rpx; height: 479rpx;
@ -2515,12 +2527,14 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
/deep/.btns { /deep/.btns {
color: #019C88 !important; color: #019C88 !important;
margin-left: 10rpx !important; margin-left: 10rpx !important;
height:70rpx; height:70rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.eject-btns { .eject-btns {
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
@ -2528,6 +2542,7 @@ export default {
padding: 0 20rpx; padding: 0 20rpx;
color: #666666; color: #666666;
} }
/deep/.u-size-default { /deep/.u-size-default {
// margin: 5px 0px 0px 0px; // margin: 5px 0px 0px 0px;
} }
@ -2540,12 +2555,14 @@ export default {
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-end; justify-content: flex-end;
} }
.gengduo { .gengduo {
font-weight: 400; font-weight: 400;
font-size: 28rpx; font-size: 28rpx;
color: #7D7D7D; color: #7D7D7D;
margin-left: 26rpx; margin-left: 26rpx;
} }
.showBtn-view { .showBtn-view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -2558,6 +2575,7 @@ export default {
box-shadow: 0px 0px 3px 0px #b5b5b5; box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius: 10rpx; border-radius: 10rpx;
} }
.showBtn-view:before { .showBtn-view:before {
position: absolute; position: absolute;
left: 20rpx; left: 20rpx;
@ -2572,6 +2590,7 @@ export default {
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
content: ''; content: '';
} }
.showBtn { .showBtn {
width: 100%; width: 100%;
display: flex; display: flex;
@ -2580,6 +2599,7 @@ export default {
justify-content: center; justify-content: center;
margin-top: 20rpx; margin-top: 20rpx;
} }
.hideBtn { .hideBtn {
width: 100%; width: 100%;
display: flex; display: flex;
@ -2594,11 +2614,13 @@ export default {
.dingshi { .dingshi {
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
} }
.zhuangtai { .zhuangtai {
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
} }
.head-title-right { .head-title-right {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -2606,23 +2628,30 @@ export default {
justify-content: space-between; justify-content: space-between;
} }
.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: 25rpx;
} }
.fei-view-list-z { .fei-view-list-z {
height: 65rpx; height: 65rpx;
border-top: 1px solid #f3f3f3; border-top: 1px solid #f3f3f3;
padding-top: 20rpx; padding-top: 20rpx;
font-weight: bold; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
.fei-view-list span:nth-child(1),
.fei-view-list-z span:nth-child(1) {
color: #666666; color: #666666;
} }
.fei-view-list span:nth-child(2) { .fei-view-list span:nth-child(2) {
color: #333333; color: #333333;
} }
.fei-view-list,.fei-view-list-z{
.fei-view-list,
.fei-view-list-z {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -2630,11 +2659,13 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-top: 5px; margin-top: 5px;
} }
.fei-view { .fei-view {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.fei-title { .fei-title {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -2645,23 +2676,28 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
.feiuong { .feiuong {
padding: 29rpx; padding: 29rpx;
} }
/deep/.uni-textarea-textarea { /deep/.uni-textarea-textarea {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
} }
/deep/.uni-textarea-placeholder { /deep/.uni-textarea-placeholder {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
color: #C5C5C5; color: #C5C5C5;
} }
.textarea-pay-list { .textarea-pay-list {
width: 100%; width: 100%;
height: 126rpx; height: 126rpx;
margin-top: 10px; margin-top: 10px;
} }
.textarea-pay { .textarea-pay {
background-color: #f3f3f3; background-color: #f3f3f3;
width: 100%; width: 100%;
@ -2670,11 +2706,13 @@ export default {
border-radius: 14rpx; border-radius: 14rpx;
padding: 7px; padding: 7px;
} }
.list-pay { .list-pay {
width: 100%; width: 100%;
padding: 10rpx 29rpx; padding: 10rpx 29rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.pay-ding-top { .pay-ding-top {
width: 100%; width: 100%;
height: 100rpx; height: 100rpx;
@ -2683,27 +2721,33 @@ export default {
border-top-right-radius: 24rpx; border-top-right-radius: 24rpx;
padding: 0px 29rpx; padding: 0px 29rpx;
} }
.pay-ding,.feiuong{
.pay-ding,
.feiuong {
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
// padding: 29rpx; // padding: 29rpx;
} }
.phone-pay { .phone-pay {
width: 49rpx; width: 49rpx;
height: 44rpx; height: 44rpx;
} }
.d-title { .d-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.d-touxiang { .d-touxiang {
width: 55rpx; width: 55rpx;
height: 55rpx; height: 55rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #f2fffd; border: 1px solid #f2fffd;
} }
.money-pay-jia { .money-pay-jia {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
@ -2711,38 +2755,45 @@ export default {
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span { .money-pay-zhen span {
color: #FF6000; color: #FF6000;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen { .money-pay-zhen {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.money-pay { .money-pay {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.head-top { .head-top {
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 29rpx; padding: 29rpx;
} }
.content { .content {
padding-top: 20px; padding-top: 20px;
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.pay-title { .pay-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 12px; margin-bottom: 12px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
} }
@ -2922,26 +2973,31 @@ page {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.add-content { .add-content {
background: #fff; background: #fff;
padding: 30rpx; padding: 30rpx;
border-radius: 24rpx; border-radius: 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
} }
.add-lin { .add-lin {
height: 74rpx; height: 74rpx;
line-height: 74rpx; line-height: 74rpx;
} }
.add-con-title { .add-con-title {
color: #999; color: #999;
font-size: 30rpx; font-size: 30rpx;
} }
.add-con-cont { .add-con-cont {
color: #666; color: #666;
font-size: 30rpx; font-size: 30rpx;
line-height: 74rpx; line-height: 74rpx;
text-align: right; text-align: right;
} }
.level_button { .level_button {
padding: 4rpx 20rpx; padding: 4rpx 20rpx;
background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f); background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
@ -2950,6 +3006,7 @@ page {
font-size: 12px; font-size: 12px;
border: 1px solid #fd967c; border: 1px solid #fd967c;
} }
.justify-title-nav { .justify-title-nav {
width: 90%; width: 90%;
display: flex; display: flex;
@ -2957,6 +3014,7 @@ page {
position: relative; position: relative;
margin: 10px 0; margin: 10px 0;
} }
.justify-title-nav-bor { .justify-title-nav-bor {
width: 64px; width: 64px;
height: 5px; height: 5px;
@ -2965,21 +3023,25 @@ page {
bottom: 0; bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
} }
.justify-title { .justify-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line { .jusitify-line {
height: 78rpx; height: 78rpx;
padding: 20rpx 0; padding: 20rpx 0;
font-size: 30rpx; font-size: 30rpx;
} }
.jusitify-line-end { .jusitify-line-end {
height: 1px; height: 1px;
border-bottom: 1px #e5e5e5 solid; border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0; margin: 30rpx 0;
} }
.prompt-text { .prompt-text {
width: 100%; width: 100%;
padding: 4px 7px; padding: 4px 7px;
@ -2988,20 +3050,24 @@ page {
border-radius: 5px; border-radius: 5px;
font-size: 12px; font-size: 12px;
} }
.show-btn-lin { .show-btn-lin {
width: 86%; width: 86%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.head-title { .head-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.title-font { .title-font {
font-size: 30rpx; font-size: 30rpx;
color: #666666; color: #666666;
} }
.value-font { .value-font {
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;

15
my/order/payModify.vue
View File

@ -1811,21 +1811,6 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold;
}
.money-pay-zhen{
display: flex;
flex-direction: row;
align-items: center;
}
.money-pay{ .money-pay{
width: 100%; width: 100%;
display: flex; display: flex;

134
my/order/payModifyDd.vue
View File

@ -3,14 +3,14 @@
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;"> <view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
<view class="head-top"> <view class="head-top">
<view class="pay-title" style="">服务项目</view> <view class="pay-title">服务项目</view>
<view class="flex"> <view class="flex">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image :src="(orderXm.ordersMassageList && orderXm.ordersMassageList.length > 0 && orderXm.ordersMassageList[0].massageType && orderXm.ordersMassageList[0].massageType.massageImg)?orderXm.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'" <image :src="(orderXm.ordersMassageList && orderXm.ordersMassageList.length > 0 && orderXm.ordersMassageList[0].massageType && orderXm.ordersMassageList[0].massageType.massageImg)?orderXm.ordersMassageList[0].massageType.massageImg: '../../static/logo.png'"
style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view> </view>
<view class="head-bottom margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title"> <view class="margin-right-xs text-df u-skeleton-fillet head-title">
{{orderXm.entryName}} {{orderXm.entryName}}
@ -19,14 +19,14 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{orderXm.duration}}分钟 <text class="title-font">服务时长：</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view> </view>
</view> </view>
<view class="money-pay"> <view class="money-pay">
<view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null"> <view class="money-pay-zhen" v-if="orderXm.userPackageDetailId==null">
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span v-if="jishiName!=null||jishiName==''"> <span v-if="jishiName!=null||jishiName==''">
{{technicianRate}} {{technicianRate}}
@ -34,6 +34,7 @@
<span v-else>{{orderXm.priceMarkup}}</span> <span v-else>{{orderXm.priceMarkup}}</span>
</view> </view>
<view class="money-pay-zhen" v-else> <view class="money-pay-zhen" v-else>
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{orderXm.priceMarkup}}</span> <span>{{orderXm.priceMarkup}}</span>
</view> </view>
@ -46,25 +47,26 @@
</view> </view>
</view> </view>
</view> </view>
<view class="padding margin-top-sm header-view"> </view>
<view class="header-view header-padd header-margin">
<view v-if="!detailaddress">请选择地址</view> <view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs"> <view class="margin-right-xs">
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">联系人</view> <view class="line-word title-font">客户姓名</view>
<view class="line-word-r"> <view class="line-word-r value-font">
<text>{{name}}</text> <text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text> <text class="xuanzhe" @click="getAddressList()">更换</text>
</view> </view>
</view> </view>
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word">手机号码</view> <view class="line-word title-font">联系方式</view>
<view class="line-word-r"> <view class="line-word-r value-font">
{{mobile}} {{mobile}}
</view> </view>
</view> </view>
<view class="jusitify-line" style="align-items: center;"> <view class="jusitify-line" style="align-items: center;">
<view class="line-word">详细地址</view> <view class="line-word title-font">服务地址</view>
<view class="line-word-r" style="width: 73%; text-align: right;"> <view class="line-word-r value-font" style="width: 75%; text-align: right;">
<span> <span>
{{province}}/{{city}}/{{district}}/{{detailaddress}} {{province}}/{{city}}/{{district}}/{{detailaddress}}
</span> </span>
@ -80,34 +82,45 @@
</view> --> </view> -->
</view> </view>
</view> </view>
<view class="padding margin-top-sm header-view"> <view class="header-view header-padd header-margin">
<view class="jusitify-line" @click="liliaoshi(orderXm)"> <view class="jusitify-line" @click="liliaoshi(orderXm)">
<view class="line-word" > <view class="line-word title-font">
<span>技师</span> <span>技师</span>
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span> <span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
</view> </view>
<view> <view>
<span class="line-word-r" v-if="jishiName">{{jishiName.artificerName}}</span> <span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
<span class="line-word-r" v-else>选择不同技师价格可能不一样哦~</span> <span class="line-word-r value-font" v-else>选择不同等级的技师价格不同哦~</span>
<span class="view-more"></span> <span class="view-more"></span>
</view> </view>
</view> </view>
<view v-if="orderXm.userPackageDetailId==null">
<view class="jusitify-line" v-if="jishiName"> <view class="jusitify-line" v-if="jishiName">
<view class="line-word" > <view class="line-word title-font">
<span >项目原价</span> <span >项目原价</span>
</view> </view>
<view > <view >
<span class="line-word-r">￥{{orderXm.price}}</span> <span class="line-word-r value-font">￥{{orderXm.price}}</span>
</view> </view>
</view> </view>
<view class="jusitify-line" v-if="jishiName"> <view class="jusitify-line" v-if="jishiName">
<view class="line-word" > <view class="line-word title-font">
<span>{{jishiName.technicianTypeName}}</span> <span>{{jishiName.technicianTypeName}}</span>
<span >价格</span> <span >价格</span>
</view> </view>
<view > <view >
<span class="line-word-r" style="color: #FF6000">￥{{technicianRate}}</span> <span class="line-word-r value-font" style="color: #019c88">￥{{technicianRate}}</span>
</view>
</view>
</view>
<view v-else>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word title-font">
<span >项目价格</span>
</view>
<view >
<span class="line-word-r value-font">￥{{orderXm.price}}</span>
</view>
</view> </view>
</view> </view>
<!-- <view class="liliao"> <!-- <view class="liliao">
@ -121,7 +134,7 @@
</view> </view>
</view> --> </view> -->
<view class="jusitify-line"> <view class="jusitify-line">
<view class="line-word"> <view class="line-word title-font">
服务时间 服务时间
</view> </view>
<!-- <view class="fuwu-time-view" @change="changeLog"> <!-- <view class="fuwu-time-view" @change="changeLog">
@ -129,20 +142,19 @@
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image> <image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
</view> --> </view> -->
<view> <view>
<view class="line-word-r" @click="openData()" style="align-items: center;"> <view class="line-word-r value-font" @click="openData()" style="align-items: center;">
<view v-if="startTime">{{startTime}}</view> <view v-if="startTime">{{startTime}}</view>
<view class="line-word-r" v-else>请选择预约时间<span class="view-more"></span></view> <view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="margin-top-xl pay-ding"> <view class="header-view header-padd header-margin">
<view class="d-title">备注</view> <view class="d-title title-font">备注</view>
<view class="list-pay"> <view class="list-pay">
<view class="textarea-pay-list"> <view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea> <textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="margin-top-xl pay-ding"> <!-- <view class="margin-top-xl pay-ding">
@ -165,7 +177,6 @@
<uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox> <uni-data-checkbox v-model="radio1" :localdata="sex"></uni-data-checkbox>
</view> </view>
</view> --> </view> -->
</view>
<view class="push-button"> <view class="push-button">
@ -1395,12 +1406,7 @@
} }
.money-pay-zhen span{ .money-pay-zhen span{
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen{ .money-pay-zhen{
@ -1609,8 +1615,12 @@
color: #ffffff; color: #ffffff;
margin-left: 5px; margin-left: 5px;
border-radius: 15px; border-radius: 15px;
padding: 3px 8px; height: 25px;
font-size: 13px; line-height: 25px;
width: 50px;
text-align: center;
font-size: 14px;
padding:6rpx 16rpx
} }
.header-view-data{ .header-view-data{
display: flex; display: flex;
@ -1639,14 +1649,19 @@
} }
.header-view-text{ .header-view-text{
width: 170rpx; width: 170rpx;
font-size: 30rpx; font-size: 29rpx;
color: #999999; color: #222222;
} }
.header-view{ .header-view{
background-color: #fff; background-color: #fff;
margin-bottom: 10px;
border-radius: 11px; border-radius: 11px;
} }
.header-padd{
padding: 36rpx;
}
.header-margin{
margin: 26rpx;
}
.head-foot span:nth-child(1){ .head-foot span:nth-child(1){
margin-right: 5px; margin-right: 5px;
} }
@ -1717,6 +1732,7 @@
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 29rpx; padding: 29rpx;
margin-top: 10px;
} }
.d-title{ .d-title{
font-weight: bold; font-weight: bold;
@ -1741,7 +1757,6 @@
} }
.list-pay{ .list-pay{
width: 100%; width: 100%;
padding: 0px 29rpx;
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;
@ -1828,9 +1843,10 @@
} }
.d-touxiang{ .d-touxiang{
width: 46rpx; width: 55rpx;
height: 46rpx; height: 55rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #f2fffd;
} }
.money-pay-jia{ .money-pay-jia{
font-weight: 400; font-weight: 400;
@ -1839,21 +1855,6 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold;
}
.money-pay-zhen{
display: flex;
flex-direction: row;
align-items: center;
}
.money-pay{ .money-pay{
width: 100%; width: 100%;
display: flex; display: flex;
@ -1868,9 +1869,9 @@
} }
.pay-title{ .pay-title{
font-weight: bold; font-weight: bold;
font-size: 30rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 12px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
@ -2061,4 +2062,17 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.head-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style> </style>

458
my/order/payModifyTcMyDaiB.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="content"> <view class="content">
<view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;"> <!-- <view v-if="order.overTimeOrders == 1" class="dingshi" style="font-size: 32upx;height: 150rpx;padding: 26rpx 29rpx 0 29rpx;">
<view style="color: red;font-size:26rpx">(订单已超时)</view> <view style="color: red;font-size:26rpx">(订单已超时)</view>
</view> </view> -->
<view class="padding-bottom u-skeleton"> <view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0" <view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
style="padding: 0 29rpx;"> style="padding: 0 29rpx;">
@ -10,18 +10,19 @@
<view class="pay-title">服务项目</view> <view class="pay-title">服务项目</view>
<view class="flex justify-around"> <view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;"> <view class="" style="width: 160upx;height: 160upx;">
<image v-if="order.userPackageDetailId==null" :src="order.ordersMassageList[0].massageType.massageImg" <image v-if="order.userPackageDetailId==null"
:src="order.ordersMassageList[0].massageType.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
<image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg" <image v-else :src="order.ordersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image> style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view> </view>
<view class="u-flex-1 margin-left-sm"> <view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right"> <view class="flex head-title-right">
<view class="head-text"> <view class="head-title">
{{order.entryName}} {{order.entryName}}
</view> </view>
<view class="zhuangtai"> <view class="zhuangtai">
<view v-if="order.status ==1">待付款...</view> <view v-if="order.status ==1">待支付</view>
<view v-if="order.status ==2">待服务</view> <view v-if="order.status ==2">待服务</view>
<view v-if="order.status ==5">已完成</view> <view v-if="order.status ==5">已完成</view>
<view v-if="order.status ==6">服务中</view> <view v-if="order.status ==6">服务中</view>
@ -35,20 +36,23 @@
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<view style="width: 100%;"> <view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;"> <view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;"> <view style="justify-content: space-between;">
{{order.duration}}分钟 <text class="title-font">服务时长：</text><text
class="value-font">{{order.duration}}分钟</text>
</view> </view>
</view> </view>
<view class="money-pay" style="justify-content: space-between;"> <view class="money-pay" style="justify-content: space-between;">
<view class="money-pay-zhen"> <view class="money-pay-zhen">
<text class="title-font">项目价格：</text>
<span>￥</span> <span>￥</span>
<span>{{order.priceMarkup}} </span> <span>{{order.priceMarkup}} </span>
<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> --> <!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
</view> </view>
<view> <view>
<uni-number-box :disabled="true" :value="order.massageNum" :width='27' :min="1" @change="changeValue" /> <uni-number-box :disabled="true" :value="order.massageNum" :width='27'
:min="1" @change="changeValue" />
</view> </view>
<!-- <view class="money-pay-jia">￥298</view> --> <!-- <view class="money-pay-jia">￥298</view> -->
</view> </view>
@ -62,23 +66,24 @@
</view> </view>
</view> </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="" v-if="order.artificer">
<view class="flex justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title">下单人</view> <view class="line-word title-font">客户姓名</view>
<view class="add-con-cont"> <view class="line-word-r value-font">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title">联系方式</view> <view class="line-word title-font">联系方式</view>
<view class="add-con-cont"> <view class="line-word-r value-font">
{{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"> <view class="serverAddress jusitify-line">
<view class="add-con-title">服务地址</view> <view class="line-word title-font">服务地址</view>
<view style="color: #666;margin-top: 8rpx;font-size: 30rpx;width: 73%; text-align: right;">{{order.address}}</view> <view class="line-word-r value-font" style="width: 75%; text-align: right;">
{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -86,17 +91,17 @@
<view class="margin-top-xl pay-ding"> <view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top"> <view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image> <image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;"> <view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 80%;justify-content: space-between;"> <view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">{{order.artificer.artificerName}}</view> <view class="d-title"><span>{{order.artificer.artificerName}}</span></view>
<!-- <image <!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;" src="../../static/img/phone.png" style="width: 10px;height: 13px;margin-left: 11px;"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</view>
<view class="level_button">{{order.technicianTypeName}}</view> <view class="level_button">{{order.technicianTypeName}}</view>
</view>
<!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount"> <!-- <view class="flex align-center flex-wrap" v-if="order.artificer.ordersCount">
<view class="margin-right"> <view class="margin-right">
<image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;"> <image src="../../static/images/start.png" style="width: 24rpx;height: 22rpx;">
@ -113,128 +118,177 @@
<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 jusitify-line">
<view class="add-con-title">订单编号</view> <view class="line-word title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)" <view class="flex line-word-r value-font" @tap="copy(order.ordersNo)">
style="color: #333;font-size: 30rpx;"> <view class="">{{order.ordersNo}}
<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="add-con-title">预约时间</view>
<view class="add-con-cont">{{order.serveTime}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">下单时间</view> <view class="line-word title-font">预约时间</view>
<view class="add-con-cont">{{order.createTime}}</view> <view class="line-word-r value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">下单时间</view>
<view class="line-word-r value-font">{{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 v-if="order.userPackageDetailId!=null">
<view class="add-con-title">项目名称</view> <view class="flex justify-between jusitify-line">
<view class="add-con-cont">{{order.entryName}}</view> <view class="add-con-title title-font"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
<view class="add-con-cont value-font">
{{order.ordersMassageList[0].userPackageDetail.mainTitle}}
</view> </view>
<view class="flex justify-between add-lin">
<view class="add-con-title">服务时长</view>
<view class="add-con-cont">{{order.duration}}分钟</view>
</view> </view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目原价</view>
<view class="add-con-cont">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">{{order.technicianTypeName}}价格</view> <view class="line-word title-font">项目名称</view>
<view class="add-con-cont" style="color: #F93731;">￥{{order.priceMarkup}}</view> <view class="line-word-r value-font">{{order.entryName}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">服务时长</view>
<view class="line-word-r value-font">{{order.duration}}分钟</view>
</view>
<view v-if="order.userPackageDetailId==null">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目原价</view>
<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">{{order.technicianTypeName}}价格</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{order.priceMarkup}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">会员减免</view>
<view class="line-word-r value-font" style="color: #FF6000;">-￥{{order.vipReductionMoney}}</view>
</view>
<view class="flex align-center jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">小计：</view>
<view class="value-font" style="font-weight: bold;">
<text>￥{{order.massageMoney}}</text></view>
</view>
</view>
<view v-else>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">项目价格</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">应付金额</view>
<view class="line-word-r value-font">￥{{order.massagePrice}}</view>
</view>
<view class="flex justify-between jusitify-line" style="justify-content: flex-end;">
<view class="line-word title-font">实付金额：</view>
<view class="line-word-r value-font" style="font-weight: bold;">
￥<text>0</text>
</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;">
<view style="color: #333;font-size: 26rpx;">小计：</view>
<view class="" style="color: #333;">￥<text
style="font-size: 35rpx;font-weight: bold;">{{order.massageMoney}}</text></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" v-if="order.tripWay"> <view class="flex justify-between jusitify-line" v-if="order.tripWay">
<view class="add-con-title">出行方式</view> <view class="line-word title-font">出行方式</view>
<view class="add-con-cont" v-if="order.tripWay == 1">公交</view> <view class="line-word-r value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont" v-if="order.tripWay == 2">出租</view> <view class="line-word-r value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont" v-if="order.tripWay == 3">免费</view> <view class="line-word-r value-font" v-if="order.tripWay == 3">免费</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.km"> <view class="flex justify-between jusitify-line" v-if="order.km">
<view class="add-con-title">全程距离</view> <view class="line-word title-font">全程距离</view>
<view class="add-con-cont">{{order.km}}km</view> <view class="line-word-r value-font">{{order.km}}km</view>
</view> </view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney"> <view class="flex justify-between jusitify-line" v-if="order.taxiMoney">
<view class="add-con-title">出行交通费用</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont">￥{{order.taxiMoney}}</view> <view class="line-word-r value-font">￥{{order.taxiMoney}}</view>
</view> </view>
<view v-if="order.userPackageDetailId==null">
<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="flex justify-between jusitify-line">
<view class="add-con-title">优惠券</view> <view class="line-word title-font">优惠券</view>
<view class="add-con-cont" style="color: rgb(249, 55, 49); font-weight: bold;" v-if="order.couponMoney">-￥{{order.couponMoney}}</view> <view class="line-word-r value-font" style="color: #FF6000;"
<view class="add-con-cont" v-else>-</view> v-if="order.couponMoney">-￥{{order.couponMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
</view>
</view> </view>
<view class="textarea-pay-list" v-if="order.remark"> <view class="textarea-pay-list" v-if="order.remark">
<view style="color: #999;font-size: 26rpx;margin-bottom: 9px;">备注内容</view> <view class="jusitify-line-end"></view>
<view class="beizhu">{{order.remark}}</view> <view class="line-word title-font">备注</view>
<view class="value-font">{{order.remark}}</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 v-if="order.userPackageDetailId==null">
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.massageMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font"><text
style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view>
<view class="flex justify-between jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word-r value-font" style="color: #FF6000;" v-if="order.couponMoney">
-<text style="font-weight: bold;">￥{{order.couponMoney}}</text></view>
<view class="value-font" v-else>-</view>
</view>
<view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="line-word title-font">合计：</view>
<view class="value-font">
<text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
￥{{order.payMoneyTotal}}
</text>
</view> </view>
</view> </view>
</view> </view>
<view class="pay-ding feiuong"> <view v-else>
<view class="fei-title">费用明细</view> <view class="flex justify-between jusitify-line">
<view class="fei-view"> <view class="add-con-title title-font">订单费用</view>
<view class="flex justify-between add-lin"> <view class="add-con-cont value-font"><text style="font-weight: bold;">￥0</text></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> </view>
<view class="flex justify-between add-lin" v-if="order.taxiMoney"> <view class="flex justify-between jusitify-line">
<view class="add-con-title">出行费用：</view> <view class="line-word title-font">出行费用</view>
<view class="add-con-cont" v-if="order.taxiMoney">￥<text style="font-size: 26rpx;font-weight: bold;">{{order.taxiMoney}}</text></view> <view class="line-word-r value-font"><text
<view class="add-con-cont" v-else>-</view> style="font-weight: bold;">￥{{order.taxiMoney}}</text></view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex align-center margin-top-lg" style="justify-content: flex-end;">
<view class="add-con-title">优惠券：</view> <view class="line-word title-font">合计：</view>
<view class="add-con-cont" style="color: #F93731;" v-if="order.couponMoney"> <text style="color: #FF1200;font-weight: bold;font-size: 40rpx;">
-￥<text style="font-size: 26rpx;font-weight: bold;">{{order.couponMoney}}</text></view> ￥{{order.taxiMoney}}
<view class="" v-else>-</view> </text>
</view>
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 32rpx;">￥{{order.payMoneyTotal}}</span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view style="height: 100rpx;"></view>
</view>
<view class="flex tabber padding-top-sm padding-bottom-sm align-center"> <view class="showBtn tabber">
<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"
v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单 v-if="(order.status == 1 || order.status == 2 || order.status == 7 || order.status == 8) && yhqxSel != '否'">取消订单
</u-button> </u-button>
<u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false" <u-button @click="openpay(order)" shape="circle" :custom-style="customStyle2" :hair-line="false"
v-if="order.status == 1" v-if="order.status == 1" class="dingshi">立即支付
class="dingshi">立即支付
</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>
@ -283,8 +337,8 @@
orderList: [], orderList: [],
loading: true, loading: true,
customStyle: { customStyle: {
// backgroundColor: '#e5e5e5', backgroundColor: '#ffffff',
// color: '#FFFFFF', color: '',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
@ -296,8 +350,9 @@
margin: '0 10upx', margin: '0 10upx',
}, },
customStyle2: { customStyle2: {
backgroundColor: '', backgroundColor: '#ffffff',
color: '#FFFFFF', border: '1px solid #ffffff',
color: '#333',
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
width: "310upx", width: "310upx",
// #endif // #endif
@ -694,9 +749,10 @@
let data = { let data = {
classifyId: item.classifyId, classifyId: item.classifyId,
ordersId: that.order.ordersId, ordersId: that.order.ordersId,
oldOrdersMassageList:[ oldOrdersMassageList: [{
{massageId: item.massageTypeId,num: 1}, massageId: item.massageTypeId,
], num: 1
}, ],
massageTypeId: item.massageTypeId, massageTypeId: item.massageTypeId,
userPackageDetailId: item.userPackageDetailId, userPackageDetailId: item.userPackageDetailId,
} }
@ -1384,29 +1440,38 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
/deep/.padding-bottom {
padding-bottom: 20rpx;
}
.beizhu { .beizhu {
width: 100%; width: 100%;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */ -webkit-line-clamp: 2;
/* 显示的行数，可以根据需要修改 */
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.bottom-view { .bottom-view {
margin-top: 9px; margin-top: 9px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding-bottom: 5px; padding-bottom: 5px;
margin-bottom: 5px; margin-bottom: 5px;
} }
/deep/.u-drawer { /deep/.u-drawer {
z-index: 11 !important; z-index: 11 !important;
} }
.xiangmu-cont-top-left { .xiangmu-cont-top-left {
font-weight: normal; font-weight: normal;
font-size: 21rpx; font-size: 21rpx;
color: #049E89; color: #049E89;
margin-top: 1px; margin-top: 1px;
} }
.xiangmu-cont-top-time { .xiangmu-cont-top-time {
width: 100%; width: 100%;
display: flex; display: flex;
@ -1414,6 +1479,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.xiadan { .xiadan {
width: 122rpx; width: 122rpx;
height: 48rpx; height: 48rpx;
@ -1425,24 +1491,30 @@
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.xiangmu-foot-left { .xiangmu-foot-left {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: flex-end; align-items: flex-end;
} }
.xiangmu-foot-left-shiji span { .xiangmu-foot-left-shiji span {
color: #F95900; color: #F95900;
} }
.xiangmu-foot-left-shiji span:nth-child(1) { .xiangmu-foot-left-shiji span:nth-child(1) {
font-size: 25rpx; font-size: 25rpx;
} }
.xiangmu-foot-left-shiji span:nth-child(2) { .xiangmu-foot-left-shiji span:nth-child(2) {
font-weight: bold; font-weight: bold;
font-size: 36.81rpx; font-size: 36.81rpx;
} }
.xiangmu-foot-left-shiji span:nth-child(3) { .xiangmu-foot-left-shiji span:nth-child(3) {
font-size: 25rpx; font-size: 25rpx;
} }
.xiangmu-foot-left-dazhe { .xiangmu-foot-left-dazhe {
font-weight: bold; font-weight: bold;
font-size: 31rpx; font-size: 31rpx;
@ -1450,6 +1522,7 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.xiangmu-foot { .xiangmu-foot {
width: 100%; width: 100%;
display: flex; display: flex;
@ -1457,6 +1530,7 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.xiangmu-about { .xiangmu-about {
width: 100%; width: 100%;
text-align: left; text-align: left;
@ -1470,6 +1544,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 5px 0px; margin: 5px 0px;
} }
.xiangmu-cont-top-title { .xiangmu-cont-top-title {
font-weight: bold; font-weight: bold;
font-size: 33rpx; font-size: 33rpx;
@ -1481,18 +1556,21 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.xiangmu-cont { .xiangmu-cont {
width: 55%; width: 55%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.xiangmu-img { .xiangmu-img {
width: 285rpx; width: 285rpx;
height: 218rpx; height: 218rpx;
background: #9F9F9F; background: #9F9F9F;
border-radius: 14rpx; border-radius: 14rpx;
} }
.xiangmu { .xiangmu {
width: 95%; width: 95%;
height: 263rpx; height: 263rpx;
@ -1509,9 +1587,11 @@
.popup-mian-btn span:nth-child(1) { .popup-mian-btn span:nth-child(1) {
background: linear-gradient(90deg, #FE912E, #FF9970); background: linear-gradient(90deg, #FE912E, #FF9970);
} }
.popup-mian-btn span:nth-child(2) { .popup-mian-btn span:nth-child(2) {
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
} }
.popup-mian-btn span { .popup-mian-btn span {
width: 247rpx; width: 247rpx;
height: 77rpx; height: 77rpx;
@ -1522,6 +1602,7 @@
color: #FFFEFE; color: #FFFEFE;
border-radius: 39rpx; border-radius: 39rpx;
} }
.popup-mian-btn { .popup-mian-btn {
width: 100%; width: 100%;
display: flex; display: flex;
@ -1530,16 +1611,19 @@
align-items: center; align-items: center;
margin-top: 10px; margin-top: 10px;
} }
.popup-mian-textarea { .popup-mian-textarea {
width: 525.69rpx; width: 525.69rpx;
height: 211.81rpx; height: 211.81rpx;
} }
.popup-mian { .popup-mian {
width: 88%; width: 88%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 5px auto 0px auto; margin: 5px auto 0px auto;
} }
.popup-head span:nth-child(2) { .popup-head span:nth-child(2) {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
@ -1550,11 +1634,13 @@
border-radius: 50%; border-radius: 50%;
border: 3px solid #15AB8D; border: 3px solid #15AB8D;
} }
.popup-head span:nth-child(1) { .popup-head span:nth-child(1) {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.popup-head { .popup-head {
width: 100%; width: 100%;
height: 99.38rpx; height: 99.38rpx;
@ -1565,6 +1651,7 @@
justify-content: space-between; justify-content: space-between;
padding: 0 15px; padding: 0 15px;
} }
.popup-content { .popup-content {
width: 613rpx; width: 613rpx;
height: 479rpx; height: 479rpx;
@ -1573,13 +1660,19 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
/deep/.btns { /deep/.btns {
background: #019C88 !important; color: #019C88 !important;
color: #fff !important; margin-left: 10rpx !important;
} }
/deep/.u-size-default { /deep/.u-size-default {
margin: 5px 0px 0px 0px; width: 85px !important;
height: 34rpx;
line-height: 34rpx;
font-size: 28rpx;
} }
.showBtn-mian { .showBtn-mian {
width: 100%; width: 100%;
display: flex; display: flex;
@ -1588,11 +1681,13 @@
flex-wrap: wrap; flex-wrap: wrap;
justify-content: flex-end; justify-content: flex-end;
} }
.gengduo { .gengduo {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
color: #7D7D7D; color: #7D7D7D;
} }
.showBtn-view { .showBtn-view {
width: 100%; width: 100%;
justify-content: flex-end; justify-content: flex-end;
@ -1600,7 +1695,17 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.showBtn,.hideBtn{
.showBtn {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
margin-top: 20rpx;
}
.hideBtn {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -1614,40 +1719,43 @@
.dingshi { .dingshi {
background: linear-gradient(90deg, #019C88, #28BA92, #35C495); background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
} }
.zhuangtai { .zhuangtai {
color: #029D88; color: #029D88;
font-weight: bold; font-weight: bold;
} }
.head-title-right { .head-title-right {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.head-title{
margin-top: -2px;display: inline-block; .fei-view-list span,
width: 300rpx; .fei-view-list-z span {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.fei-view-list span,.fei-view-list-z span{
font-weight: bold; font-weight: bold;
font-size: 25rpx; font-size: 25rpx;
} }
.fei-view-list-z { .fei-view-list-z {
height: 65rpx; height: 65rpx;
border-top: 1px solid #f3f3f3; border-top: 1px solid #f3f3f3;
padding-top: 20rpx; padding-top: 20rpx;
font-weight: bold; font-weight: bold;
} }
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
.fei-view-list span:nth-child(1),
.fei-view-list-z span:nth-child(1) {
color: #666666; color: #666666;
} }
.fei-view-list span:nth-child(2) { .fei-view-list span:nth-child(2) {
color: #333333; color: #333333;
} }
.fei-view-list,.fei-view-list-z{
.fei-view-list,
.fei-view-list-z {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -1655,11 +1763,13 @@
justify-content: space-between; justify-content: space-between;
margin-top: 5px; margin-top: 5px;
} }
.fei-view { .fei-view {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.fei-title { .fei-title {
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -1670,23 +1780,28 @@
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
.feiuong { .feiuong {
padding: 29rpx; padding: 29rpx;
} }
/deep/.uni-textarea-textarea { /deep/.uni-textarea-textarea {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
} }
/deep/.uni-textarea-placeholder { /deep/.uni-textarea-placeholder {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
color: #C5C5C5; color: #C5C5C5;
} }
.textarea-pay-list { .textarea-pay-list {
width: 100%; width: 100%;
height: 126rpx; height: 126rpx;
margin-top: 10px; margin-top: 10px;
} }
.textarea-pay { .textarea-pay {
background-color: #f3f3f3; background-color: #f3f3f3;
width: 100%; width: 100%;
@ -1695,38 +1810,48 @@
border-radius: 14rpx; border-radius: 14rpx;
padding: 7px; padding: 7px;
} }
.list-pay { .list-pay {
width: 100%; width: 100%;
padding: 10px 29rpx; padding: 10rpx 29rpx;
margin-bottom: 40rpx;
} }
.pay-ding-top { .pay-ding-top {
width: 100%; width: 100%;
height: 50px; height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff); background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px; border-top-left-radius: 24rpx;
border-top-right-radius: 12px; border-top-right-radius: 24rpx;
padding: 0px 14px; padding: 0px 29rpx;
} }
.pay-ding,.feiuong{
.pay-ding,
.feiuong {
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
margin-top: 24rpx; margin-top: 24rpx;
// padding: 29rpx; // padding: 29rpx;
} }
.phone-pay { .phone-pay {
width: 49rpx; width: 49rpx;
height: 44rpx; height: 44rpx;
} }
.d-title { .d-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.d-touxiang { .d-touxiang {
width: 46rpx; width: 55rpx;
height: 46rpx; height: 55rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #f2fffd;
} }
.money-pay-jia { .money-pay-jia {
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
@ -1734,44 +1859,45 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.money-pay-zhen span { .money-pay-zhen span {
color: #FF6000; color: #FF6000;
} font-size: 32rpx;
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-weight: bold; font-weight: bold;
} }
.money-pay-zhen { .money-pay-zhen {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.money-pay { .money-pay {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.head-top { .head-top {
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 29rpx; padding: 29rpx;
} }
.content { .content {
padding-bottom: 140rpx;
padding-top: 20px; padding-top: 20px;
width: 100%; width: 100%;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.pay-title { .pay-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
margin-bottom: 8px; margin-bottom: 12px;
} }
page { page {
background: #f7f7f7; background: #f7f7f7;
} }
@ -1908,8 +2034,9 @@
left: 0; left: 0;
right: 0; right: 0;
justify-content: center; justify-content: center;
height: 127rpx; height: 110rpx;
padding: 0 30rpx; padding: 0 30rpx;
border-top: 1px solid #f0f0f0;
} }
.box { .box {
@ -1950,40 +2077,50 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.add-content {
background: #fff;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.head-text { .head-text {
font-size: 30rpx; font-size: 30rpx;
} }
.zhuangtai { .zhuangtai {
color: #029D88; color: #029D88;
font-weight: bold;
font-size: 32rpx;
} }
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #fff;
font-size: 12px;
}
.add-lin { .add-lin {
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
} }
.add-con-title { .add-con-title {
color: #999; color: #999;
font-size: 30rpx; font-size: 30rpx;
} }
.add-con-cont { .add-con-cont {
color: #666; color: #666;
font-size: 30rpx; font-size: 30rpx;
line-height: 80rpx; line-height: 80rpx;
text-align: right; text-align: right;
} }
.level_button { .level_button {
padding: 3rpx 13rpx; padding: 4rpx 20rpx;
background: linear-gradient(to right, #fe9131, #ff9869); background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
border-radius: 16rpx 16rpx 16rpx 1rpx; border-radius: 16rpx 16rpx 16rpx 1rpx;
color: #fff; color: #e95c3b;
font-size: 12px; font-size: 12px;
border: 1px solid #fd967c;
} }
.justify-title-nav { .justify-title-nav {
width: 90%; width: 90%;
display: flex; display: flex;
@ -1991,6 +2128,7 @@
position: relative; position: relative;
margin: 10px 0; margin: 10px 0;
} }
.justify-title-nav-bor { .justify-title-nav-bor {
width: 64px; width: 64px;
height: 5px; height: 5px;
@ -1999,14 +2137,38 @@
bottom: 0; bottom: 0;
background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7)); background: linear-gradient(90deg, rgba(234, 248, 245, 0.7), rgba(132, 211, 196, 0.7));
} }
.justify-title { .justify-title {
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line {
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.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;
}
.head-title {
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.title-font {
font-size: 30rpx;
color: #666666;
}
.value-font {
font-size: 30rpx;
color: #333333;
} }
</style> </style>

4
my/order/payShengji.vue
View File

@ -233,8 +233,8 @@
<view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view> <view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view>
</view> </view>
</view> </view>
<view class="jusitify-line-end"></view>
<view v-if="order.addNum!=null"> <view v-if="order.addNum!=null">
<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>
@ -439,8 +439,8 @@
<view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view> <view class="value-font" style="font-weight: bold;"><text>￥{{order.payMoney}}</text></view>
</view> </view>
</view> </view>
<view class="jusitify-line-end"></view>
<view v-if="order.addNum!=null"> <view v-if="order.addNum!=null">
<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>

65
my/order/paydingTCX.vue
View File

@ -61,23 +61,23 @@
</view> </view>
</view> </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="" v-if="order.artificer">
<view class="flex justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title title-font">客户姓名</view> <view class="line-word title-font">客户姓名</view>
<view class="add-con-cont value-font"> <view class="line-word-r value-font">
{{order.userName}} {{order.userName}}
</view> </view>
</view> </view>
<view class="flex justify-between add-lin"> <view class="flex align-center justify-between jusitify-line">
<view class="add-con-title title-font">联系方式</view> <view class="line-word title-font">联系方式</view>
<view class="add-con-cont value-font"> <view class="line-word-r value-font">
{{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"> <view class="serverAddress jusitify-line">
<view class="add-con-title title-font">服务地址</view> <view class="line-word title-font">服务地址</view>
<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view> <view class="line-word-r value-font" style="width: 75%; text-align: right;">{{order.address}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -85,8 +85,8 @@
<view class="margin-top-xl pay-ding"> <view class="margin-top-xl pay-ding">
<view class="flex align-center pay-ding-top"> <view class="flex align-center pay-ding-top">
<image :src="order.artificer.artificerImg" class="d-touxiang"></image> <image :src="order.artificer.artificerImg" class="d-touxiang"></image>
<view class="margin-left-sm flex" style="width: 90%;justify-content: space-between;flex-direction: row;align-items: center;"> <view class="margin-left-sm" style="width: 90%;">
<view class="flex align-center" style="width: 80%;justify-content: space-between;"> <view class="flex align-center" style="width: 100%;justify-content: space-between;">
<view class="d-title">{{order.artificer.artificerName}}</view> <view class="d-title">{{order.artificer.artificerName}}</view>
<!-- <image <!-- <image
v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4 && order.status !=2"
@ -94,10 +94,10 @@
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
<!-- <image src="../../static/img/phone.png" class="phone-pay" <!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> --> @click="bindphone(order.artificer.phone)"></image> -->
</view>
<view class="level_button">{{order.technicianTypeName}}</view> <view class="level_button">{{order.technicianTypeName}}</view>
</view> </view>
</view> </view>
</view>
<view class="list-pay"> <view class="list-pay">
<view class="justify-title-nav "> <view class="justify-title-nav ">
<view class="justify-title">订单信息</view> <view class="justify-title">订单信息</view>
@ -152,7 +152,7 @@
<view class="add-con-cont value-font">￥{{order.massagePrice}}</view> <view class="add-con-cont value-font">￥{{order.massagePrice}}</view>
</view> </view>
<view class="flex justify-between add-lin" style="justify-content: flex-end;"> <view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="title-font">实付金额：</view> <view class="title-font title-font">实付金额：</view>
<view class="add-con-cont value-font" style="font-weight: bold;"> <view class="add-con-cont value-font" style="font-weight: bold;">
￥<text>0</text> ￥<text>0</text>
</view> </view>
@ -1811,11 +1811,11 @@
} }
.pay-ding-top{ .pay-ding-top{
width: 100%; width: 100%;
height: 50px; height: 100rpx;
background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff); background-image: linear-gradient(to bottom, rgba(219, 242, 238, 0.9), #fff);
border-top-left-radius: 12px; border-top-left-radius: 24rpx;
border-top-right-radius: 12px; border-top-right-radius: 24rpx;
padding: 0px 14px; padding: 0px 29rpx;
} }
.pay-ding,.feiuong{ .pay-ding,.feiuong{
background-color: #ffffff; background-color: #ffffff;
@ -1828,14 +1828,15 @@
height: 44rpx; height: 44rpx;
} }
.d-title{ .d-title{
font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
font-weight: bold;
} }
.d-touxiang{ .d-touxiang{
width: 60rpx; width: 55rpx;
height: 60rpx; height: 55rpx;
border-radius: 50%; border-radius: 50%;
border: 1px solid #f2fffd;
} }
.money-pay-jia{ .money-pay-jia{
font-weight: 400; font-weight: 400;
@ -2055,6 +2056,14 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.add-content {
background: #fff;
padding: 30rpx;
border-radius: 24rpx;
margin-top: 24rpx;
}
.head-text{ .head-text{
font-size:30rpx; font-size:30rpx;
} }
@ -2073,11 +2082,12 @@
text-align:right; text-align:right;
} }
.level_button{ .level_button{
padding: 3rpx 13rpx; padding: 4rpx 20rpx;
background: linear-gradient(to right, #fe9131, #ff9869); background: linear-gradient(to right, #ffc1a9, #fedec9, #fdbb9f);
border-radius: 16rpx 16rpx 16rpx 1rpx; border-radius: 16rpx 16rpx 16rpx 1rpx;
color: #fff; color: #e95c3b;
font-size: 12px; font-size: 12px;
border: 1px solid #fd967c;
} }
.justify-title-nav{ .justify-title-nav{
width: 90%; width: 90%;
@ -2099,6 +2109,13 @@
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
} }
.jusitify-line {
height: 78rpx;
padding: 20rpx 0;
font-size: 30rpx;
}
.jusitify-line-end{ .jusitify-line-end{
height:1px; height:1px;
border-bottom: 1px #e5e5e5 solid; border-bottom: 1px #e5e5e5 solid;