Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user
This commit is contained in:
commit
9398520b87
|
@ -18,7 +18,7 @@
|
||||||
</image>
|
</image>
|
||||||
<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
|
<view class="zpmore_view" v-if="item.lifePhoto" @click.stop="saveImgss(item.lifePhoto,0)">更多照片</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="margin-left flex flex-direction" style="width: 85%;">
|
<view class="margin-left flex flex-direction list-right-content" style="width: 85%;">
|
||||||
<view class="flex align-center" style="justify-content: space-between;">
|
<view class="flex align-center" style="justify-content: space-between;">
|
||||||
<view class="flex align-center">
|
<view class="flex align-center">
|
||||||
<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
|
<view class="text-bold text-30 margin-right-xs" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image> -->
|
<!-- <image src="../../static/images/pinglun.png" style="width: 24rpx;height: 24rpx;"></image> -->
|
||||||
<view style="margin-left: 10rpx;color: #222;font-size: 26rpx;">
|
<view style="margin-left: 10rpx;color: #222;font-size: 23rpx;">
|
||||||
22222{{item.commentCount ? item.commentCount : 0}}
|
22222{{item.commentCount ? item.commentCount : 0}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -262,32 +262,36 @@
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 23rpx;
|
font-size: 23rpx;
|
||||||
color: #7C8187;
|
color: #666;
|
||||||
|
|
||||||
}
|
}
|
||||||
.pinglun{
|
.pinglun{
|
||||||
width: 25.69rpx;
|
width: 23rpx;
|
||||||
height: 22.92rpx;
|
height: 23rpx;
|
||||||
}
|
}
|
||||||
.shouc-img{
|
.shouc-img{
|
||||||
width: 25.69rpx;
|
width: 26rpx;
|
||||||
height: 22.92rpx;
|
height: 26rpx;
|
||||||
}
|
}
|
||||||
.list-right-top-bottom{
|
.list-right-top-bottom{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 25rpx;
|
font-size: 26rpx;
|
||||||
color: #333333;
|
color: #999;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
-webkit-line-clamp: 2; /* 显示的行数,可以根据需要修改 */
|
-webkit-line-clamp: 2; /* 显示的行数,可以根据需要修改 */
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
.list-right-content{
|
||||||
|
padding-right:20rpx;
|
||||||
|
}
|
||||||
.therapist-bottom-dingwei-text{
|
.therapist-bottom-dingwei-text{
|
||||||
font-weight: bold;
|
|
||||||
font-size: 23rpx;
|
font-size: 23rpx;
|
||||||
color: #848485;
|
color: #666;
|
||||||
}
|
}
|
||||||
.therapist-bottom-dingwei{
|
.therapist-bottom-dingwei{
|
||||||
width: 17.36rpx;
|
width: 17.36rpx;
|
||||||
|
@ -310,13 +314,12 @@
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin: 5px 0px 3px 0px;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.zz_view {
|
.zz_view {
|
||||||
color: #039E89;
|
color: #039E89;
|
||||||
font-size: 24rpx;
|
font-size: 22rpx;
|
||||||
padding: 0px 3px;
|
padding: 0px 3px;
|
||||||
background: #EBEBEB;
|
background: #EBEBEB;
|
||||||
height: 38rpx;
|
height: 38rpx;
|
||||||
|
@ -329,10 +332,9 @@
|
||||||
height: 38rpx;
|
height: 38rpx;
|
||||||
line-height: 38rpx;
|
line-height: 38rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 24rpx;
|
padding: 0px 5px;
|
||||||
padding: 0px 3px;
|
border-top-left-radius: 10rpx;
|
||||||
border-top-left-radius: 7rpx;
|
border-bottom-left-radius: 10rpx;
|
||||||
border-bottom-left-radius: 7rpx;
|
|
||||||
}
|
}
|
||||||
.byy_view {
|
.byy_view {
|
||||||
color: #000000;
|
color: #000000;
|
||||||
|
@ -340,18 +342,18 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.kfw_view {
|
.kfw_view {
|
||||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
background: linear-gradient(90deg, #029d88, #1eb28f);
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
|
font-size: 20rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shou-top{
|
.shou-top{
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-right: 5px;
|
}
|
||||||
}
|
|
||||||
.dituzhaoren{
|
.dituzhaoren{
|
||||||
width: 168.75rpx;
|
width: 145.75rpx;
|
||||||
height: 40.97rpx;
|
height: 40.97rpx;
|
||||||
}
|
}
|
||||||
.content-list{
|
.content-list{
|
||||||
|
@ -361,9 +363,10 @@
|
||||||
.content-img image{
|
.content-img image{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
border-radius:17rpx 100rpx 30rpx 17rpx;
|
||||||
}
|
}
|
||||||
.content-img{
|
.content-img{
|
||||||
width: 202.08rpx;
|
width: 212.08rpx;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
@ -378,7 +381,7 @@
|
||||||
.zpmore_view {
|
.zpmore_view {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
margin-bottom: 2px;
|
margin-bottom: 4px;
|
||||||
left: 14rpx;
|
left: 14rpx;
|
||||||
color: #f9f3d3;
|
color: #f9f3d3;
|
||||||
background: linear-gradient(to right, #0a0c16, #4d4d53);
|
background: linear-gradient(to right, #0a0c16, #4d4d53);
|
||||||
|
|
|
@ -732,32 +732,32 @@
|
||||||
}
|
}
|
||||||
.oder-mian-guan{
|
.oder-mian-guan{
|
||||||
width: 113rpx;
|
width: 113rpx;
|
||||||
height: 45rpx;
|
height: 60rpx;
|
||||||
line-height: 45rpx;
|
line-height: 60rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 23rpx;
|
font-size: 23rpx;
|
||||||
border-radius: 23rpx;
|
border-radius: 60rpx;
|
||||||
}
|
}
|
||||||
.activeQ{
|
.activeQ{
|
||||||
color: #35C495;
|
color: #029d88;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border:1px solid #35C495;
|
border:1px solid #029d88;
|
||||||
}
|
}
|
||||||
.activeG{
|
.activeG{
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
background: linear-gradient(90deg, #019C88, #0FA78B, #35C495);
|
||||||
}
|
}
|
||||||
.oder-mian-qing{
|
.oder-mian-qing{
|
||||||
width: 65px;
|
width: 70px;
|
||||||
height: 45rpx;
|
height: 60rpx;
|
||||||
line-height: 40rpx;
|
line-height:60rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 20rpx;
|
font-size: 23rpx;
|
||||||
color: #029D88;
|
color: #029D88;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 23rpx;
|
border-radius: 60rpx;
|
||||||
margin: 0px 5px;
|
margin: 0px 5px;
|
||||||
border: 1px solid #029D88;
|
border: 1px solid #029D88;
|
||||||
}
|
}
|
||||||
|
@ -831,13 +831,13 @@
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
}
|
}
|
||||||
.shouchang-img{
|
.shouchang-img{
|
||||||
width: 45rpx;
|
width: 60rpx;
|
||||||
height: 45rpx;
|
height: 60rpx;
|
||||||
margin-top: 3px;
|
margin-top: 3px;
|
||||||
}
|
}
|
||||||
.xiangmu-cont-top-left{
|
.xiangmu-cont-top-left{
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-size: 21rpx;
|
font-size: 26rpx;
|
||||||
color: #049E89;
|
color: #049E89;
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
}
|
}
|
||||||
|
@ -895,18 +895,18 @@
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 22rpx;
|
font-size: 24rpx;
|
||||||
color: #848484;
|
color: #848484;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 2;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
margin: 5px 0px;
|
margin: 8px 0px;
|
||||||
}
|
}
|
||||||
.xiangmu-cont-top-title{
|
.xiangmu-cont-top-title{
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 33rpx;
|
font-size: 30rpx;
|
||||||
color: #333333;
|
color: #333333;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -968,24 +968,24 @@
|
||||||
}
|
}
|
||||||
.oder-foot-left-view span{
|
.oder-foot-left-view span{
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 18rpx;
|
font-size: 23rpx;
|
||||||
color: #029D88;
|
color: #029D88;
|
||||||
margin-left: 3px;
|
margin-left: 3px;
|
||||||
}
|
}
|
||||||
.shiming{
|
.shiming{
|
||||||
width: 12px;
|
width: 17px;
|
||||||
height: 11px;
|
height: 15px;
|
||||||
}
|
}
|
||||||
.zhizi{
|
.zhizi{
|
||||||
width: 12px;
|
width: 15px;
|
||||||
height: 12px;
|
height: 15px;
|
||||||
}
|
}
|
||||||
.pingtai{
|
.pingtai{
|
||||||
width: 12px;
|
width: 14px;
|
||||||
height: 13px;
|
height: 15px;
|
||||||
}
|
}
|
||||||
.oder-foot-left-view{
|
.oder-foot-left-view{
|
||||||
width: 80px;
|
width: 86px;
|
||||||
height: 24px;
|
height: 24px;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
background-color: rgba(8, 162, 138, 0.1);
|
background-color: rgba(8, 162, 138, 0.1);
|
||||||
|
@ -1011,25 +1011,25 @@
|
||||||
background-color: rgba(238, 238, 238, 0.39);
|
background-color: rgba(238, 238, 238, 0.39);
|
||||||
}
|
}
|
||||||
.oder-mian-jin{
|
.oder-mian-jin{
|
||||||
font-size: 18rpx;
|
font-size: 23rpx;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
background: linear-gradient(90deg, #019C88, #28BA92, #35C495);
|
background: linear-gradient(90deg, #029d88, #1fb38f);
|
||||||
border-top-left-radius: 3px;
|
border-top-left-radius: 5px;
|
||||||
border-bottom-left-radius: 3px;
|
border-bottom-left-radius: 5px;
|
||||||
}
|
}
|
||||||
.oder-mian-time{
|
.oder-mian-time{
|
||||||
font-size: 21rpx;
|
font-size: 23rpx;
|
||||||
color: #039E89;
|
color: #039E89;
|
||||||
border-top-right-radius: 3px;
|
border-top-right-radius: 5px;
|
||||||
border-bottom-right-radius: 3px;
|
border-bottom-right-radius: 5px;
|
||||||
background: #EBEBEB;
|
background: #EBEBEB;
|
||||||
}
|
}
|
||||||
.oder-mian-view{
|
.oder-mian-view{
|
||||||
width: 55px;
|
width: 55px;
|
||||||
height: 20px;
|
height: 22px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 20px;
|
line-height: 22px;
|
||||||
}
|
}
|
||||||
.oder-mian-right{
|
.oder-mian-right{
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -1039,13 +1039,13 @@
|
||||||
}
|
}
|
||||||
.oder-mian-left span:nth-child(1){
|
.oder-mian-left span:nth-child(1){
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 23rpx;
|
font-size: 26rpx;
|
||||||
color: #666666;
|
color: #666666;
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
}
|
}
|
||||||
.oder-mian-left span:nth-child(2){
|
.oder-mian-left span:nth-child(2){
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 23rpx;
|
font-size: 26rpx;
|
||||||
color: #222222;
|
color: #222222;
|
||||||
}
|
}
|
||||||
.oder-mian-left{
|
.oder-mian-left{
|
||||||
|
@ -1070,16 +1070,17 @@
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
}
|
}
|
||||||
.jieshao{
|
.jieshao{
|
||||||
margin-top: 8px;
|
margin-top: 10px;
|
||||||
|
margin-bottom: 10px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
font-size: 22rpx;
|
font-size: 26rpx;
|
||||||
color: #8D9194;
|
color: #666;
|
||||||
display: -webkit-box;
|
display: -webkit-box;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 2;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
.view-head{
|
.view-head{
|
||||||
padding-bottom: 15px;
|
padding-bottom: 15px;
|
||||||
margin: 15px 24px 0px 24px;
|
margin: 15px 24px 0px 24px;
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 740 B |
Binary file not shown.
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1015 B |
Binary file not shown.
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 758 B |
Loading…
Reference in New Issue