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

修改

This commit is contained in:
kbing1981 2024-07-19 16:18:02 +08:00
parent 4505461bdb
commit 662a3ff701
2 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
my/order/pay.vue
View File

@ -1,7 +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="prompt">
<view style="color: red;font-size:26rpx">(订单已超时)</view> <image class="promptimg" src="../../static/reminder.png"></image>
<view style="color: #ff8542;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"
@ -425,7 +426,7 @@
v-if="order.addNum ==null&&order.ordersMassageList[0].massageType" v-if="order.addNum ==null&&order.ordersMassageList[0].massageType"
shape="circle" :plain="true" shape="circle" :plain="true"
@tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)" @tap="saveJZ(order.ordersMassageList[0].massageType.massageTypeId)"
class="btns"> class="btns-state">
加钟 加钟
</u-button> </u-button>
<u-button <u-button
@ -2340,7 +2341,24 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.prompt{
background: #ffefe2;
height: 100rpx;
color: #ff7a03;
margin:0 26rpx 26rpx 26rpx;
border-radius: 20rpx;
text-align: center;
display: flex;
line-height: 100rpx;
justify-content: center;
align-items: center;
border: 1px #ff7a03 dashed;
}
.promptimg{
width: 40rpx;
height: 40rpx;
margin-right: 10rpx;
}
/deep/.u-size-default{ /deep/.u-size-default{
width: 85px !important; width: 85px !important;
height:34rpx; height:34rpx;
@ -2523,9 +2541,14 @@
color: #019C88 !important; color: #019C88 !important;
margin-left: 10rpx !important; margin-left: 10rpx !important;
} }
.btns-state{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
margin-left: 10rpx;
color: #ffffff;
}
.eject-btns{ .eject-btns{
height:60rpx; height:70rpx;
line-height: 60rpx; line-height: 70rpx;
border-bottom: 1px solid #f7f7f7; border-bottom: 1px solid #f7f7f7;
padding: 0 20rpx; padding: 0 20rpx;
color: #666666; color: #666666;
@ -2940,8 +2963,8 @@
margin-top: 24rpx; margin-top: 24rpx;
} }
.add-lin{ .add-lin{
height: 74rpx; height: 70rpx;
line-height: 74rpx; line-height: 70rpx;
} }
.add-con-title{ .add-con-title{
color: #999; color: #999;
@ -2955,11 +2978,11 @@
} }
.level_button{ .level_button{
padding: 4rpx 20rpx; padding: 4rpx 20rpx;
background: linear-gradient(to right, #ffc1a9,#fedec9, #fdbb9f); background: linear-gradient(to right, #ffddb3,#ffefdb, #ffe1be);
border-radius: 16rpx 16rpx 16rpx 1rpx ; border-radius: 16rpx 16rpx 16rpx 1rpx ;
color: #e95c3b; color: #805c18;
font-size: 12px; font-size: 12px;
border: 1px solid #fd967c; border: 1px solid #f2cd9f;
} }
.justify-title-nav{ .justify-title-nav{
width: 90%; width: 90%;

40
pages/order/index.vue
View File

@ -849,17 +849,12 @@
align-items: center; align-items: center;
} }
.gengduoBtn{ .gengduoBtn{
background: #fff; height:70rpx;
color: #019C88; line-height: 70rpx;
width: 69px; border-bottom: 1px solid #f7f7f7;
height: 30px; padding: 0 20rpx;
line-height: 30px; color: #666666;
border-radius: 40px;
font-size: 12px;
overflow: visible;
text-align: center; text-align: center;
border: 1px solid;
margin-top: 5px;
} }
.content{ .content{
padding-bottom: 100px; padding-bottom: 100px;
@ -890,13 +885,26 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
position: absolute; position: absolute;
bottom: 0; background-color: #ffffff;
background-color: #fff;
padding: 10px; padding: 10px;
margin-bottom: 48px; bottom:90rpx;
margin-left: 7px; left:50rpx;
box-shadow: 1px 1px 3px 1px #f5f5f5; box-shadow: 0px 0px 3px 0px #b5b5b5;
border-radius:20rpx 20rpx 20rpx 1rpx; border-radius: 10rpx;
}
.showBtn-view:before {
position: absolute;
left: 20rpx;
bottom:-12rpx;
width: 20rpx;
height: 20rpx;
background: #ffffff;
margin-top: -2px;
border-right: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
transform: rotate(45deg);
-webkit-transform: rotate(45deg);
content: '';
} }
.showBtn{ .showBtn{
margin: 35rpx 0; margin: 35rpx 0;