Merge branch 'ma'

# Conflicts:
#	pages/product/goods.vue
#	pages/product/product/shop/-shop.vue
#	pages/product/product/style.scss
This commit is contained in:
mabo
2021-06-24 17:58:34 +08:00
5 changed files with 60 additions and 33 deletions

View File

@@ -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;
}