Return multi images
1 changed files with 15 additions and 13 deletions
+ 15
- 13
mch/models.py
@@ -185,6 +185,21 @@ class ModelInfo(BaseModelMixin): |
||
| 185 | 185 |
return upload_file_url(self.image2) |
| 186 | 186 |
|
| 187 | 187 |
@property |
| 188 |
+ def images(self): |
|
| 189 |
+ imgs = [] |
|
| 190 |
+ if self.image: |
|
| 191 |
+ imgs.append({
|
|
| 192 |
+ 'image_url': self.image_url, |
|
| 193 |
+ 'url': self.url or '', |
|
| 194 |
+ }) |
|
| 195 |
+ if self.image2: |
|
| 196 |
+ imgs.append({
|
|
| 197 |
+ 'image_url2': self.image2_url, |
|
| 198 |
+ 'url': self.url or '', |
|
| 199 |
+ }) |
|
| 200 |
+ return imgs |
|
| 201 |
+ |
|
| 202 |
+ @property |
|
| 188 | 203 |
def data(self): |
| 189 | 204 |
return {
|
| 190 | 205 |
'jancode': self.jancode, |
@@ -194,19 +209,6 @@ class ModelInfo(BaseModelMixin): |
||
| 194 | 209 |
} |
| 195 | 210 |
|
| 196 | 211 |
@property |
| 197 |
- def imgdata(self): |
|
| 198 |
- return {
|
|
| 199 |
- 'image_url': self.image_url, |
|
| 200 |
- 'url': self.url, |
|
| 201 |
- } |
|
| 202 |
- |
|
| 203 |
- @property |
|
| 204 |
- def images(self): |
|
| 205 |
- return [self.imgdata] if self.image else [] |
|
| 206 |
- # imgs = ModelImageInfo.objects.filter(model_id=self.model_id, status=True) |
|
| 207 |
- # return [img.data for img in imgs] |
|
| 208 |
- |
|
| 209 |
- @property |
|
| 210 | 212 |
def admindata(self): |
| 211 | 213 |
return {
|
| 212 | 214 |
'jancode': self.jancode, |