Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-shop-manage into release/1.0
Showing
2 changed files
with
19 additions
and
19 deletions
| @@ -49,13 +49,13 @@ | @@ -49,13 +49,13 @@ | ||
| 49 | width: 170, | 49 | width: 170, |
| 50 | render(row, col, index) { | 50 | render(row, col, index) { |
| 51 | return `<div | 51 | return `<div |
| 52 | - :class="{'upload-item': true , | ||
| 53 | - 'upload-item-error': | 52 | + :class="{'table-upload-item': true , |
| 53 | + 'table-upload-item-error': | ||
| 54 | row.goodsColorImage.showValidate && row.goodsColorImage.validate}" | 54 | row.goodsColorImage.showValidate && row.goodsColorImage.validate}" |
| 55 | > | 55 | > |
| 56 | - <div class="upload-item-img"> | 56 | + <div class="table-upload-item-img"> |
| 57 | <img v-if="row.goodsColorImage.value" | 57 | <img v-if="row.goodsColorImage.value" |
| 58 | - :src="row.goodsColorImage.value" alt="" width="120px" height="122px"> | 58 | + :src="row.goodsColorImage.value" alt="" width="84px" height="112px"> |
| 59 | </div> | 59 | </div> |
| 60 | <div> | 60 | <div> |
| 61 | <file-upload :id="{index: ${index}}" | 61 | <file-upload :id="{index: ${index}}" |
| @@ -64,7 +64,7 @@ | @@ -64,7 +64,7 @@ | ||
| 64 | <example-pop></example-pop> | 64 | <example-pop></example-pop> |
| 65 | </div> | 65 | </div> |
| 66 | <div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate" | 66 | <div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate" |
| 67 | - class="upload-item-tip"> | 67 | + class="table-upload-item-tip"> |
| 68 | 必须上传图片 | 68 | 必须上传图片 |
| 69 | </div> | 69 | </div> |
| 70 | </div>`; | 70 | </div>`; |
| @@ -258,7 +258,7 @@ | @@ -258,7 +258,7 @@ | ||
| 258 | text-align: center; | 258 | text-align: center; |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | - .upload-item { | 261 | + .table-upload-item { |
| 262 | display: inline-block; | 262 | display: inline-block; |
| 263 | height: 220px; | 263 | height: 220px; |
| 264 | width: 130px; | 264 | width: 130px; |
| @@ -266,20 +266,20 @@ | @@ -266,20 +266,20 @@ | ||
| 266 | margin: 30px 0; | 266 | margin: 30px 0; |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | - .upload-item-error { | 269 | + .table-upload-item-error { |
| 270 | border: 1px solid #f30; | 270 | border: 1px solid #f30; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | - .upload-item-tip { | 273 | + .table-upload-item-tip { |
| 274 | padding-top: 6px; | 274 | padding-top: 6px; |
| 275 | color: #f30; | 275 | color: #f30; |
| 276 | top: 100%; | 276 | top: 100%; |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | - .upload-item-img { | 279 | + .table-upload-item-img { |
| 280 | display: inline-block; | 280 | display: inline-block; |
| 281 | - height: 126px; | ||
| 282 | - width: 124px; | 281 | + height: 116px; |
| 282 | + width: 88px; | ||
| 283 | border: 2px solid #e8e8e8; | 283 | border: 2px solid #e8e8e8; |
| 284 | box-sizing: border-box; | 284 | box-sizing: border-box; |
| 285 | } | 285 | } |
| @@ -50,16 +50,16 @@ export default { | @@ -50,16 +50,16 @@ export default { | ||
| 50 | { | 50 | { |
| 51 | title: '色卡图片', | 51 | title: '色卡图片', |
| 52 | key: 'goodsColorImage', | 52 | key: 'goodsColorImage', |
| 53 | - width: 250, | 53 | + width: 180, |
| 54 | render(row, col, index) { | 54 | render(row, col, index) { |
| 55 | return `<div | 55 | return `<div |
| 56 | - :class="{'upload-item': true , | ||
| 57 | - 'upload-item-error': | 56 | + :class="{'table-upload-item': true , |
| 57 | + 'table-upload-item-error': | ||
| 58 | row.goodsColorImage.showValidate && row.goodsColorImage.validate}"> | 58 | row.goodsColorImage.showValidate && row.goodsColorImage.validate}"> |
| 59 | - <div class="upload-item-img"> | 59 | + <div class="table-upload-item-img"> |
| 60 | <img v-if="row.goodsColorImage.value" | 60 | <img v-if="row.goodsColorImage.value" |
| 61 | :src="row.goodsColorImage.value" | 61 | :src="row.goodsColorImage.value" |
| 62 | - alt="" width="120px" height="122px"> | 62 | + alt="" width="84px" height="112px"> |
| 63 | </div> | 63 | </div> |
| 64 | 64 | ||
| 65 | <div> | 65 | <div> |
| @@ -69,7 +69,7 @@ export default { | @@ -69,7 +69,7 @@ export default { | ||
| 69 | <example-pop></example-pop> | 69 | <example-pop></example-pop> |
| 70 | </div> | 70 | </div> |
| 71 | <div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate" | 71 | <div v-if="row.goodsColorImage.showValidate && row.goodsColorImage.validate" |
| 72 | - class="upload-item-tip"> | 72 | + class="table-upload-item-tip"> |
| 73 | 必须上传图片 | 73 | 必须上传图片 |
| 74 | </div> | 74 | </div> |
| 75 | </div>`; | 75 | </div>`; |
| @@ -297,11 +297,11 @@ export default { | @@ -297,11 +297,11 @@ export default { | ||
| 297 | } | 297 | } |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | -.upload-item-error { | 300 | +.table-upload-item-error { |
| 301 | border: 1px solid #f30; | 301 | border: 1px solid #f30; |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | -.upload-item-tip { | 304 | +.table-upload-item-tip { |
| 305 | padding-top: 6px; | 305 | padding-top: 6px; |
| 306 | color: #f30; | 306 | color: #f30; |
| 307 | top: 100%; | 307 | top: 100%; |
-
Please register or login to post a comment