fe / yoho-shop-manage · Commits

Go to a project

Authored by 陈峰
Commit 6490ddfb2f0e0cc830d6c9fa1b14c393ffa9ba88 2 parents f9ed14e6 ec721ad1

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0

Inline Side-by-side
Showing 2 changed files with 19 additions and 19 deletions
... ... @@ -49,13 +49,13 @@
width: 170,
render(row, col, index) {
return `<div
:class="{'upload-item': true ,
'upload-item-error':
:class="{'table-upload-item': true ,
'table-upload-item-error':
row.goodsColorImage.showValidate && row.goodsColorImage.validate}"
>
<div class="upload-item-img">
<div class="table-upload-item-img">
<img v-if="row.goodsColorImage.value"
:src="row.goodsColorImage.value" alt="" width="120px" height="122px">
:src="row.goodsColorImage.value" alt="" width="84px" height="112px">
</div>
<div>
<file-upload :id="{index: ${index}}"
... ... @@ -64,7 +64,7 @@
<example-pop></example-pop>
</div>
<div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate"
class="upload-item-tip">
class="table-upload-item-tip">
必须上传图片
</div>
</div>`;
... ... @@ -258,7 +258,7 @@
text-align: center;
}
.upload-item {
.table-upload-item {
display: inline-block;
height: 220px;
width: 130px;
... ... @@ -266,20 +266,20 @@
margin: 30px 0;
}
.upload-item-error {
.table-upload-item-error {
border: 1px solid #f30;
}
.upload-item-tip {
.table-upload-item-tip {
padding-top: 6px;
color: #f30;
top: 100%;
}
.upload-item-img {
.table-upload-item-img {
display: inline-block;
height: 126px;
width: 124px;
height: 116px;
width: 88px;
border: 2px solid #e8e8e8;
box-sizing: border-box;
}
... ...
... ... @@ -50,16 +50,16 @@ export default {
{
title: '色卡图片',
key: 'goodsColorImage',
width: 250,
width: 180,
render(row, col, index) {
return `<div
:class="{'upload-item': true ,
'upload-item-error':
:class="{'table-upload-item': true ,
'table-upload-item-error':
row.goodsColorImage.showValidate && row.goodsColorImage.validate}">
<div class="upload-item-img">
<div class="table-upload-item-img">
<img v-if="row.goodsColorImage.value"
:src="row.goodsColorImage.value"
alt="" width="120px" height="122px">
alt="" width="84px" height="112px">
</div>
<div>
... ... @@ -69,7 +69,7 @@ export default {
<example-pop></example-pop>
</div>
<div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate"
class="upload-item-tip">
class="table-upload-item-tip">
必须上传图片
</div>
</div>`;
... ... @@ -297,11 +297,11 @@ export default {
}
}
.upload-item-error {
.table-upload-item-error {
border: 1px solid #f30;
}
.upload-item-tip {
.table-upload-item-tip {
padding-top: 6px;
color: #f30;
top: 100%;
... ...