Merge pull request 'chenxuelian' (#18) from chenxuelian into dev
Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/18
This commit is contained in:
@@ -70,7 +70,7 @@
|
|||||||
<view class="left">
|
<view class="left">
|
||||||
<view class="image">
|
<view class="image">
|
||||||
<image :src="item1.image" mode="scaleToFill"
|
<image :src="item1.image" mode="scaleToFill"
|
||||||
style="width: 150rpx;height: 100%;"></image>
|
style="width: 170rpx;height: 100%;"></image>
|
||||||
</view>
|
</view>
|
||||||
<view class="tag">
|
<view class="tag">
|
||||||
<view class="tag-content">
|
<view class="tag-content">
|
||||||
@@ -615,7 +615,6 @@
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
line-height: 90rpx;
|
line-height: 90rpx;
|
||||||
;
|
|
||||||
|
|
||||||
.category-tag {
|
.category-tag {
|
||||||
margin-right: 15rpx;
|
margin-right: 15rpx;
|
||||||
@@ -657,7 +656,7 @@
|
|||||||
height: calc(100% - 210rpx);
|
height: calc(100% - 210rpx);
|
||||||
|
|
||||||
.goods-item {
|
.goods-item {
|
||||||
padding: 16rpx;
|
padding: 0;
|
||||||
margin-bottom: 10rpx;
|
margin-bottom: 10rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
background: #FFFFFF;
|
background: #FFFFFF;
|
||||||
@@ -665,7 +664,7 @@
|
|||||||
border-bottom: 1px solid #EEEEEE;
|
border-bottom: 1px solid #EEEEEE;
|
||||||
|
|
||||||
.left {
|
.left {
|
||||||
width: 170rpx;
|
width: 190rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.image {
|
.image {
|
||||||
@@ -675,17 +674,17 @@
|
|||||||
|
|
||||||
.tag {
|
.tag {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 20rpx;
|
top: 26rpx;
|
||||||
right: 0;
|
right: 0;
|
||||||
float: right;
|
float: right;
|
||||||
|
|
||||||
.tag-content {
|
.tag-content {
|
||||||
padding: 16rpx;
|
padding: 12rpx;
|
||||||
border-radius: 25rpx 0 0 25rpx;
|
border-radius: 25rpx 0 0 25rpx;
|
||||||
line-height: 14rpx;
|
line-height: 14rpx;
|
||||||
background-color: #0DB658;
|
background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%);;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 24rpx;
|
font-size: 20rpx;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -700,16 +699,17 @@
|
|||||||
font-family: PingFangSC-Medium, PingFang SC;
|
font-family: PingFangSC-Medium, PingFang SC;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #E10707;
|
color: #E10707;
|
||||||
line-height: 56rpx;
|
line-height: 46rpx;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.describe {
|
.describe {
|
||||||
font-size: 33rpx;
|
font-size: 30rpx;
|
||||||
font-family: PingFangSC-Regular, PingFang SC;
|
font-family: PingFangSC-Regular, PingFang SC;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: #3E3E3E;
|
color: #3E3E3E;
|
||||||
line-height: 37rpx;
|
line-height: 37rpx;
|
||||||
|
margin: 5rpx 0 10rpx 0;
|
||||||
|
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
@@ -723,7 +723,8 @@
|
|||||||
.publish-date {
|
.publish-date {
|
||||||
color: #A3A3A3;
|
color: #A3A3A3;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
line-height: 64rpx;
|
line-height: 30rpx;
|
||||||
|
margin: 14rpx 0 8rpx 0;
|
||||||
|
|
||||||
.publish-date-box {
|
.publish-date-box {
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -733,12 +734,12 @@
|
|||||||
|
|
||||||
.tag {
|
.tag {
|
||||||
.tag-content {
|
.tag-content {
|
||||||
padding: 16rpx;
|
padding: 10rpx 18rpx;
|
||||||
border-radius: 25rpx;
|
border-radius: 25rpx;
|
||||||
line-height: 14rpx;
|
line-height: 13rpx;
|
||||||
background-color: #FDD96A;
|
background-color: #FDD96A;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-size: 24rpx;
|
font-size: 22rpx;
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user