解决冲突
This commit is contained in:
commit
73572c083a
|
|
@ -35,20 +35,17 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list-right-top-bottom">
|
||||
正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
|
||||
</view>
|
||||
<view class="flex" style="margin: 16rpx 0 6px 0;justify-content: start;">
|
||||
<view class="flex align-center">
|
||||
<view class="flex align-center margin-right-sm">
|
||||
<view>
|
||||
<image class="pinglun" src="../../static/dituzhaoren3.png" mode="">
|
||||
</image>
|
||||
<span class="icon-text">评论</span>
|
||||
<span class="icon-text1">评论</span>
|
||||
</view>
|
||||
|
||||
<!-- <image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image> -->
|
||||
<view style="margin-left: 10rpx;color: #222;font-size: 23rpx;">
|
||||
<view style="margin-left: 10rpx;color: #222;">
|
||||
22222{{item.commentCount ? item.commentCount : 0}}
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -56,7 +53,7 @@
|
|||
<view>
|
||||
<image class="shouc-img" src="../../static/dituzhaoren4.png" mode="">
|
||||
</image>
|
||||
<span class="icon-text">收藏</span>
|
||||
<span class="icon-text1">收藏</span>
|
||||
</view>
|
||||
|
||||
<text class="margin-left-xs" style="color: #222;">11111{{item.ordersScore}}.0</text>
|
||||
|
|
@ -80,6 +77,9 @@
|
|||
免出行费
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="list-right-top-bottom">
|
||||
正规绿色服务!擅长精油SPA、中式推拿，有按摩师证，手法专业，期待正规绿色服务!擅长精油SPA、中式推拿正规绿色服务!擅长精油SPA、中式推拿
|
||||
</view>
|
||||
<view class="therapist-mian-bottom">
|
||||
<view class="flex flex-wrap align-center">
|
||||
<image class="therapist-bottom-img" src="../../static/dituzhaoren5.png">
|
||||
|
|
@ -93,16 +93,17 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<view class="text-center text-sm" v-if="item.status == 1"
|
||||
style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 35%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
|
||||
@click.stop="goOrderDetail(item)">
|
||||
立即预约
|
||||
</view>
|
||||
<view class="text-center text-sm" v-else
|
||||
style="background: #d9d9d9;color: #ffffff;width: 35%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;">
|
||||
立即预约
|
||||
</view>
|
||||
</view>
|
||||
<view class="text-center text-sm" v-if="item.status == 1"
|
||||
style="background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 10rpx;"
|
||||
@click.stop="goOrderDetail(item)">
|
||||
立即预约
|
||||
</view>
|
||||
<view class="text-center text-sm" v-else
|
||||
style="background: #d9d9d9;color: #ffffff;width: 100%;border-radius: 30upx;height: 60upx;line-height: 60upx;margin-top: 20rpx;">
|
||||
立即预约
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -261,13 +262,17 @@
|
|||
.icon-text{
|
||||
margin-left: 2px;
|
||||
font-weight: 400;
|
||||
font-size: 23rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666;
|
||||
|
||||
}
|
||||
.icon-text1{
|
||||
margin-left: 2px;
|
||||
color: #666;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.pinglun{
|
||||
width: 23rpx;
|
||||
height: 23rpx;
|
||||
width: 28rpx;
|
||||
height: 26rpx;
|
||||
}
|
||||
.shouc-img{
|
||||
width: 26rpx;
|
||||
|
|
@ -290,22 +295,24 @@
|
|||
padding-right:20rpx;
|
||||
}
|
||||
.therapist-bottom-dingwei-text{
|
||||
font-size: 23rpx;
|
||||
color: #666;
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
margin-top: 3px;
|
||||
}
|
||||
.therapist-bottom-dingwei{
|
||||
width: 17.36rpx;
|
||||
height: 20.14rpx;
|
||||
width: 20.36rpx;
|
||||
height: 24.14rpx;
|
||||
margin-right:3px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
.therapist-bottom-img{
|
||||
width: 22.22rpx;
|
||||
height: 22.22rpx;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
margin-right:3px;
|
||||
}
|
||||
.therapist-mian-bottom-text{
|
||||
font-weight: bold;
|
||||
font-size: 23rpx;
|
||||
font-size: 26rpx;
|
||||
color: #222222;
|
||||
}
|
||||
.therapist-mian-bottom{
|
||||
|
|
@ -316,7 +323,6 @@
|
|||
align-items: center;
|
||||
}
|
||||
|
||||
|
||||
.zz_view {
|
||||
color: #039E89;
|
||||
font-size: 22rpx;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
<view class="" :class="tabIndex == index?'line':''"></view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view @tap="queding()" class="ticket-button">确定</view>
|
||||
<checkbox-group @change="checkboxChange">
|
||||
<view class="youhui-weiyong youhui-list" v-for="(item,index) in hongbao" :key="index">
|
||||
<view class="youhui-view-left">
|
||||
|
|
@ -27,7 +28,7 @@
|
|||
</view>
|
||||
</view>
|
||||
<label class="tui-radio">
|
||||
<checkbox activeBackgroundColor="#096f4b" color="#096f4b" :value="item.id.toString()" :checked="checkbox"/>
|
||||
<checkbox activeBackgroundColor="#029d88" color="#029d88" :value="item.id.toString()" :checked="checkbox"/>
|
||||
</label>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -190,6 +191,19 @@
|
|||
/deep/uni-checkbox .uni-checkbox-input{
|
||||
border-radius: 50%;
|
||||
}
|
||||
.ticket-button{
|
||||
display: flex;
|
||||
width: 130rpx;
|
||||
grid-gap:8rpx;
|
||||
gap:8px;
|
||||
align-items: center;
|
||||
justify-content:center;
|
||||
background: #029d88;
|
||||
color: #fff;
|
||||
height:60rpx;
|
||||
border-radius: 30rpx;
|
||||
margin: 15rpx;
|
||||
}
|
||||
.checkbox-data{
|
||||
padding: 0px 11px;
|
||||
margin: 15px 0px;
|
||||
|
|
@ -274,7 +288,7 @@
|
|||
height: 242rpx;
|
||||
border-radius: 21rpx;
|
||||
background-size: 100%;
|
||||
margin: 20px auto;
|
||||
margin: 6px auto;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.you-nav{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<view class="content">
|
||||
<view class="padding-bottom u-skeleton">
|
||||
<view class="bgImg u-skeleton-fillet" style="padding: 0 29rpx;">
|
||||
<<<<<<< .mine
|
||||
<view class="head-top">
|
||||
<view class="pay-title" style="">服务项目</view>
|
||||
<view class="flex">
|
||||
|
|
@ -33,6 +34,39 @@
|
|||
</view>
|
||||
</view>
|
||||
<view class="padding margin-top-sm header-view">
|
||||
=======
|
||||
<view class="ske-padding margin-top-sm header-view">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
>>>>>>> .theirs
|
||||
<view v-if="!detailaddress">请选择地址</view>
|
||||
<view class="margin-right-xs">
|
||||
<view class="flex justify-between margin-top-lg">
|
||||
|
|
@ -54,7 +88,7 @@
|
|||
<span>
|
||||
{{province}}/{{city}}/{{district}}/{{detailaddress}}
|
||||
</span>
|
||||
<image src="../../static/shezhi-jiantou.png" mode=""></image>
|
||||
<span class="view-more"></span>
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex justify-between margin-top-lg" v-if="order.remark">
|
||||
|
|
@ -67,7 +101,7 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="padding margin-top-sm header-view">
|
||||
<view class="ske-padding margin-top-sm header-view">
|
||||
<view class="fuwu-time">
|
||||
<view class="fuwu-title">
|
||||
服务时间
|
||||
|
|
@ -80,12 +114,23 @@
|
|||
style="height: 100rpx;line-height: 100rpx;padding: 0rpx 10rpx;">
|
||||
<view class="flex justify-between margin-tb-sm" @click="openData()">
|
||||
<view v-if="startTime">{{startTime}}</view>
|
||||
<view class="tetx-sm" style="color:#999999;" v-else>请选择预约时间</view>
|
||||
<u-icon name="arrow-right" color="#999999"></u-icon>
|
||||
</view>
|
||||
<view class="tetx-sm" v-else>请选择预约时间<span class="view-more"></span></view>
|
||||
<!---<u-icon name="arrow-right" color="#999999"></u-icon>-->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="liliao" @click="liliaoshi">
|
||||
<view class="fuwu-time" @click="liliaoshi">
|
||||
<view class="fuwu-title" >
|
||||
<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>
|
||||
</view>
|
||||
<!--<view class="liliao">
|
||||
<view class="liliao-top" style="width: 30%;">
|
||||
<span>理疗师</span>
|
||||
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
|
||||
|
|
@ -93,11 +138,10 @@
|
|||
<view class="liliao-bottom">
|
||||
<span v-if="jishiName">{{jishiName.artificerName}}</span>
|
||||
<span v-else>选择不同技师价格可能不一样哦~</span>
|
||||
<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
|
||||
</view>
|
||||
</view>
|
||||
</view>-->
|
||||
<view class="liliao" @click="youhuijuan">
|
||||
<view class="liliao-top" style="width: 30%;">
|
||||
<view class="fuwu-title">
|
||||
<span>平台优惠劵</span>
|
||||
</view>
|
||||
<view class="header-bottom-money-zhen">
|
||||
|
|
@ -105,7 +149,7 @@
|
|||
<span>-￥{{couponDataList}}</span>
|
||||
</view>
|
||||
<span v-else>选择优惠劵</span>
|
||||
<image class="fuwu-img" src="../../static/images/my/jiantou.png" mode=""></image>
|
||||
<span class="view-more"></span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -1314,6 +1358,7 @@
|
|||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
<<<<<<< .mine
|
||||
.head-bottom{
|
||||
width: 68%;
|
||||
display: flex;
|
||||
|
|
@ -1361,10 +1406,59 @@
|
|||
color: #333333;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
=======
|
||||
.view-more{
|
||||
display:inline-block;
|
||||
border-top:1px solid;
|
||||
border-right:1px solid;
|
||||
width: 15rpx;
|
||||
height: 15rpx;
|
||||
border-color:#999;
|
||||
transform:rotate(45deg);
|
||||
margin-top: 14rpx;
|
||||
}
|
||||
.tetx-sm{
|
||||
font-size: 30rpx;
|
||||
color:#888;
|
||||
}
|
||||
.ske-padding{
|
||||
padding: 5rpx 30rpx 36rpx 30rpx;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
>>>>>>> .theirs
|
||||
.header-bottom-money-zhen span{
|
||||
color: #F95900 !important;
|
||||
font-weight: bold !important;
|
||||
font-size: 22rpx !important;
|
||||
font-size: 26rpx !important;
|
||||
}
|
||||
.header-bottom-money-zhen{
|
||||
display: flex;
|
||||
|
|
@ -1517,8 +1611,7 @@
|
|||
font-weight: 400;
|
||||
font-size: 29rpx;
|
||||
color: #888;
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
.fuwu-time-view,.liliao-top{
|
||||
width: 70%;
|
||||
display: flex;
|
||||
|
|
@ -1540,8 +1633,13 @@
|
|||
margin-top: 5px;
|
||||
}
|
||||
.xuanzhe{
|
||||
background: #e5e7eb;
|
||||
color: #666;
|
||||
margin-left: 5px;
|
||||
border: 1px solid;
|
||||
border: 1px solid #cdd2db;
|
||||
border-radius: 30rpx;
|
||||
padding: 4rpx 15rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.header-view-data{
|
||||
display: flex;
|
||||
|
|
@ -1565,7 +1663,7 @@
|
|||
}
|
||||
.header-view{
|
||||
background-color: #fff;
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 12px;
|
||||
border-radius: 11px;
|
||||
}
|
||||
.head-foot span:nth-child(1){
|
||||
|
|
@ -1643,7 +1741,7 @@
|
|||
font-weight: 400;
|
||||
font-size: 29rpx;
|
||||
color: #222;
|
||||
padding: 10px 15px 0px 15px;
|
||||
padding: 16px 15px 0px 15px;
|
||||
width: 100%;
|
||||
}
|
||||
.checkbox-data{
|
||||
|
|
@ -1961,10 +2059,11 @@
|
|||
margin: 0 auto;
|
||||
text-align: center;
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
height:68rpx;
|
||||
border-radius: 60rpx;
|
||||
height:80rpx;
|
||||
border-radius: 80rpx;
|
||||
color: #ffffff;
|
||||
line-height: 68rpx;
|
||||
line-height: 80rpx;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.serverAddress {
|
||||
|
|
|
|||
|
|
@ -962,6 +962,7 @@
|
|||
<style scoped>
|
||||
/deep/.item-descr{
|
||||
-webkit-line-clamp: 1;
|
||||
margin-top: 4px;
|
||||
}
|
||||
.index-card-image{
|
||||
width: 100%;
|
||||
|
|
@ -1020,7 +1021,7 @@
|
|||
font-size: 19rpx;
|
||||
}
|
||||
.font-size-34{
|
||||
font-size: 34.72rpx;
|
||||
font-size: 35.72rpx;
|
||||
}
|
||||
.width{
|
||||
width: 95%;
|
||||
|
|
@ -1279,11 +1280,11 @@
|
|||
|
||||
.index-taocan-view-nav-text{
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.index-taocan-view-nav-jie{
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
font-size: 22rpx;
|
||||
color: #999;
|
||||
}
|
||||
.activeL{
|
||||
|
|
@ -1319,8 +1320,7 @@
|
|||
}
|
||||
.index-fujin-jie-id{
|
||||
height: 30rpx;
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999999;
|
||||
text-align: center;
|
||||
display: table;
|
||||
|
|
@ -1333,8 +1333,9 @@
|
|||
}
|
||||
.index-fujin-jie-name{
|
||||
margin-bottom: 5px;
|
||||
font-size: 26rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
font-weight: 500;
|
||||
}
|
||||
.index-fujin{
|
||||
width: 100%;
|
||||
|
|
@ -1638,7 +1639,7 @@
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
margin-left: 10px;
|
||||
margin-left: px;
|
||||
}
|
||||
.index-top-mian-text span{
|
||||
color: #019c88;
|
||||
|
|
@ -1647,8 +1648,8 @@
|
|||
font-size: 13px;
|
||||
}
|
||||
.index-top-mian-text image{
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
width: 14px;
|
||||
height: 14px;
|
||||
}
|
||||
|
||||
.index-top{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
</view>
|
||||
<view class="header-bottom-foot">
|
||||
<view class="header-bottom-foot-cont">
|
||||
<view class="header-fubz">服务保障</view>
|
||||
<view class="header-fubz">保障</view>
|
||||
<view class="header-bottom-foot-view">
|
||||
<image class="header-bottom-foot-view-img1" src="../../static/servicePackage/idCard.png" mode=""></image>
|
||||
<span>未服务全额退款</span>
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
</script>
|
||||
<style scoped>
|
||||
.header-fubz{
|
||||
font-size: 28rpx;
|
||||
font-size: 26rpx;
|
||||
color: #029c88;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
|
@ -223,15 +223,15 @@
|
|||
}
|
||||
.detail-foot-mian-top-text{
|
||||
color: #777777;
|
||||
width:83%;
|
||||
margin-left: 8px;
|
||||
width:80%;
|
||||
margin-left: 5px;
|
||||
line-height: 20px;
|
||||
}
|
||||
.detail-foot-mian-top,.detail-foot-mian-top-bottom{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
font-size: 22rpx;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
.header-bottom-title-bottom span{
|
||||
font-weight: bold;
|
||||
|
|
@ -382,14 +382,14 @@
|
|||
height: 26rpx;
|
||||
}
|
||||
.header-bottom-foot-view image{
|
||||
margin-right: 3px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
.header-bottom-foot-view{
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 1px 10px;
|
||||
padding: 1px 8px;
|
||||
height: 22px;
|
||||
line-height: 22px;
|
||||
background-color: rgba(230, 246, 243, 1);
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
<span>￥</span>
|
||||
<span>{{item.price}}</span>
|
||||
<span>/元套</span>
|
||||
<span>￥</span>
|
||||
<span>{{item.oldPrice}}</span>
|
||||
</view>
|
||||
<view class="item-view-bottom-btn">
|
||||
|
|
@ -166,7 +167,7 @@
|
|||
|
||||
<style scoped>
|
||||
/deep/.z-tabs-item-title{
|
||||
font-size: 29rpx;
|
||||
font-size: 30rpx;
|
||||
color: #222;
|
||||
}
|
||||
/deep/.refresh-body .content{
|
||||
|
|
@ -184,22 +185,25 @@
|
|||
}
|
||||
.item-view-bottom-btn{
|
||||
text-align: center;
|
||||
width: 120rpx;
|
||||
height: 50rpx;
|
||||
line-height: 50rpx;
|
||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||
border-radius: 10rpx;
|
||||
width: 160rpx;
|
||||
height: 55rpx;
|
||||
line-height: 55rpx;
|
||||
background: linear-gradient(90deg, #019c88, #0FA78B, #35C495);
|
||||
border-radius: 30rpx;
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
font-size: 28rpx;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.item-view-bottom-qian span:nth-child(4){
|
||||
font-weight: bold;
|
||||
font-size: 31rpx;
|
||||
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;
|
||||
|
|
@ -224,7 +228,7 @@
|
|||
}
|
||||
.item-view-jianjie{
|
||||
font-weight: 400;
|
||||
font-size: 22rpx;
|
||||
font-size: 24rpx;
|
||||
color: #999;
|
||||
margin:5px 0px;
|
||||
display: -webkit-box;
|
||||
|
|
@ -271,7 +275,7 @@
|
|||
}
|
||||
.item-view-title{
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333333;
|
||||
}
|
||||
.item-view{
|
||||
|
|
@ -373,7 +377,7 @@
|
|||
}
|
||||
.search-btn{
|
||||
text-align: center;
|
||||
line-height: 31px;
|
||||
line-height: 32px;
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
|
|
@ -383,9 +387,9 @@
|
|||
height: 32px !important;
|
||||
}
|
||||
/deep/.uni-searchbar__box-icon-search,.search-btn{
|
||||
width: 101rpx;
|
||||
width: 120rpx;
|
||||
height: 60rpx;
|
||||
background: #18A689;
|
||||
background: #019c88;
|
||||
border-radius: 31rpx;
|
||||
font-size: 14px;
|
||||
|
||||
|
|
@ -412,7 +416,7 @@
|
|||
}
|
||||
.service-head-top-left span{
|
||||
font-weight: bold;
|
||||
font-size: 28rpx;
|
||||
font-size: 32rpx;
|
||||
color: #333;
|
||||
}
|
||||
.service-head-top-left{
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@
|
|||
height: 31px;
|
||||
border-radius: 15px !important;
|
||||
background-color: #fff !important;
|
||||
border: 2px solid #E5E5E5;
|
||||
border: 1px solid #E5E5E5;
|
||||
padding: 0px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
@ -396,7 +396,7 @@
|
|||
}
|
||||
.service-head-top-left span{
|
||||
font-weight: bold;
|
||||
font-size: 44rpx;
|
||||
font-size: 36rpx;
|
||||
color: #171717;
|
||||
}
|
||||
.service-head-top-left{
|
||||
|
|
|
|||
|
|
@ -758,7 +758,7 @@
|
|||
color: #029D88;
|
||||
background: #fff;
|
||||
border-radius: 60rpx;
|
||||
margin: 0px 5px;
|
||||
margin: 0px 6px;
|
||||
border: 1px solid #029D88;
|
||||
}
|
||||
.video-item{
|
||||
|
|
@ -908,6 +908,7 @@
|
|||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #333333;
|
||||
margin-bottom: 5rpx;
|
||||
}
|
||||
|
||||
.xiangmu-cont-top{
|
||||
|
|
@ -1025,11 +1026,11 @@
|
|||
background: #EBEBEB;
|
||||
}
|
||||
.oder-mian-view{
|
||||
width: 55px;
|
||||
height: 22px;
|
||||
width: 60px;
|
||||
height: 25px;
|
||||
font-weight: 400;
|
||||
text-align: center;
|
||||
line-height: 22px;
|
||||
line-height: 25px;
|
||||
}
|
||||
.oder-mian-right{
|
||||
display: flex;
|
||||
|
|
@ -1070,11 +1071,11 @@
|
|||
margin-left: 10px;
|
||||
}
|
||||
.jieshao{
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
font-weight: 400;
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
font-size: 26rpx;
|
||||
color: #666;
|
||||
line-height: 40rpx;
|
||||
color: #888;
|
||||
display: -webkit-box;
|
||||
-webkit-box-orient: vertical;
|
||||
-webkit-line-clamp: 2;
|
||||
|
|
|
|||
|
|
@ -1353,12 +1353,12 @@ import permision from "@/components/permission.js";
|
|||
white-space: nowrap;
|
||||
text-align: left;
|
||||
font-weight: bold;
|
||||
font-size: 35rpx;
|
||||
font-size: 30rpx;
|
||||
color: #13141A;
|
||||
}
|
||||
.keyuyue{
|
||||
width: 115px;
|
||||
height: 18px;
|
||||
height: 24px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
|
|
@ -1366,8 +1366,7 @@ import permision from "@/components/permission.js";
|
|||
.keyuyue .keyuyue-btn{
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
font-weight: 400;
|
||||
font-size: 17rpx;
|
||||
font-size: 22rpx;
|
||||
text-align: center;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
|
@ -1377,7 +1376,7 @@ import permision from "@/components/permission.js";
|
|||
.keyuyue-jinri{
|
||||
border-top-left-radius: 7rpx;
|
||||
border-bottom-left-radius: 7rpx;
|
||||
border-radius: 7rpx;
|
||||
border-radius:7rpx 0 0 7rpx;
|
||||
color: #fff;
|
||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
||||
}
|
||||
|
|
@ -1410,7 +1409,7 @@ import permision from "@/components/permission.js";
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
padding: 10px 5px 0px 5px;
|
||||
padding: 10px 10px 0px 0px;
|
||||
}
|
||||
.zpmore_view {
|
||||
position: absolute;
|
||||
|
|
@ -1464,7 +1463,7 @@ import permision from "@/components/permission.js";
|
|||
.touxiang-left-content-img{
|
||||
width: 202.08rpx;
|
||||
height: 173px;
|
||||
border-radius: 0 100rpx 20rpx 0rpx;
|
||||
border-radius: 0 120rpx 20rpx 0rpx;
|
||||
}
|
||||
.touxiang-left-view{
|
||||
width: 100%;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 740 B |
Binary file not shown.
|
After Width: | Height: | Size: 1015 B |
Binary file not shown.
|
After Width: | Height: | Size: 758 B |
Loading…
Reference in New Issue