This commit is contained in:
Mr.jiang 2024-07-22 19:42:06 +08:00
commit 2cc11e0328
43 changed files with 1380 additions and 1247 deletions

View File

@ -3134,7 +3134,7 @@ scroll-view.cu-steps .cu-item {
.margin-tb-sm {
margin-top: 20upx;
margin-bottom: 20upx;
margin-bottom: 13upx;
}
.margin-tb {

View File

@ -28,7 +28,7 @@
<view
class="position_view" :animation="animationData1"
style="background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 8rpx;width: 81.25rpx;"
border-radius: 30rpx;width: 81.25rpx;"
></view>
</view>
</template>
@ -146,11 +146,11 @@ export default {
.switch-container {
display: flex;
flex-direction: row;
width: 126rpx;
height: 48rpx;
width: 144rpx;
height: 58rpx;
background: #fff;
border: 1rpx #41b9a6 solid;
border-radius: 10rpx;
border-radius: 30rpx;
position: relative;
.switch_view{
position: absolute;

View File

@ -437,8 +437,8 @@
position: absolute;
top:140rpx;
left: 25rpx;
color: #f9f3d3;
background: linear-gradient(to right, #fe912e, #ffa350);
color: #fff;
background: linear-gradient(to right, #019c88, #73d8b4);
width: 126upx;
text-align: center;
border-radius:90rpx 60rpx 60rpx 30rpx;

View File

@ -294,8 +294,7 @@
</view>
<view class="flex justify-between jusitify-line" >
<view class="line-word title-font">出行费用</view>
<view class="line-word-r value-font" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="line-word-r value-font" v-else>-</view>
<view class="line-word-r value-font">{{order.taxiMoney}}</view>
</view>
<view class="jusitify-line-end jusitify-line"></view>
<view class="justify-title-nav">
@ -2694,8 +2693,8 @@ export default {
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -2053,10 +2053,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;

View File

@ -397,25 +397,25 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">订单费用</view>
<view class="line-word title-font">订单费用</view>
<view class="line-word-r value-font" v-if="order.oldMassageMoney==null">
<text style="font-weight: bold;">{{order.massageMoney}}</text></view>
<view class="line-word-r value-font" v-else><text style="font-weight: bold;">{{order.oldMassageMoney}}</text></view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">出行费用</view>
<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="jusitify-line">
<view class="line-word title-font">优惠券</view>
<view class="line-word title-font">优惠券</view>
<view class="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="jusitify-line">
<view class="line-word title-font">加钟费用</view>
<view class="line-word title-font">加钟费用</view>
<view class="line-word-r value-font" >
<text style="font-weight: bold;" v-if="order.addMoney">{{order.addMoney}}</text>
<text class="line-word-r value-font" v-else>-</text>
@ -2184,9 +2184,9 @@ export default {
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
color: #333333;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
width: 55rpx;

View File

@ -9,19 +9,19 @@
<image :src="orderXm.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="head-bottom margin-left-sm">
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs text-df u-skeleton-fillet head-title">
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="justify-content: space-between;">
<text class="title-font">服务时长</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;">
<text class="title-font">服务时长</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view>
</view>
<view class="money-pay">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
@ -43,113 +43,107 @@
</view>
</view>
</view>
<view class="ske-padding margin-top-sm header-view">
<view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs">
<view class="jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font" >
<text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">更换</text>
</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{mobile}}
</view>
</view>
<view class="jusitify-line" style="align-items: center;">
<view class="line-word title-font">服务地址</view>
<view class="line-word-r value-font" style="width: 73%; text-align: right; ">
<span>
{{province}}/{{city}}/{{district}}/{{detailaddress}}
</span>
</view>
</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 class="ske-padding margin-top-sm header-view">
<view class="jusitify-line" @click="liliaoshi">
<view class="line-word title-font" >
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
<span >技师</span>
</view>
<view >
<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
<span class="line-word-r value-font" v-else>选择不同等级的技师价格不同哦~</span>
<span class="view-more"></span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word title-font" >
<span >项目原价</span>
</view>
<view >
<span class="line-word-r value-font">{{orderXm.price}}</span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word title-font" >
<span>{{jishiName.technicianTypeName}}</span>
<span >价格</span>
</view>
<view >
<span class="line-word-r value-font" style="color: #019c88">{{technicianRate}}</span>
</view>
</view>
<view class="jusitify-line" @click="youhuijuan">
<view class="line-word title-font">优惠券</view>
<view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-{{couponDataList}}</span>
</view>
<span v-else>选择优惠券</span>
<span class="view-more"></span>
</view>
<view class="header-view header-padd header-margin ">
<view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs">
<view class="jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font" >
<text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">更换</text>
</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">服务时间</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>
</view> -->
<view class="flex align-center justify-between value-font" style="margin-top: 15rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</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 class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{mobile}}
</view>
</view>
</view>
<view class="margin-top-xl pay-ding">
<view class="d-title title-font">备注</view>
<view class="list-pay">
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
<view class="jusitify-line" style="align-items: center;">
<view class="line-word title-font">服务地址</view>
<view class="line-word-r value-font" style="width: 73%; text-align: right; ">
<span>
{{province}}/{{city}}/{{district}}/{{detailaddress}}
</span>
</view>
</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 class="header-view header-padd header-margin ">
<view class="jusitify-line" @click="liliaoshi">
<view class="line-word title-font" >
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
<span >技师</span>
</view>
<view >
<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName}}</span>
<span class="line-word-r value-font" v-else>选择不同等级的技师价格不同哦~</span>
<span class="view-more"></span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word title-font" >
<span >项目原价</span>
</view>
<view >
<span class="line-word-r value-font">{{orderXm.price}}</span>
</view>
</view>
<view class="jusitify-line" v-if="jishiName">
<view class="line-word title-font" >
<span>{{jishiName.technicianTypeName}}</span>
<span >价格</span>
</view>
<view >
<span class="line-word-r value-font" style="color: #019c88">{{technicianRate}}</span>
</view>
</view>
<view class="jusitify-line" @click="youhuijuan">
<view class="line-word title-font">优惠券</view>
<view class="header-bottom-money-zhen">
<view v-if="couponDataList" class="" style="margin-right: 5px;">
<span>-{{couponDataList}}</span>
</view>
<span v-else>选择优惠券</span>
<span class="view-more"></span>
</view>
</view>
<view class="jusitify-line">
<view class="line-word title-font">服务时间</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>
</view> -->
<view class="flex align-center justify-between value-font" style="margin-top: 15rpx;">
<view class="flex justify-between margin-tb-sm" @click="openData()">
<view v-if="startTime">{{startTime}}</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>-->
</view>
</view>
</view>
</view>
<view class="header-view header-padd header-margin">
<view class="d-title title-font">备注</view>
<view class="list-pay">
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
</view>
</view>
</view>
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -1387,7 +1381,7 @@
font-weight: bold;
font-size: 32rpx;
color: #333333;
margin-bottom: 8px;
margin-bottom: 12px;
}
.view-more{
display:inline-block;
@ -1585,15 +1579,15 @@
}
.xuanzhe{
background: linear-gradient(90deg, #029d88, #2fc094);
color: #ffffff;
margin-left: 5px;
border-radius: 15px;
height: 25px;
line-height: 25px;
width: 50px;
text-align: center;
font-size: 14px;
padding:6rpx 16rpx
color: #ffffff;
margin-left: 5px;
border-radius: 15px;
height: 25px;
line-height: 25px;
width: 50px;
text-align: center;
font-size: 14px;
padding:6rpx 16rpx
}
.header-view-data{
display: flex;
@ -1617,9 +1611,14 @@
}
.header-view{
background-color: #fff;
margin-bottom: 12px;
border-radius: 11px;
}
.header-padd{
padding: 36rpx;
}
.header-margin{
margin: 26rpx;
}
.head-foot span:nth-child(1){
margin-right: 5px;
}
@ -1690,13 +1689,12 @@
background-color: #ffffff;
border-radius: 24rpx;
padding: 29rpx;
margin-top: 10px;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 16px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1716,7 +1714,6 @@
}
.list-pay{
width: 100%;
padding: 0px 29rpx;
}
.pay-ding-top{
width: 100%;
@ -2012,7 +2009,7 @@
flex-direction: column;
align-items: center;
margin: 0 auto;
}
}
.pay_btn{
display: inline-block;
width: 92%;
@ -2047,6 +2044,13 @@
font-size: 32rpx;
color: #333333;
}
.head-title-right{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-weight: bold;
}
.title-font{
font-size: 30rpx;
color: #666666;

View File

@ -1715,11 +1715,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -1719,11 +1719,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -1717,11 +1717,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 16px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -1665,11 +1665,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 16px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -86,9 +86,9 @@
</view>
</view>
</view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -1248,6 +1248,16 @@
</script>
<style lang="scss" scoped>
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.header-bottom-money{
width: 100%;
display: flex;
@ -1706,11 +1716,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -2017,15 +2025,16 @@
}
.pay_btn {
width: 90%;
margin: 0 auto;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height:80rpx;
border-radius: 80rpx;
color: #ffffff;
line-height: 80rpx;
font-size: 32rpx;
display: inline-block;
width: 92%;
text-align: center;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
.serverAddress {
display: flex;

View File

@ -1746,11 +1746,9 @@
justify-content: space-between;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -1783,11 +1783,9 @@
justify-content: space-between;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
padding: 10px 15px 0px 15px;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -9,19 +9,25 @@
<image :src="orderXm.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="head-bottom margin-left-sm">
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="margin-right-xs u-skeleton-fillet head-title">
{{orderXm.title}}
</view>
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;">
<text class="title-font">服务时长</text><text class="value-font">{{orderXm.duration}}分钟</text>
</view>
</view>
<view class="money-pay">
<view class="money-pay-zhen">
<text class="title-font">项目价格</text>
<span></span>
<span>{{orderXm.packagePrice}}/</span>
<span>{{orderXm.packagePrice}}</span>
</view>
<view>
<uni-number-box :disabled="true" :width='27' :min="1" :value='1' @change="changeValue" />
@ -37,57 +43,56 @@
<view class="header-padd header-view header-margin">
<view v-if="!detailaddress">请选择地址</view>
<view class="margin-right-xs">
<view class="flex justify-between heaer-height">
<view class="header-view-text">联系人</view>
<view class="header-view-data">
<view class="jusitify-line">
<view class="line-word title-font">客户姓名</view>
<view class="line-word-r value-font">
<text>{{name}}</text>
<text class="xuanzhe" @click="getAddressList()">修改</text>
<text class="xuanzhe" @click="getAddressList()">更换</text>
</view>
</view>
<view class="flex justify-between heaer-height">
<view class="header-view-text">手机号码</view>
<view class="header-view-data">
<view class="jusitify-line">
<view class="line-word title-font">联系方式</view>
<view class="line-word-r value-font">
{{mobile}}
</view>
</view>
<view class="flex justify-between heaer-height">
<view class="header-view-text">详细地址</view>
<view class="flex adders-view">
<view class="jusitify-line" style="align-items: center;">
<view class="line-word title-font">服务地址</view>
<view class="line-word-r value-font" style="width: 73%; text-align: right; ">
<span>
{{province}}/{{city}}/{{district}}/{{detailaddress}}
</span>
<span class="view-more"></span>
</view>
</view>
</view>
</view>
<view class="header-view header-padd header-margin ">
<view class="fuwu-time heaer-height" @click="liliaoshi">
<view class="fuwu-title" >
<view class="jusitify-line" @click="liliaoshi">
<view class="line-word title-font" >
<span>技师</span>
<!-- <span v-if="jishiName">{{jishiName.technicianTypeName}}</span> -->
</view>
<view class="liliao-bottom" >
<span v-if="jishiName.artificerId">{{jishiName.artificerName}}</span>
<span v-else>选择技师</span>
<view >
<span class="line-word-r value-font" v-if="jishiName.artificerId">{{jishiName.artificerName}}</span>
<span class="line-word-r value-font" v-else>选择技师</span>
<span class="view-more"></span>
</view>
</view>
<view class="fuwu-time heaer-height">
<view class="fuwu-title">
<view class="jusitify-line">
<view class="line-word title-font">
服务时间
</view>
<view class="flex align-center justify-between" style="ppadding: 0rpx 10rpx;">
<view class="flex align-center justify-between value-font" 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 value-font" v-else>请选择预约时间<span class="view-more"></span></view>
</view>
</view>
</view>
</view>
<view class="header-view header-padd header-margin">
<view class="d-title">备注</view>
<view class="d-title title-font">备注</view>
<view class="list-pay">
<view class="textarea-pay-list">
<textarea @input="textareaChange" class="textarea-pay" v-model="textareaData" placeholder="请输入备注" name="" maxlength="100"></textarea>
@ -95,8 +100,9 @@
</view>
</view>
<view class="pay_btn" style="margin-top: 30px;" @click="openpay()">去支付</view>
<view class="push-button">
<view class="pay_btn" @click="openpay()">去支付</view>
</view>
</view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<u-popup v-model="showorder" mode="bottom" :closeable="closeable">
@ -1392,12 +1398,7 @@
}
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-size: 32rpx;
font-weight: bold;
}
.money-pay-zhen{
@ -1708,12 +1709,13 @@
background: linear-gradient(90deg, #029d88, #2fc094);
color: #ffffff;
margin-left: 5px;
border-radius: 30rpx;
height:50rpx;
line-height: 50rpx;
width: 100rpx;
text-align:center;
font-size: 26rpx;
border-radius: 15px;
height: 25px;
line-height: 25px;
width: 50px;
text-align: center;
font-size: 14px;
padding:6rpx 16rpx
}
.header-view-data{
display: flex;
@ -1811,10 +1813,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 29rpx;
color: #222;
width: 100%;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.checkbox-data{
padding: 0px 11px;
@ -1959,10 +1960,10 @@
background-color: #f7f7f7;
}
.pay-title{
font-weight: bold;
font-size: 31rpx;
color: #333333;
margin-bottom: 8px;
font-weight: bold;
font-size: 32rpx;
color: #333333;
margin-bottom: 12px;
}
page {
background: #f7f7f7;
@ -2125,16 +2126,27 @@
}
.pay_btn {
width: 90%;
.push-button{
width: 100%;
height: 48px;
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;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height:80rpx;
border-radius: 80rpx;
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 80rpx;
font-size: 32rpx;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
.serverAddress {
display: flex;
@ -2151,4 +2163,35 @@
height: 80rpx;
align-items: center;
}
.head-title{
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.head-title-right{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
font-weight: bold;
}
.title-font{
font-size: 30rpx;
color: #666666;
}
.value-font{
font-size: 30rpx;
color: #333333;
}
.jusitify-line{
height: 78rpx;
padding: 20rpx 0;
display: flex;
justify-content: space-between;
}
.jusitify-line-end{
height:1px;
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
</style>

View File

@ -1718,10 +1718,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;

View File

@ -2439,8 +2439,8 @@
height: 44rpx;
}
.d-title{
font-weight: 550;
font-size: 30rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{
@ -2478,7 +2478,7 @@
padding: 29rpx;
}
.content{
padding-top: 20px;
padding-top: 11px;
width: 100%;
background-color: #f7f7f7;
}

View File

@ -1216,11 +1216,9 @@
padding: 29rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
padding: 10px 15px 0px 15px;
width: 100%;
}
.checkbox-data{
padding: 0px 11px;

View File

@ -83,7 +83,7 @@
</view>
<view class="serverAddress">
<view class="add-con-title title-font">服务地址</view>
<view class=" value-font" style=";width: 73%; text-align: right;">{{order.address}}</view>
<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
@ -120,7 +120,7 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">订单编号</view>
<view class="add-con-title title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)">
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
@ -196,9 +196,9 @@
<view class="add-con-cont value-font" style="color: #FF6000;" v-if="order.couponMoney">-{{order.couponMoney}}</view>
<view class="add-con-cont value-font" v-else>-</view>
</view>
<view class="textarea-pay-list" v-if="order.remark">
<view calss="title-font">备注内容</view>
<view class="jusitify-line-end"></view>
<view calss="title-font">备注</view>
<view class="beizhu value-font">{{order.remark}}</view>
</view>
</view>
@ -1718,10 +1718,9 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-weight: bold;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 60rpx;
@ -1766,7 +1765,7 @@
font-weight: bold;
font-size: 32rpx;
color: #333333;
margin-bottom: 8px;
margin-bottom: 12px;
}
page {
background: #f7f7f7;
@ -1950,9 +1949,6 @@
.head-text{
font-size:30rpx;
}
.zhuangtai{
color: #029D88;
}
.level_button{
padding: 3rpx 13rpx;
background: linear-gradient(to right, #fe9131, #ff9869);
@ -2002,9 +1998,9 @@
color: #333;
}
.jusitify-line-end{
height: 1px;
border-bottom: 1px #f4f4f4 solid;
margin: 15px 0;
height:1px;
border-bottom: 1px #e5e5e5 solid;
margin: 30rpx 0;
}
.head-title{
font-weight: bold;

View File

@ -1310,8 +1310,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -1823,8 +1823,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -1309,8 +1309,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -1410,8 +1410,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

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;">
@ -15,11 +15,11 @@
</view>
<view class="u-flex-1 margin-left-sm">
<view class="flex head-title-right">
<view class="head-text">
<view class="head-title">
{{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>
@ -33,14 +33,15 @@
</view>
<view class="flex align-center">
<view style="width: 100%;">
<view class="flex justify-between margin-tb-sm" style="color: #999999;">
<view class="flex justify-between margin-tb-sm">
<view style="justify-content: space-between;">
{{order.duration}}分钟
<text class="title-font">服务时长</text><text class="value-font">{{order.duration}}分钟</text>
</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.massagePrice}} </span>
<!-- <span style="color: #666;font-size: 12px;margin-left: 3px;"> x{{order.massageNum}}</span> -->
@ -62,21 +63,21 @@
</view>
<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 add-lin">
<view class="add-con-title">下单人</view>
<view class="add-con-cont">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">客户姓名</view>
<view class="add-con-cont value-font">
{{order.userName}}
</view>
</view>
<view class="flex align-center justify-between add-lin">
<view class="add-con-title">联系方式</view>
<view class="add-con-cont">
<view class="flex justify-between add-lin">
<view class="add-con-title title-font">联系方式</view>
<view class="add-con-cont value-font">
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
</view>
</view>
<view class="serverAddress add-lin">
<view class="add-con-title">服务地址</view>
<view class="add-con-cont" style="width: 73%; line-height: 34rpx;">{{order.address}}</view>
<view class="serverAddress">
<view class="add-con-title title-font">服务地址</view>
<view class="value-font" style="width: 73%; text-align: right;">{{order.address}}</view>
</view>
</view>
</view>
@ -94,8 +95,7 @@
<!-- <image src="../../static/img/phone.png" class="phone-pay"
@click="bindphone(order.artificer.phone)"></image> -->
</view>
<view class="level_button">{{order.technicianType=='3'?'新手':order.technicianType=='4'?'专家':order.technicianType=='5'?'资深':''}}</view>
<view class="level_button">{{order.technicianTypeName}}</view>
</view>
</view>
<view class="list-pay">
@ -104,21 +104,21 @@
<view class="justify-title-nav-bor"></view>
</view>
<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: 26rpx;">
<view class="add-con-cont">{{order.ordersNo}}</view>
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
<view class="add-con-title title-font">订单编号</view>
<view class="flex align-center" @tap="copy(order.ordersNo)">
<view class="value-font">{{order.ordersNo}}
<u-icon name="file-text" style="color: #096f4b;margin-left: 10rpx;"></u-icon>
</view>
</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">预约时间</view>
<view class="add-con-cont">{{order.serveTime}}</view>
<view class="add-con-title title-font">预约时间</view>
<view class="add-con-cont value-font">{{order.serveTime}}</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">下单时间</view>
<view class="add-con-cont">{{order.createTime}}</view>
<view class="add-con-title title-font">下单时间</view>
<view class="add-con-cont value-font">{{order.createTime}}</view>
</view>
<view class="jusitify-line-end"></view>
<view class="justify-title-nav ">
@ -126,38 +126,35 @@
<view class="justify-title-nav-bor"></view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title"> {{order.packageType=='105'?'项目次卡':order.packageType=='106'?'服务疗程':'套餐名称'}}</view>
<view class="add-con-cont">
<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>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">项目名称</view>
<view class="add-con-cont">{{order.entryName}}</view>
<view class="add-con-title title-font">项目名称</view>
<view class="add-con-cont value-font">{{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 class="add-con-title title-font">服务时长</view>
<view class="add-con-cont value-font">{{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 class="add-con-title title-font">项目价格</view>
<view class="add-con-cont value-font" style="color: #019c88;">{{order.massagePrice}}</view>
</view>
<!-- <view class="flex justify-between add-lin">
<view class="add-con-title title-font">会员减免</view>
<view class="add-con-cont value-font" >-{{order.vipReductionMoney}}</view>
</view> -->
<view class="flex justify-between add-lin">
<view class="add-con-title">会员减免</view>
<view class="add-con-cont" >-{{order.vipReductionMoney}}</view>
<view class="add-con-title title-font">应付金额</view>
<view class="add-con-cont value-font">{{order.massagePrice}}</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 align-center margin-top-lg" style="justify-content: flex-end;padding-bottom:5px ;margin: 5px 0px;">
<view style="color: #333;font-size: 26rpx;">实付金额</view>
<view class="" style="color: #333;">
<text style="font-size: 35rpx;font-weight: bold;">
0
</text>
<view class="flex justify-between add-lin" style="justify-content: flex-end;">
<view class="title-font">实付金额</view>
<view class="add-con-cont value-font" style="font-weight: bold;">
<text>0</text>
</view>
</view>
<view class="jusitify-line-end"></view>
@ -166,41 +163,43 @@
<view class="justify-title-nav-bor"></view>
</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 class="add-con-title title-font">出行方式</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 1">公交</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 2">出租</view>
<view class="add-con-cont value-font" v-if="order.tripWay == 3">免费</view>
</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 class="add-con-title title-font">全程距离</view>
<view class="add-con-cont value-font">{{order.km}}km</view>
</view>
<view class="flex justify-between add-lin">
<view class="add-con-title">出行交通费用</view>
<view class="add-con-cont" v-if="order.taxiMoney">{{order.taxiMoney}}</view>
<view class="add-con-cont" v-else>-</view>
<view class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font">{{order.taxiMoney}}</view>
</view>
<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 class="jusitify-line-end"></view>
<view class="title-font">备注</view>
<view class="beizhu value-font">{{order.remark}}</view>
</view>
</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-weight: bold;">0</text></view>
<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 add-lin">
<view class="add-con-title">出行费用</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 class="add-con-title title-font">出行费用</view>
<view class="add-con-cont value-font"><text style="font-weight: bold;">{{order.taxiMoney}}</text></view>
</view>
<view class="fei-view-list-z">
<span>总金额</span>
<span style="color: #FF3939;font-size: 34rpx;">{{order.taxiMoney}}</span>
<view class="fei-view-list-z" style="justify-content: flex-end;">
<span class="title-font">合计</span>
<span class="value-font" style="color: #FF1200;font-weight: bold;font-size: 40rpx;">{{order.taxiMoney}}</span>
</view>
</view>
</view>
@ -562,6 +561,15 @@
this.loading = false
uni.hideLoading()
this.order = res.data;
if(res.data["technicianType"] == 3){
this.order["technicianTypeName"] = "新手"
}
if(res.data["technicianType"] == 4){
this.order["technicianTypeName"] = "专家"
}
if(res.data["technicianType"] == 5){
this.order["technicianTypeName"] = "资深"
}
var date = new Date(); //
var timestamp = this.getTimeStampWithoutSeconds(date); //
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; //
@ -1722,13 +1730,13 @@
}
.dingshi{
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
}
.zhuangtai{
color: #029D88;
font-weight: bold;
font-size: 32rpx;
}
.head-title-right{
display: flex;
@ -1736,22 +1744,12 @@
align-items: center;
justify-content: space-between;
}
.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;
font-size: 30rpx;
}
.fei-view-list-z{
height: 65rpx;
background-color: rgba(247, 247, 247, 0.8);
border-radius: 33rpx;
padding: 0px 10px;
padding-top: 20rpx;
}
.fei-view-list span:nth-child(1),.fei-view-list-z span:nth-child(1){
color: #666666;
@ -1830,14 +1828,13 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 32rpx;
color: #333333;
font-weight: bold;
}
.d-touxiang{
width: 46rpx;
height: 46rpx;
width: 60rpx;
height: 60rpx;
border-radius: 50%;
}
.money-pay-jia{
@ -1849,12 +1846,7 @@
}
.money-pay-zhen span{
color: #FF6000;
}
.money-pay-zhen span:nth-child(1){
font-size: 25rpx;
}
.money-pay-zhen span:nth-child(2){
font-size: 31.25rpx;
font-size: 32rpx;
font-weight: bold;
}
.money-pay-zhen{
@ -1871,7 +1863,7 @@
.head-top{
background-color: #ffffff;
border-radius: 24rpx;
padding: 29rpx;
padding: 30rpx;
}
.content{
padding-bottom: 140rpx;
@ -1883,7 +1875,7 @@
font-weight: bold;
font-size: 32rpx;
color: #333333;
margin-bottom: 8px;
margin-bottom: 12px;
}
page {
background: #f7f7f7;
@ -2067,8 +2059,8 @@
font-size:30rpx;
}
.add-lin{
height: 80rpx;
line-height: 80rpx;
height: 74rpx;
line-height: 74rpx;
}
.add-con-title{
color: #999;
@ -2108,8 +2100,21 @@
color: #333;
}
.jusitify-line-end{
height: 1px;
border-bottom: 1px #f4f4f4 solid;
margin: 15px 0;
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;
}
</style>

View File

@ -1410,8 +1410,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -1979,8 +1979,8 @@
height: 44rpx;
}
.d-title{
font-weight: 400;
font-size: 25rpx;
font-weight: bold;
font-size: 32rpx;
color: #333333;
}
.d-touxiang{

View File

@ -9,10 +9,14 @@
</view>
</view> -->
<view class="index-line" >
<view v-if="XCXIsSelect != ''" class="flex locate-line dingwei-view"
@tap="goCity">
<image src="../../static/liliao-1.png" class="dingwei-img"></image>
<view class="localName">{{ city }}</view>
<view class="flex">
<image class="salogo" src="../../static/salogo.gif"></image>
<view v-if="XCXIsSelect != ''" class="flex locate-line"
@tap="goCity">
<!--<image src="../../static/liliao-1.png" class="dingwei-img"></image>-->
<view class="localName">{{ city }}</view>
<view class="view-more"></view>
</view>
</view>
<!-- <view class="index-top-left font-size-34">盛安到家</view> -->
<view class="index-top-mian">
@ -30,6 +34,7 @@
<span>平台担保</span>
</view>-->
</view>
<view class="index-headset">
<!--<image style="width: 26rpx; height: 26rpx;" src="../../static/index-nav-4.png" @click="goChat()" mode="widthFix"></image>
<image src="../../static/index-nav-5.png" mode="widthFix"></image> -->
@ -37,8 +42,10 @@
<image class="index-yanzheng" src="../../static/images/index/renzheng02.png" mode=""></image>
<image class="index-yanzheng" src="../../static/images/index/renzheng03.png" mode=""></image>
</view>
</view>
<view class="flex align-center index-mian">
<uni-search-bar placeholder="请输入项目名称" @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
@ -1075,13 +1082,18 @@
</script>
<style scoped>
.salogo{
width: 140rpx;
height: 36rpx;
margin-left: 20rpx;
}
.index-yanzheng{
width: 110rpx;
height: 26rpx;
margin-left: 10rpx;
width: 100rpx;
height: 22rpx;
margin-left: 4rpx;
}
.localName{
width: 85px;
width: 100px;
margin-left: 4rpx;
font-weight: bold;
color: #333333;
@ -1090,6 +1102,17 @@
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
.view-more{
display: inline-block;
border-top: 1px solid;
border-right: 1px solid;
width: 7px;
height: 7px;
border-color: #999;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
margin-top: 3px;
}
/deep/.uni-icons{
font-family: uniicons;
text-decoration: none;
@ -1180,6 +1203,7 @@
/deep/.uni-searchbar{
width:80%;
border-radius: 31rpx;
margin-left: 6rpx;
}
.index-headset{
margin-right: 30rpx;
@ -1188,7 +1212,7 @@
margin-top: 4rpx;
}
.locate-line{
padding-left: 25rpx;
/*padding-left: 25rpx;*/
margin-top: 3rpx;
display: flex;
align-items: center;

View File

@ -180,8 +180,8 @@
.shop_label span{
background: #e5e5e5;
border-radius: 8rpx;
padding: 2rpx 8rpx;
font-size: 20rpx;
padding: 3rpx 10rpx;
font-size: 22rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
@ -199,20 +199,20 @@
font-size: 28rpx;
color: #FFFFFF;
}
.item-view-bottom-qian span:nth-child(5){
font-size: 28rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4){
font-size: 28rpx;
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
}
.item-view-bottom-qian span:nth-child(5){
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
@ -221,8 +221,7 @@
color: #F95900;
}
.item-view-bottom-qian span:nth-child(3){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom{
@ -230,7 +229,6 @@
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@ -283,7 +281,7 @@
.item-view-title{
width: 76%;
font-weight: bold;
font-size: 32rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
@ -295,6 +293,8 @@
display: flex;
flex-direction: column;
justify-content: center;
justify-content: space-between;
padding: 10rpx 0;
}
.item-img{
width: 285rpx;
@ -302,6 +302,9 @@
border-radius: 14rpx;
position: relative;
}
.item-img img{
border-radius: 14rpx;
}
.img-span{
padding: 2px 5px;
font-weight: 400;
@ -321,7 +324,8 @@
border-radius: 14rpx;
}
.item {
width: 100%;
width:96%;
margin:0 auto ;
display: flex;
flex-direction: row;
justify-content: space-between;
@ -330,7 +334,7 @@
border-radius: 21rpx;
margin-top:10px;
align-items: center;
padding: 0px 10px;
padding:12px;
}
.item-detail {
@ -354,7 +358,7 @@
width:100%;
}
/deep/.zp-paging-container-content{
width: 95%;
width: 100%;
margin: 50px auto 0px auto;
}
.fenlei{
@ -386,48 +390,53 @@
/deep/.uni-searchbar__cancel{
display: none;
}
.search-btn{
text-align: center;
line-height: 31px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
.search-btn{
text-align: center;
line-height: 28px;
color: #fff;
position: absolute;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar{
width: 240px;
width: 230px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
}
.service-head-top-left{
display: flex;
@ -441,9 +450,11 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color: #fff;
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1;
position: fixed;
z-index: 999;
padding-top: 6rpx;
}
.view-cata{
display: flex;

View File

@ -180,8 +180,8 @@
.shop_label span{
background: #e5e5e5;
border-radius: 8rpx;
padding: 2rpx 8rpx;
font-size: 20rpx;
padding: 3rpx 10rpx;
font-size: 22rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
@ -200,19 +200,19 @@
color: #FFFFFF;
}
.item-view-bottom-qian span:nth-child(5){
font-size: 28rpx;
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4){
font-size: 28rpx;
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
@ -222,7 +222,7 @@
}
.item-view-bottom-qian span:nth-child(3){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom{
@ -230,7 +230,6 @@
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@ -283,7 +282,7 @@
.item-view-title{
width: 76%;
font-weight: bold;
font-size: 32rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
@ -294,7 +293,8 @@
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
justify-content: space-between;
padding: 10rpx 0;
}
.item-img{
width: 285rpx;
@ -321,16 +321,17 @@
border-radius: 14rpx;
}
.item {
width: 100%;
width: 96%;
margin: 0 auto;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 140px;
background: #FFFFFF;
border-radius: 21rpx;
margin-top:12px;
margin-top:10px;
align-items: center;
padding: 10px;
padding: 12px;
}
.item-detail {
@ -354,7 +355,7 @@
width:100%;
}
/deep/.zp-paging-container-content{
width: 95%;
width: 100%;
margin: 0 auto;
}
.fenlei{
@ -388,46 +389,51 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
/deep/.uni-searchbar{
width: 230px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
}
.service-head-top-left{
display: flex;
@ -441,7 +447,9 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color: #fff;
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1;
padding-top: 6rpx;
}
.view-cata{
display: flex;

View File

@ -110,9 +110,10 @@
</view>
</view>
<view class="detail-btn btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
立即购买
<view class="push-button">
<view class="detail-btn" v-if="dataList.name=='index'" @click="openpay(mainData)">
立即预约
</view>
</view>
<!-- 支付方式 -->
<u-popup v-model="showpay" mode="bottom" :closeable="closeable">
@ -688,6 +689,16 @@
}
</script>
<style scoped>
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.lab-view{
width:100%;
display: flex;
@ -947,16 +958,16 @@
color: #fff;
}
.detail-btn{
width:95%;
height: 92rpx;
line-height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
margin: 0 auto;
display: inline-block;
width: 92%;
text-align: center;
font-weight: 400;
font-size: 42rpx;
color: #FFFFFF;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
.detail-foot-mian-txet span:nth-child(1){
color: #777777;

View File

@ -160,8 +160,8 @@
.shop_label span{
background: #e5e5e5;
border-radius: 8rpx;
padding: 2rpx 8rpx;
font-size: 20rpx;
padding: 3rpx 10rpx;
font-size: 22rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
@ -280,9 +280,9 @@
}
.item-view-title-text{
display: inline-block;
width: 100px;
width: 120px;
font-weight: bold;
font-size: 30rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
white-space: nowrap;
@ -300,6 +300,8 @@
display: flex;
flex-direction: column;
justify-content: center;
justify-content: space-between;
padding: 10rpx 0;
}
.item-img{
width: 285rpx;
@ -326,16 +328,17 @@
border-radius: 14rpx;
}
.item {
width: 96%;
margin: 12px auto;
width:96%;
margin:0 auto ;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 140px;
background: #FFFFFF;
border-radius: 21rpx;
margin-top:10px;
align-items: center;
padding: 12px;
padding:12px;
}
.item-detail {

View File

@ -8,7 +8,7 @@
<span>{{typeData=='104'?'服务套餐':typeData=='105'?'次卡':'服务疗程'}}</span>
</view>
<view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@clear="clear">
</uni-search-bar>
<view class="search-btn" @click="searchBtn">
@ -217,7 +217,7 @@
background: #e5e5e5;
border-radius: 8rpx;
padding: 3rpx 10rpx;
font-size: 20rpx;
font-size: 22rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
@ -237,13 +237,13 @@
height: 100vh;
overflow: hidden;
background-color: #f7f7f7;
position: relative;
/*position: relative;*/
}
.item-view-bottom-btn{
text-align: center;
width: 131rpx;
height: 55rpx;
line-height: 55rpx;
height: 56rpx;
line-height: 56rpx;
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
border-radius: 10rpx;
font-weight: bold;
@ -263,7 +263,7 @@
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
@ -272,7 +272,7 @@
color: #F95900;
}
.item-view-bottom-qian span:nth-child(3){
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom{
@ -334,7 +334,7 @@
.item-view-title{
width: 76%;
font-weight: bold;
font-size: 30rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
@ -443,8 +443,8 @@
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 32px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #09a28a;
padding: 0px;
@ -456,19 +456,19 @@
}
.search-btn{
text-align: center;
line-height: 27px;
line-height: 28px;
color: #fff;
position: absolute;
right: 20rpx;
top: 28rpx;
height: 26px !important;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar{
width: 240px;
border-radius: 31rpx;
position: relative;
}
/deep/.uni-input-input {
position: relative;
display: block;
height: 100%;
background: none;

View File

@ -84,8 +84,10 @@
</view> -->
</view>
</view>
<view class="detail-btn btn" @click="goumai(getList)">
立即预约
<view class="push-button">
<view class="detail-btn" @click="goumai(getList)">
立即预约
</view>
</view>
</view>
</template>
@ -163,6 +165,16 @@
}
</script>
<style scoped>
.push-button{
width: 100%;
height: 48px;
position: fixed;
bottom: 0px;
display: flex;
flex-direction: column;
align-items: center;
margin: 0 auto;
}
.lab-view{
width:100%;
display: flex;
@ -306,16 +318,16 @@
color: #fff;
}
.detail-btn{
width:95%;
height: 92rpx;
line-height: 92rpx;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
border-radius: 46rpx;
margin: 0 auto;
display: inline-block;
width: 92%;
text-align: center;
font-weight: 400;
font-size: 42rpx;
color: #FFFFFF;
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
height: 40px;
border-radius: 28px;
color: #ffffff;
line-height: 40px;
margin-top: 4px;
font-size: 34rpx;
}
.detail-foot-mian-txet span:nth-child(1){
color: #777777;

View File

@ -7,8 +7,8 @@
<template #top>
<view class="service-head-top">
<view class="service-head-top-left">
<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
<image style="width: 136rpx; height:40rpx ;" src="../../static/seckill.png"></image>
<image class="service-fh" @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
<image class="service-img" src="../../static/seckill.png"></image>
</view>
<view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@ -404,7 +404,8 @@
border-radius: 14rpx;
}
.item {
width: 100%;
width: 96%;
margin: 0 auto;
display: flex;
flex-direction: row;
justify-content: space-between;
@ -413,7 +414,7 @@
border-radius: 21rpx;
margin-top:10px;
align-items: center;
padding: 0px 10px;
padding: 12px;
}
.item-detail {
@ -437,7 +438,7 @@
width:100%;
}
/deep/.zp-paging-container-content{
width: 95%;
width: 100%;
margin: 50px auto 0px auto;
}
.fenlei{
@ -471,41 +472,45 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
/deep/.uni-searchbar{
width: 240px;
width: 230px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
.service-fh{
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-img{
width: 172rpx;
height: 40rpx;
}
.service-head-top-left span{
font-weight: bold;
@ -524,9 +529,11 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
background-color: #fff;
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1;
position: fixed;
z-index: 999;
padding-top: 6rpx;
}
.view-cata{
display: flex;

View File

@ -180,8 +180,8 @@
.shop_label span{
background: #e5e5e5;
border-radius: 8rpx;
padding: 2rpx 8rpx;
font-size: 20rpx;
padding: 3rpx 10rpx;
font-size: 22rpx;
margin-right: 8rpx;
margin-bottom: 8rpx;
}
@ -210,19 +210,19 @@
color: #FFFFFF;
}
.item-view-bottom-qian span:nth-child(5){
font-size: 28rpx;
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
}
.item-view-bottom-qian span:nth-child(4){
font-size: 28rpx;
font-size: 26rpx;
color: #848484;
text-decoration-line: line-through;
margin-left: 5px;
}
.item-view-bottom-qian span:nth-child(1){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom-qian span:nth-child(2){
@ -232,7 +232,7 @@
}
.item-view-bottom-qian span:nth-child(3){
font-weight: 400;
font-size: 25rpx;
font-size: 26rpx;
color: #F95900;
}
.item-view-bottom{
@ -240,7 +240,6 @@
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.item-view-jianjie{
font-weight: 400;
@ -293,18 +292,20 @@
.item-view-title{
width: 76%;
font-weight: bold;
font-size: 32rpx;
font-size: 31rpx;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.item-view{
width: 55%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
width: 55%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
justify-content: space-between;
padding: 10rpx 0;
}
.item-img{
width: 285rpx;
@ -318,16 +319,17 @@
border-radius: 14rpx;
}
.item {
width: 100%;
width: 96%;
margin: 0 auto;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 140px;
background: #FFFFFF;
border-radius: 21rpx;
margin-top:12px;
margin-top:10px;
align-items: center;
padding:10px;
padding: 12px;
}
.item-detail {
@ -351,7 +353,7 @@
width:100%;
}
/deep/.zp-paging-container-content{
width: 95%;
width: 100%;
margin: 0 auto;
}
.fenlei{
@ -385,46 +387,51 @@
}
.search-btn{
text-align: center;
line-height: 31px;
line-height: 28px;
color: #fff;
position: absolute;
right: 0;
top: 0;
margin-top:9.4px;
margin-right: 11px;
height: 32px !important;
right:14rpx;
top: 25rpx;
height: 29px !important;
}
/deep/.uni-searchbar__box-icon-search,.search-btn{
width: 150rpx;
height: 60rpx;
width: 110rpx;
height: 50rpx;
background: #18A689;
border-radius: 31rpx;
}
/deep/.uni-searchbar__box{
height: 31px;
border-radius: 15px !important;
height: 30px;
border-radius: 30px !important;
background-color: #fff !important;
border: 1px solid #E5E5E5;
border: 1px solid #09a28a;
padding: 0px;
display: flex;
flex-direction: row;
flex-flow: row-reverse;
position: relative;
margin-top: 4rpx;
}
/deep/.uni-searchbar{
width: 230px;
border-radius: 31rpx;
}
.service-head-top-left image{
width: 25px;
height: 30rpx;
margin-right: 10px;
width: 20px;
height: 20rpx;
margin-right:5px;
margin-left: 10rpx;
}
.service-head-top-left span{
width: 180rpx;
height: 60rpx;
background:url('../../static/images/headline.png') 0rpx 26rpx;
background-repeat: no-repeat;
font-weight: bold;
font-size: 38rpx;
font-size: 34rpx;
color: #171717;
margin-top: 16rpx;
}
.service-head-top-left{
display: flex;
@ -438,7 +445,9 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
background: #ffffff;
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1;
padding-top: 6rpx;
}
.view-cata{
display: flex;

View File

@ -134,7 +134,7 @@
v-if="item.addNum==null&&item.isSupplement==null&&item.isSupplement!=2"
:custom-style="customStyle" shape="circle" :plain="true"
class="btns"
@click="goNav('/my/order/pay?ordersId='+item.ordersId)">
@click="goNav('/my/order/pay?ordersId='+item.ordersId,item)">
服务升级
</u-button>
@ -472,6 +472,7 @@
goNav(url,item,text) {
this.$queue.setData('xiangmu',item);
this.$queue.setData('getJishi','')
console.log(item);
if(item.isSupplement=='2'){//
if(item.addNum||item.isSupplement=='2'){
uni.navigateTo({

View File

@ -1273,6 +1273,7 @@ import permision from "@/components/permission.js";
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 10rpx;
}
/deep/.margin-bottom-sm{
margin-bottom: 70px;
@ -1286,7 +1287,7 @@ import permision from "@/components/permission.js";
// }
.item-view-jianjie{
font-weight: 400;
font-size: 24rpx;
font-size: 26rpx;
color: #999;
display: -webkit-box;
-webkit-box-orient: vertical;
@ -1295,7 +1296,13 @@ import permision from "@/components/permission.js";
text-overflow: ellipsis;
text-align: left;
}
.touxiang-frame{
position: absolute;
width: 100rpx;
height: 38rpx;
left: 44rpx;
top:140rpx;
}
.dituList{
width: 85%;
height: 173px;
@ -1305,7 +1312,7 @@ import permision from "@/components/permission.js";
}
.liebiao{
//height: 100vh;
margin-top: 100px;
margin-top: 90px;
display: flex;
flex-direction: column;
}
@ -1574,14 +1581,14 @@ import permision from "@/components/permission.js";
// overflow: auto;
}
/deep/.u-content{
height: 48rpx!important;
border-radius: 5px !important;
height: 56rpx!important;
border-radius: 30px !important;
}
.flex-sub{
width: 260rpx !important;
height:52rpx !important;
height:60rpx !important;
border: 1px solid #e5e5e5;
border-radius: 10rpx;
border-radius: 30rpx;
color: #fff!important;
}
.map-list{
@ -1601,7 +1608,7 @@ import permision from "@/components/permission.js";
width: 160rpx;
margin-left: 4rpx;
font-weight: bold;
font-size: 28rpx;
font-size: 30rpx;
color: #333;
}
.dingwei-img{
@ -1915,7 +1922,7 @@ import permision from "@/components/permission.js";
justify-content: space-between;
}
.therap-pin{
font-size: 24rpx;
font-size: 26rpx;
display: flex;
align-items: flex-end;
margin-right: 10rpx;

BIN
static/background-img4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 KiB

BIN
static/navigation.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

BIN
static/salogo.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@ -252,7 +252,7 @@
display: flex;
/* #endif */
flex-direction: row;
position: relative;
//position: relative;
padding: 14rpx 14rpx;
// background-color: #fff;
}
@ -264,12 +264,12 @@
justify-content: left;
/* #endif */
overflow: hidden;
position: relative;
//position: relative;
flex: 1;
flex-direction: row;
align-items: center;
height: $uni-searchbar-height;
padding: 5px 8px 5px 0px;
padding: 6px 8px 6px 0px;
}
.uni-searchbar__box-icon-search {

View File

@ -700,8 +700,8 @@
}
.z-tabs-item-title{
font-weight: bold;
font-size: 28rpx;
/*font-weight: bold;*/
font-size: 31rpx;
color: #019c88;
}