cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gao xiaosong
2020-11-18 00:45:00 +08:00
parent 288246cea9 af33d0d8b2
commit 30b462fe26
18 changed files with 394 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/style.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map
View File

File diff suppressed because one or more lines are too long

6
assets/css/style.less
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 {