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

Compare commits

base: yangjun:fd95ca0fcadb9f267878deeba26f28d4b30331b6
Branches Tags
yangjun:master
..
compare: yangjun:ebd411d0a69b1f12c4db6fd1467615c98207dab3
Branches Tags
yangjun:master

2 Commits
fd95ca0fca ... ebd411d0a6

Author SHA1 Message Date
kbing1981 ebd411d0a6 Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user 
# Conflicts:
#	my/order/payModifyTcMyDaiB.vue
 2024-07-23 14:08:39 +08:00
kbing1981 27136897ed 修改 2024-07-23 13:58:27 +08:00
12 changed files with 3147 additions and 3352 deletions
Show Stats Expand all files Collapse all files

236
my/order/pay.vue
View File

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

478
my/order/payModifyTcMyDaiB.vue
View File

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

25
pages/cooperate/index.vue
View File

@ -1,8 +1,11 @@
<template>
<view class="content">
<view class="cooperate-tetle">-选择您的身份-</view>
<view class="cooperate-bgimg">
<view class="cooperate-tetle"><image class="cop-img" src="../../static/seckill5.png" mode=""></image></view>
<view class="cooperate-line" @click="goNav('/pages/my/hehuo')">
<span>应聘技师</span>
<image class="cooperate-img" src="../../static/cooperate/cooperate1.png" mode=""></image>
<span>了解更多</span>
</view>
<view class="cooperate-line" @click="goNav('/pages/my/cooperation')">
<image class="cooperate-img" src="../../static/cooperate/cooperate2.png" mode=""></image>
@ -11,6 +14,7 @@
<image class="cooperate-img" src="../../static/cooperate/cooperate3.png" mode=""></image>
</view>
</view>
</view>
</template>
<script>
@ -37,6 +41,7 @@
</script>
<style scoped>
.content {
width: 100%;
height: 100vh;
@ -46,12 +51,28 @@
background-size: 100% 100%;
overflow: auto;
}
.cooperate-bgimg{
height:300rpx;
background-image: url(../../static/background-img4.png);
background-repeat: no-repeat;
background-size: 100% 100%;
position: relative;
}
.cop-img{
width:400rpx;
height: 60rpx;
position: absolute;
top:120rpx;
left:40rpx;
}
.cooperate-tetle{
margin: 50rpx auto;
/*margin: 50rpx auto;*/
text-align: center;
color: #333;
font-size: 30rpx;
font-weight: bold;
height:260rpx;
}
.cooperate-line{
width: 94%;

10
pages/my/index.vue
View File

@ -10,10 +10,10 @@
<view class="my-head-top-text">
<span>{{userName}}</span>
<view class="my-head-top-id" v-if="vipNameType!=null">
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership5.png"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership6.png"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:60rpx; height: 60rpx;" src="../../static/vip/membership4.png"></image>
<span>{{vipNameType=='0'?'月':vipNameType=='1'?'季':'年'}}会员</span>
<image v-if="vipNameType=='0'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership5.gif"></image>
<image v-if="vipNameType=='1'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership6.gif"></image>
<image v-if="vipNameType=='2'" class="my-head-vip" style="width:120rpx; height: 36rpx;" src="../../static/vip/membership7.gif"></image>
<span>{{vipNameType=='0'?'':vipNameType=='1'?'':''}}</span>
</view>
</view>
@ -1010,7 +1010,7 @@
width: 26%;
padding: 3rpx 5rpx 6rpx 22rpx;
text-align: center;
background:linear-gradient(to right,#ff996b,#ff9966,#ff5e62);
/*ckground-image: url(../../static/vip/membership5.png);*/
border-radius: 0 30rpx 30rpx 0 ;
color: #fff;
position: relative;

10
pages/order/index.vue
View File

@ -56,7 +56,7 @@
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end;">
<view class="flex u-p-t-20 justify-between align-center" style="justify-content: flex-end; margin-top: 20rpx;">
<view class="flex text-right" style="flex-direction: column;width: 100%;">
<view class="showBtn" v-if="item.status ==1">
<u-button
@ -1028,9 +1028,11 @@
top: var(--window-top);
flex-wrap: wrap;
align-content: flex-start;
background:url('../../static/background-img4.png') bottom;
background-repeat: no-repeat;
background-size: 100% 100%;
background: #fff;
border-bottom: 1px solid #f7f7f7;
//background:url('../../static/background-img4.png') bottom;
//background-repeat: no-repeat;
//background-size: 100% 100%;
}
.sticky-tabs-list image{
width: 52.08rpx;

BIN
static/background-img4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 KiB

After

Width:  |  Height:  |  Size: 324 KiB

BIN
static/cooperate/cooperate1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
static/seckill5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/vip/membership5.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/vip/membership5.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

BIN
static/vip/membership6.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/vip/membership7.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB