Merge branch 'master' into ma

# Conflicts:
#	buyer/src/components/goodsDetail/ShowGoodsDetail.vue
#	buyer/src/config/index.js
#	seller/src/views/goods/goods-seller/goodsOperation.vue
This commit is contained in:
mabo
2021-07-07 16:14:23 +08:00
21 changed files with 150 additions and 158 deletions

View File

@@ -77,10 +77,6 @@
}
}
/*平铺*/
div.base-info-item > div {
margin-left: 5%;
}
div.base-info-item {
h4 {
@@ -94,13 +90,15 @@ div.base-info-item {
line-height: 40px;
text-align: left;
}
>div{
padding-left: 5%;
}
.form-item-view {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: space-between;
padding-left: 80px;
// padding-left: 80px;
.layout {
margin-bottom: 20px;