合并冲突

This commit is contained in:
Gao xiaosong
2020-11-18 00:45:00 +08:00
18 changed files with 394 additions and 378 deletions

View File

@ -5077,11 +5077,13 @@ page {
}
.product-con .assemble .item .pictxt {
width: 2.95*100rpx;
flex:1;
}
.product-con .assemble .item .pictxt .text {
width: 1.94*100rpx;
flex:1;
font-size: 0.24*100rpx;
padding-left:15rpx
}
.product-con .assemble .item .pictxt .pictrue {