This commit is contained in:
parent
420fc61911
commit
595642d728
|
@ -21,7 +21,7 @@
|
||||||
<text class="title-font-time">服务时长:</text><text class="title-font-time">{{orderXm.duration}}分钟</text>
|
<text class="title-font-time">服务时长:</text><text class="title-font-time">{{orderXm.duration}}分钟</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="money-pay margin-tb-sm">
|
<view class="money-pay">
|
||||||
<view class="money-pay-zhen">
|
<view class="money-pay-zhen">
|
||||||
<text class="title-font">项目价格:</text>
|
<text class="title-font">项目价格:</text>
|
||||||
<span>¥</span>
|
<span>¥</span>
|
||||||
|
@ -1484,7 +1484,6 @@
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: baseline;
|
align-items: baseline;
|
||||||
|
|
||||||
}
|
}
|
||||||
/deep/uni-checkbox .uni-checkbox-input{
|
/deep/uni-checkbox .uni-checkbox-input{
|
||||||
width: 26px;
|
width: 26px;
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<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 20rpx;">
|
||||||
<view class="head-top">
|
<view class="head-top">
|
||||||
<view class="pay-title">服务项目</view>
|
<view class="pay-title">服务项目</view>
|
||||||
<view class="flex">
|
<view class="flex">
|
||||||
<view class="" style="width: 160upx;height: 160upx;">
|
<view>
|
||||||
<image :src="orderXm.massageImg"
|
<image :src="orderXm.massageImg" class="detail-view-img"></image>
|
||||||
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
|
|
||||||
</view>
|
</view>
|
||||||
<view class="head-bottom margin-left-sm">
|
<view class="head-bottom margin-left-sm">
|
||||||
<view class="flex head-title-right">
|
<view class="flex head-title-right">
|
||||||
|
@ -32,8 +31,8 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="ske-padding margin-top-sm header-view">
|
<view class="header-view header-padd header-margin flex justify-between margin-top-sm add-content">
|
||||||
<view v-if="!detailaddress">请选择地址</view>
|
<!-- <view v-if="!detailaddress">请选择地址</view>
|
||||||
<view class="margin-right-xs">
|
<view class="margin-right-xs">
|
||||||
<view class="flex justify-between margin-top-lg">
|
<view class="flex justify-between margin-top-lg">
|
||||||
<view class="header-view-text">联系人</view>
|
<view class="header-view-text">联系人</view>
|
||||||
|
@ -65,51 +64,63 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view> -->
|
||||||
|
<view @click="getAddressList()">
|
||||||
|
<view class="Service-add">服务地址</view>
|
||||||
|
<view class="Service-Address">{{province}}/{{city}}/{{district}}/{{detailaddress}}</view>
|
||||||
|
<view v-if="!detailaddress">请选择地址</view>
|
||||||
|
<view class="Service-name" >
|
||||||
|
<span>{{name}}</span>
|
||||||
|
<span>{{mobile}}</span>
|
||||||
|
</view>
|
||||||
|
<view class="jusitify-line" v-if="order.remark">
|
||||||
|
<view class="line-word title-font">备注内容</view>
|
||||||
|
<view class="flex">
|
||||||
|
<view class="value-font">
|
||||||
|
{{order.remark}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="ske-padding margin-top-sm header-view">
|
<view class="ske-padding margin-top-sm header-view">
|
||||||
<view class="fuwu-time" style="margin-top: 50rpx;">
|
<view class="jusitify-line">
|
||||||
<view class="fuwu-title">
|
<view class="line-word title-font" >
|
||||||
<span>技师</span>
|
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
|
||||||
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
|
<span >技师</span>
|
||||||
</view>
|
</view>
|
||||||
<view class="liliao-bottom" style="margin-right: 6px;">
|
<view class="jusitify-line">
|
||||||
<span v-if="jishiName">{{jishiName.artificerName}}</span>
|
<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
|
||||||
<span v-else>选择不同技师价格可能不一样哦~</span>
|
<span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="liliao" @click="youhuijuan">
|
<view class="jusitify-line" @click="youhuijuan">
|
||||||
<view class="fuwu-title">
|
<view class="line-word-r value-font"><span>平台优惠劵</span></view>
|
||||||
<span>平台优惠劵</span>
|
<view class="jusitify-line">
|
||||||
</view>
|
|
||||||
<view class="header-bottom-money-zhen">
|
|
||||||
<view v-if="couponDataList" class="" style="margin-right: 5px;">
|
<view v-if="couponDataList" class="" style="margin-right: 5px;">
|
||||||
<span>-¥{{couponDataList}}</span>
|
<span style="color: #FF6000;font-size:32rpx;font-weight: bold;">-¥{{couponDataList}}</span>
|
||||||
</view>
|
</view>
|
||||||
<span v-else style="font-size:32rpx;">选择优惠劵</span>
|
<span v-else class="server-yuhui">选择优惠劵</span>
|
||||||
<span class="view-more"></span>
|
<span class="view-more" style="margin-top: -5rpx;"></span>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="fuwu-time">
|
<view class="jusitify-line">
|
||||||
<view class="fuwu-title">
|
<view class="line-word-r value-font">服务时间</view>
|
||||||
服务时间
|
|
||||||
</view>
|
|
||||||
<!-- <view class="fuwu-time-view" @change="changeLog">
|
<!-- <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>
|
<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>
|
<image style="margin-left: 5px;" class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
|
||||||
</view> -->
|
</view> -->
|
||||||
<view class="flex align-center justify-between"
|
<view class="jusitify-line">
|
||||||
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
|
|
||||||
<view class="flex justify-between margin-tb-sm" @click="openData()">
|
<view class="flex justify-between margin-tb-sm" @click="openData()">
|
||||||
<view v-if="startTime">{{startTime}}</view>
|
<view class="line-word-r value-font" v-if="startTime">{{startTime}}</view>
|
||||||
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
|
<view class="line-word-r value-font" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||||
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
|
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="header-view header-padd header-margin" style="margin-bottom: 100px;">
|
<view class="header-view header-padd header-margin" style="margin-bottom: 100px;">
|
||||||
<view class="d-title">
|
<view class="d-title title-font">
|
||||||
<span>给技师捎句话</span>
|
<span>给技师捎句话</span>
|
||||||
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
|
<span style="color: rgb(9, 111, 75);" @click="kuaijie">快捷输入</span>
|
||||||
</view>
|
</view>
|
||||||
|
@ -121,8 +132,9 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="pay_btn" style="margin-top: 10px;" @click="openpay()">去支付</view>
|
<view class="push-button">
|
||||||
|
<view class="pay_btn" @click="openpay()">去支付</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
|
||||||
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
|
||||||
|
@ -1401,7 +1413,7 @@
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
}
|
}
|
||||||
.head-bottom{
|
.head-bottom{
|
||||||
width: 68%;
|
width: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
|
@ -1415,12 +1427,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{
|
||||||
|
@ -1436,9 +1443,12 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
.head-top{
|
.head-top{
|
||||||
|
width: 95%;
|
||||||
|
margin: 0 auto;
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
border-radius: 24rpx;
|
border-radius: 24rpx;
|
||||||
padding: 29rpx;
|
padding: 29rpx;
|
||||||
|
margin-top: 10px;
|
||||||
}
|
}
|
||||||
.view-more{
|
.view-more{
|
||||||
display:inline-block;
|
display:inline-block;
|
||||||
|
@ -1455,10 +1465,8 @@
|
||||||
color:#888;
|
color:#888;
|
||||||
}
|
}
|
||||||
.ske-padding{
|
.ske-padding{
|
||||||
padding: 5rpx 30rpx 36rpx 30rpx;
|
padding:20rpx 35rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-bottom-money-zhen span{
|
.header-bottom-money-zhen span{
|
||||||
color: #F95900 !important;
|
color: #F95900 !important;
|
||||||
font-weight: bold !important;
|
font-weight: bold !important;
|
||||||
|
@ -1893,9 +1901,9 @@
|
||||||
}
|
}
|
||||||
.pay-title{
|
.pay-title{
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 31rpx;
|
font-size: 32rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 10px;
|
||||||
}
|
}
|
||||||
page {
|
page {
|
||||||
background: #f7f7f7;
|
background: #f7f7f7;
|
||||||
|
@ -2057,20 +2065,28 @@
|
||||||
/* #endif */
|
/* #endif */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
.push-button{
|
||||||
.pay_btn {
|
width: 100%;
|
||||||
width: 96%;
|
height: 48px;
|
||||||
margin-left:2%;
|
position: fixed;
|
||||||
|
bottom: 0px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
|
.pay_btn{
|
||||||
|
display: inline-block;
|
||||||
|
width: 92%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||||
height:80rpx;
|
height: 40px;
|
||||||
border-radius: 80rpx;
|
border-radius: 28px;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
line-height: 80rpx;
|
line-height: 40px;
|
||||||
font-size: 32rpx;
|
margin-top: 4px;
|
||||||
position: fixed;
|
font-size: 34rpx;
|
||||||
bottom:0px;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.serverAddress {
|
.serverAddress {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -2078,6 +2094,87 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.head-title{
|
.head-title{
|
||||||
|
font-weight: bold;
|
||||||
|
font-size:30rpx;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
.server-yuhui{
|
||||||
|
background: #fdeee9;
|
||||||
|
font-size: 14px;
|
||||||
|
color: #FF6000;
|
||||||
|
border-radius: 17px;
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
padding: 0 14px;
|
||||||
|
}
|
||||||
|
.Service-add{
|
||||||
|
font-size:30rpx;
|
||||||
|
color: #333;
|
||||||
|
border-radius:5rpx;
|
||||||
|
}
|
||||||
|
.Service-Address{
|
||||||
|
font-size:34rpx;
|
||||||
|
color: #333;
|
||||||
|
font-weight: bold;
|
||||||
|
padding: 6rpx 0;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
.Service-name{
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
|
color: #333;
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end;
|
||||||
|
padding:4rpx 0;
|
||||||
|
}
|
||||||
|
.Service-name span:nth-child(1){
|
||||||
|
font-size:28rpx;
|
||||||
|
color:#333;
|
||||||
|
margin-right: 15rpx;
|
||||||
|
}
|
||||||
|
.Service-name span:nth-child(2){
|
||||||
|
font-size:28rpx;
|
||||||
|
color:#666;
|
||||||
|
}
|
||||||
|
.add-content{
|
||||||
|
background: #FFFFFF url(../../static/address/map.png)no-repeat top right;
|
||||||
|
background-size:40%;
|
||||||
|
border-radius: 24rpx;
|
||||||
|
}
|
||||||
|
.value-font{
|
||||||
|
font-size: 30rpx;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
.jusitify-line{
|
||||||
|
height: 76rpx;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.jusitify-line-end{
|
||||||
|
height:1px;
|
||||||
|
border-bottom: 1px #e5e5e5 solid;
|
||||||
|
margin: 30rpx 0;
|
||||||
|
}
|
||||||
|
.line-word{
|
||||||
|
color: #666;
|
||||||
|
}
|
||||||
|
.line-word-r{
|
||||||
|
color: #333;
|
||||||
|
}
|
||||||
|
.title-font{
|
||||||
|
font-size:30rpx;
|
||||||
|
color: #333333;
|
||||||
|
}
|
||||||
|
.detail-view-img{
|
||||||
|
width: 76px;
|
||||||
|
height: 76px;
|
||||||
|
border-radius: 9px;
|
||||||
|
}
|
||||||
|
.head-title-right{
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue