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

订单页面调整

This commit is contained in:
曹磊 2024-07-24 14:29:36 +08:00
parent 312a3863a5
commit d17b4b4f0f
3 changed files with 86 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
my/order/revenueDetails.vue
View File

@ -35,7 +35,7 @@
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{order.duration}}分钟
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
<view class="mian-money" style="justify-content: space-between;">
@ -60,8 +60,8 @@
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<view class="title-font">客户信息: </view>
<view class="value-font">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
@ -75,7 +75,7 @@
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-title title-font">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</view>
@ -385,7 +385,7 @@
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{order.duration}}分钟
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
<view class="mian-money" style="justify-content: space-between;">
@ -410,8 +410,8 @@
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<view class="title-font">客户信息: </view>
<view class="value-font">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
@ -425,7 +425,7 @@
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-title title-font">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</view>
@ -668,7 +668,7 @@
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{order.duration}}分钟
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
<view class="mian-money" style="justify-content: space-between;">
@ -692,8 +692,8 @@
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<view class="title-font">客户信息: </view>
<view class="value-font">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
@ -707,7 +707,7 @@
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-title title-font">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</view>
@ -903,7 +903,7 @@
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{order.duration}}分钟
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
<view class="mian-money" style="justify-content: space-between;">
@ -928,8 +928,8 @@
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<view class="title-font">客户信息: </view>
<view class="value-font">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
@ -943,7 +943,7 @@
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-title title-font">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</view>
@ -1139,7 +1139,7 @@
<view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{order.duration}}分钟
<text class="title-font">服务时长：</text><text class="value-font">{{order.duration}}分钟</text>
</view>
<view class="mian-money" style="justify-content: space-between;">
@ -1164,8 +1164,8 @@
</view>
<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
<view class="mian-top-foot-view">
<view class="mian-top-foot-view-title">客户信息: </view>
<view class="mian-top-foot-view-img">
<view class="title-font">客户信息: </view>
<view class="value-font">
<span @tap.stop="copyAddress()" v-if="order.status !=1 && order.status !=5 && order.status !=3 && order.status !=4">
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
@ -1179,7 +1179,7 @@
</view>
</view>
<view class="mian-top-foot-view" style="margin-top: 5px;">
<view class="mian-top-foot-view-title">服务地址: </view>
<view class="mian-top-foot-view-title title-font">服务地址: </view>
<view class="mian-top-foot-view-text" style="width: 70%;text-align: right;">
{{order.address}}
</view>
@ -3197,9 +3197,9 @@
margin-top: 45px;
}
.nav-btn{
font-size: 25rpx;
font-size: 30rpx;
color: #019c88;
line-height: 63rpx;
font-weight: bold;
}
.nav-title{
font-weight: bold;
@ -3230,4 +3230,12 @@
padding-bottom: 30px;
overflow: scroll;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
</style>

32
pages/index/index.vue
View File

@ -457,8 +457,8 @@
<view class="flex justify-between padding-sm ">
<view class="progress-text">
<text class="title-font">预约时间：</text>
<text class="value-font">{{ item.serveTime }}</text>
<text class="title-font text-bold">预约时间：</text>
<text class="title-font">{{ item.serveTime }}</text>
</view>
<view class="progress-status" v-if="item.status == 1">待付款</view>
<view class="progress-status" v-if="item.status == 2">待服务</view>
@ -478,26 +478,24 @@
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="80">
size="160">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
<view class="u-font-18 text-bold u-line-1" style="width: 560rpx;">
<view class="margin-right-xs text-df margin-left-xs"
style="margin-top: 0rpx;display: inline-block;width: 400rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
<view class="u-font-18 text-bold u-line-1">
<view class="value-font">
{{item.title}}
</view>
</view>
<view class="margin-left-xs text-cut" style="width:550upx">{{ item.address }}</view>
<view class="title-font" style="margin-top: 8px;">{{ item.address }}</view>
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class="flex justify-between align-center padding-sm">
<view class="flex-sub">
实收：<text class="text-df">￥</text><text
class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
<text class="title-font">实收：</text>
<text class="value-font text-bold" style="color: #FF1200;">￥{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex text-right">
<view class="flex title-font2">
【{{ item.ordersNo }}】
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"
@click="cancelOrder(item)">取消订单</u-button> -->
@ -2063,9 +2061,17 @@ uni-switch::before {
font-size: 30rpx;
color: #666666;
}
.title-font2{
font-size: 28rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
font-size: 32rpx;
color: #333333;
}
.padding-sm{
padding: 11px 11px 0px 11px;
}
</style>

46
pages/order/index.vue
View File

@ -83,7 +83,10 @@
</view>
<view class="flex justify-between padding-sm">
<view class="progress-text">预约时间：{{ item.serveTime }}</view>
<view class="progress-text">
<text class="title-font text-bold">预约时间：</text>
<text class="title-font">{{ item.serveTime }}</text>
</view>
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
<view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 3">待评价</view>
@ -100,29 +103,28 @@
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
</view>
<!-- mescroll-downwarp -->
<view class=" u-flex padding-sm">
<view class=" u-flex u-p-t-30 padding-sm">
<view class="u-m-r-10">
<u-avatar :src="item.massageImg ? item.massageImg : '../../static/logo.png'" mode="square"
size="100">
size="160">
</u-avatar>
</view>
<view class="u-flex-1 margin-left-xs">
<view class="u-font-16 u-line-1 top-title">
<view class="margin-right-xs">
<view class="u-font-18 text-bold u-line-1">
<view class="value-font">
{{item.title}}
</view>
</view>
<view class="text-cut">{{ item.address }}</view>
<view class="title-font" style="margin-top: 8px;">{{ item.address }}</view>
</view>
</view>
<view class=" u-flex padding-sm2">
<view class="flex align-center">
<view class="flex justify-between align-center padding-sm">
<view class="flex-sub">
实收：￥<text class="text-df">{{ item.artificerMoneyTotal}}</text>
</view>
<view class="flex text-right">
<text>【{{ item.ordersNo}}】</text>
<text class="title-font">实收：</text>
<text class="value-font text-bold" style="color: #FF1200;">￥{{ item.artificerMoneyTotal }}</text>
</view>
<view class="flex title-font2">
【{{ item.ordersNo }}】
</view>
</view>
<view class="flex u-p-t-20 justify-between align-center padding-sm">
@ -1198,7 +1200,7 @@
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
background-image: linear-gradient(to bottom, #fe9130, #ff9868);
font-size: 28rpx;
font-size: 30rpx;
}
.progress-status-chaoshi{
@ -1209,7 +1211,7 @@
color: #ff0000;
border-radius:20rpx 8rpx 20rpx 8rpx ;
padding: 4rpx 10rpx;
font-size: 28rpx;
font-size: 30rpx;
}
.order-details{
@ -1260,4 +1262,20 @@
.u-font-16{
font-weight: bold;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.title-font2{
font-size: 28rpx;
color: #666666;
}
.value-font{
font-size: 32rpx;
color: #333333;
}
.padding-sm{
padding: 11px 11px 0px 11px;
}
</style>