mirror of
https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
synced 2025-12-22 02:15:55 +08:00
Merge branch 'ma'
# Conflicts: # pages/product/goods.vue # pages/product/product/shop/-shop.vue # pages/product/product/style.scss
This commit is contained in:
@@ -148,7 +148,16 @@ export default {
|
||||
font-weight: 700;
|
||||
font-size: 28rpx;
|
||||
line-height: 24px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.desc {
|
||||
font-size: 12px;
|
||||
color: #999;
|
||||
margin-left: 10px;
|
||||
text{
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.to-store-btn {
|
||||
|
||||
@@ -136,6 +136,19 @@ page {
|
||||
> .headerList {
|
||||
flex: 8;
|
||||
}
|
||||
> div:nth-child(2) {
|
||||
flex: 1;
|
||||
.headerList{
|
||||
display: flex;
|
||||
div{
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
> div:nth-child(3) {
|
||||
width: 100rpx;
|
||||
}
|
||||
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user