theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#275) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/275
This commit is contained in:
gyh 2020-08-21 09:15:47 +08:00
commit 4b0cbcf814
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pageB/photo/index.vue
View File

@ -342,15 +342,16 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
width: 500rpx;
color: #343434; color: #343434;
font-size: 28rpx; font-size: 28rpx;
.cart-title { .cart-title {
width: 400rpx;
line-height: 40rpx; line-height: 40rpx;
font-size: 29rpx; font-size: 29rpx;
} }
.cart-info { .cart-info {
font-size: 24rpx; font-size: 24rpx;
line-height: 1.2;
} }
.name { .name {
width: 500rpx; width: 500rpx;

11
pageB/video/video.nvue
View File

@ -109,6 +109,7 @@
<image class="goods-img" :src="item.goods_image" mode=""></image> <image class="goods-img" :src="item.goods_image" mode=""></image>
<view class="goods-info"> <view class="goods-info">
<text class="good-title">{{ item.goods_advword }}</text> <text class="good-title">{{ item.goods_advword }}</text>
<text class="good-name">{{ item.goods_name }}</text>
<text class="good-price">{{ item.goods_promotion_price }}</text> <text class="good-price">{{ item.goods_promotion_price }}</text>
</view> </view>
</view> </view>
@ -634,7 +635,6 @@
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
lines: 2; lines: 2;
letter-spacing: 2rpx;
} }
.more-content-box { .more-content-box {
@ -825,6 +825,14 @@
width: 500rpx; width: 500rpx;
color: #333; color: #333;
font-size: 30rpx; font-size: 30rpx;
lines: 1;
text-overflow: ellipsis;
}
.good-name {
width: 500rpx;
font-size: 24rpx;
line-height: 30rpx;
lines: 2; lines: 2;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
@ -864,7 +872,6 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
lines: 1; lines: 1;
text-overflow: ellipsis; text-overflow: ellipsis;
letter-spacing: 2rpx;
} }
.centent { .centent {