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

@@ -92,7 +92,7 @@
<span class="ml_10">{{item.groupName}}</span>
<table class="mb_10" cellpadding='0' cellspacing="0" >
<tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
<td style="text-align:right">{{param.paramName}}</td><td>{{param.paramValue}}</td>
<td style="text-align: center">{{param.paramName}}</td><td>{{param.paramValue}}</td>
</tr>
</table>
</div>
@@ -222,7 +222,7 @@ export default {
});
window.addEventListener('scroll', this.handleScroll)
this.getList();
},
}
};
</script>
@@ -491,16 +491,15 @@ export default {
table{
border-color:#efefef;
color: #999;
width: 40%;
margin-left: 10px;
margin-bottom: 10px;
min-width: 30%;
margin-left: 30px;
font-size: 12px;
tr{
td:nth-child(1){
width: 70px;
width: 100px;
}
td:nth-child(2){
padding-left: 10px;
padding-left: 20px;
}
}
td{
@@ -509,7 +508,6 @@ table{
}
.goods-params {
display: flex;
align-items: center;
border-bottom: 1px solid #eee;
margin-left: 30px;
span{color:#999}