mch/models.py

@@ -185,6 +185,21 @@ class ModelInfo(BaseModelMixin):

                         return upload_file_url(self.image2)
              

                 
              

                     @property
              

                +    def images(self):
              

                +        imgs = []
              

                +        if self.image:
              

                +            imgs.append({
              

                +                'image_url': self.image_url,
              

                +                'url': self.url or '',
              

                +            })
              

                +        if self.image2:
              

                +            imgs.append({
              

                +                'image_url2': self.image2_url,
              

                +                'url': self.url or '',
              

                +            })
              

                +        return imgs
              

                +
              

                +    @property
              

                     def data(self):
              

                         return {
              

                             'jancode': self.jancode,
              
@@ -194,19 +209,6 @@ class ModelInfo(BaseModelMixin):

                         }
              

                 
              

                     @property
              

                -    def imgdata(self):
              

                -        return {
              

                -            'image_url': self.image_url,
              

                -            'url': self.url,
              

                -        }
              

                -
              

                -    @property
              

                -    def images(self):
              

                -        return [self.imgdata] if self.image else []
              

                -        # imgs = ModelImageInfo.objects.filter(model_id=self.model_id, status=True)
              

                -        # return [img.data for img in imgs]
              

                -
              

                -    @property
              

                     def admindata(self):
              

                         return {
              

                             'jancode': self.jancode,