This commit is contained in:
parent
d53ad7a29a
commit
96717e279c
|
|
@ -17,7 +17,7 @@
|
|||
</view>
|
||||
<view class="u-flex-1 margin-left-sm">
|
||||
<view class="flex head-title-right">
|
||||
<view class="margin-right-xs u-skeleton-fillet head-title" style="font-size: 30rpx;">
|
||||
<view class="head-title" style="font-size: 30rpx;">
|
||||
{{order.entryName}}
|
||||
</view>
|
||||
<view class="zhuangtai">
|
||||
|
|
@ -2583,13 +2583,13 @@
|
|||
}
|
||||
.zhuangtai{
|
||||
color: #029D88;
|
||||
font-weight: bold;
|
||||
}
|
||||
.head-title-right{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-weight: bold;
|
||||
}
|
||||
.head-title{
|
||||
margin-top: -2px;display: inline-block;
|
||||
|
|
@ -2709,7 +2709,7 @@
|
|||
font-size: 25rpx;
|
||||
}
|
||||
.money-pay-zhen span:nth-child(2){
|
||||
font-size: 36rpx;
|
||||
font-size: 30rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
.money-pay-zhen{
|
||||
|
|
@ -2737,8 +2737,7 @@
|
|||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 22rpx;
|
||||
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
page {
|
||||
background: #f7f7f7;
|
||||
|
|
@ -2920,7 +2919,7 @@
|
|||
}
|
||||
.add-content{
|
||||
background: #fff;
|
||||
padding: 34rpx;
|
||||
padding: 30rpx;
|
||||
border-radius: 24rpx;
|
||||
margin-top: 24rpx;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,9 +54,9 @@
|
|||
{{mobile}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="jusitify-line">
|
||||
<view class="jusitify-line" style="align-items: center;">
|
||||
<view class="line-word">详细地址</view>
|
||||
<view class="line-word-r" style="width: 73%; text-align: right;">
|
||||
<view class="line-word-r" style="width: 73%; text-align: right; ">
|
||||
<span>
|
||||
{{province}}/{{city}}/{{district}}/{{detailaddress}}
|
||||
</span>
|
||||
|
|
@ -74,20 +74,18 @@
|
|||
</view>
|
||||
<view class="ske-padding margin-top-sm header-view">
|
||||
<view class="jusitify-line" @click="liliaoshi">
|
||||
<view class="fuwu-title" >
|
||||
<span class="line-word">技师</span>
|
||||
<view class="line-word" >
|
||||
<span >技师</span>
|
||||
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
|
||||
</view>
|
||||
<view class="liliao-bottom" style="margin-right: 6px;">
|
||||
<span v-if="jishiName">{{jishiName.artificerName}}</span>
|
||||
<span v-else>选择不同技师价格可能不一样哦~</span>
|
||||
<span class="view-more"></span>
|
||||
<view >
|
||||
<span class="line-word-r" v-if="jishiName">{{jishiName.artificerName}}</span>
|
||||
<span class="line-word-r" v-else>选择不同技师价格可能不一样哦~</span>
|
||||
<span class="view-more"></span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="liliao" @click="youhuijuan">
|
||||
<view class="fuwu-title">
|
||||
<span>平台优惠劵</span>
|
||||
</view>
|
||||
<view class="jusitify-line" @click="youhuijuan">
|
||||
<view class="line-word">平台优惠劵</view>
|
||||
<view class="header-bottom-money-zhen">
|
||||
<view v-if="couponDataList" class="" style="margin-right: 5px;">
|
||||
<span>-￥{{couponDataList}}</span>
|
||||
|
|
@ -96,10 +94,8 @@
|
|||
<span class="view-more"></span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="fuwu-time">
|
||||
<view class="fuwu-title">
|
||||
服务时间
|
||||
</view>
|
||||
<view class="jusitify-line">
|
||||
<view class="line-word">服务时间</view>
|
||||
<!-- <view class="fuwu-time-view" @change="changeLog">
|
||||
<uni-datetime-picker :hide-second='true' v-model="single" type="datetime">{{single==''?order.serveTime:single}}</uni-datetime-picker>
|
||||
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
|
||||
|
|
@ -107,7 +103,7 @@
|
|||
<view class="flex align-center justify-between" style="margin-top: 15rpx;">
|
||||
<view class="flex justify-between margin-tb-sm" @click="openData()">
|
||||
<view v-if="startTime">{{startTime}}</view>
|
||||
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||
<view class="line-word-r" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -1325,7 +1321,7 @@
|
|||
margin: 30rpx 0;
|
||||
}
|
||||
.line-word{
|
||||
color: #999;
|
||||
color: #666;
|
||||
}
|
||||
.line-word-r{
|
||||
color: #333;
|
||||
|
|
@ -1391,12 +1387,11 @@
|
|||
color:#888;
|
||||
}
|
||||
.ske-padding{
|
||||
padding: 5rpx 30rpx 36rpx 30rpx;
|
||||
padding:20rpx 35rpx;
|
||||
}
|
||||
.header-bottom-money-zhen span{
|
||||
color: #F95900 !important;
|
||||
font-weight: bold !important;
|
||||
font-size: 26rpx !important;
|
||||
font-size: 30rpx !important;
|
||||
}
|
||||
.header-bottom-money-zhen{
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -156,10 +156,9 @@
|
|||
<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 class="flex align-center" style="justify-content: flex-end;">
|
||||
<view class="add-con-cont">小计：</view>
|
||||
<view class="add-con-cont" style=" font-weight: bold;">￥<text>{{order.massageMoney}}</text></view>
|
||||
</view>
|
||||
|
||||
<view class="jusitify-line-end"></view>
|
||||
|
|
@ -200,28 +199,31 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="pay-ding feiuong">
|
||||
<view class="fei-title">费用明细</view>
|
||||
<view class="justify-title-nav ">
|
||||
<view class="justify-title">费用明细</view>
|
||||
<view class="justify-title-nav-bor"></view>
|
||||
</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>
|
||||
<text style="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-if="order.taxiMoney">￥<text style="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>
|
||||
-￥<text style="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>
|
||||
<span style="color: #FF3939;font-weight: bold;font-size: 32rpx;">￥{{order.payMoneyTotal}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -299,7 +301,7 @@
|
|||
},
|
||||
customStyle2: {
|
||||
backgroundColor: '',
|
||||
color: '#FFFFFF',
|
||||
color: '',
|
||||
// #ifdef MP-WEIXIN
|
||||
width: "310upx",
|
||||
// #endif
|
||||
|
|
@ -1604,7 +1606,7 @@
|
|||
|
||||
|
||||
.dingshi{
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
background: #ffffff;
|
||||
}
|
||||
.zhuangtai{
|
||||
color: #029D88;
|
||||
|
|
@ -1624,14 +1626,12 @@
|
|||
text-overflow: ellipsis;
|
||||
}
|
||||
.fei-view-list span,.fei-view-list-z span{
|
||||
font-weight: bold;
|
||||
font-size: 25rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.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){
|
||||
color: #666666;
|
||||
|
|
@ -1716,8 +1716,8 @@
|
|||
font-weight: bold;
|
||||
}
|
||||
.d-touxiang{
|
||||
width: 46rpx;
|
||||
height: 46rpx;
|
||||
width: 60rpx;
|
||||
height: 60rpx;
|
||||
border-radius: 50%;
|
||||
}
|
||||
.money-pay-jia{
|
||||
|
|
@ -1751,7 +1751,7 @@
|
|||
.head-top{
|
||||
background-color: #ffffff;
|
||||
border-radius: 24rpx;
|
||||
padding: 29rpx;
|
||||
padding: 30rpx;
|
||||
}
|
||||
.content{
|
||||
padding-bottom: 140rpx;
|
||||
|
|
@ -1763,7 +1763,7 @@
|
|||
font-weight: bold;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 8px;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
page {
|
||||
background: #f7f7f7;
|
||||
|
|
@ -1957,15 +1957,15 @@
|
|||
font-size: 12px;
|
||||
}
|
||||
.add-lin{
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
height: 74rpx;
|
||||
line-height: 74rpx;
|
||||
}
|
||||
.add-con-title{
|
||||
color: #999;
|
||||
color: #666;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.add-con-cont{
|
||||
color: #666;
|
||||
color: #333;
|
||||
font-size: 30rpx;
|
||||
line-height: 80rpx;
|
||||
text-align:right;
|
||||
|
|
|
|||
Loading…
Reference in New Issue