|
|
@@ -184,8 +184,8 @@ class DetailPicGet(DetailBase):
|
|
|
pp_bg = pp_bg.to_overlay_pic_advance(
|
|
|
mode="pixel",
|
|
|
top_img=pp_jpg_1,
|
|
|
- base="ne",
|
|
|
- value=(100, 0),
|
|
|
+ base="es",
|
|
|
+ value=(80, 230),
|
|
|
top_png_img=pp_png_1,
|
|
|
)
|
|
|
return pp_bg
|
|
|
@@ -237,8 +237,8 @@ class DetailPicGet(DetailBase):
|
|
|
pp_bg = pp_bg.to_overlay_pic_advance(
|
|
|
mode="pixel",
|
|
|
top_img=pp_jpg_1,
|
|
|
- base="ne",
|
|
|
- value=(200, 578),
|
|
|
+ base="es",
|
|
|
+ value=(200, 208),
|
|
|
top_png_img=pp_png_1,
|
|
|
)
|
|
|
font = ImageFont.truetype(
|
|
|
@@ -375,7 +375,6 @@ class DetailPicGet(DetailBase):
|
|
|
total_height += _bg.height
|
|
|
if (index + 1) % 2 != 0 and (index + 1) != 1:
|
|
|
total_height += _bg.height
|
|
|
- print("高度:", total_height)
|
|
|
_bg = _bg.paste_img(top_img=pp_jpg, base="center")
|
|
|
_bg = _bg.paste_img(
|
|
|
top_img=text_bg, value=(pp_jpg.width / 2, pp_jpg.height+100)
|
|
|
@@ -528,20 +527,22 @@ class DetailPicGet(DetailBase):
|
|
|
image_path = r"{}\14.jpg".format(self.root)
|
|
|
pp_bg_14 = PictureProcessing(image_path)
|
|
|
goods_art_no_list = list(self.data.keys())
|
|
|
+ # print("执行14")
|
|
|
pp_jpg_1, pp_png_1 = self.image_one_pic(
|
|
|
return_orign=True,
|
|
|
goods_art_no=goods_art_no_list[0],
|
|
|
name="组合",
|
|
|
)
|
|
|
- pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_14.width)
|
|
|
- pp_png_1 = pp_png_1.resize(value=pp_bg_14.width)
|
|
|
- pp_bg_14 = pp_bg_14.to_overlay_pic_advance(
|
|
|
- mode="pixel",
|
|
|
- top_img=pp_jpg_1,
|
|
|
- base="cc",
|
|
|
- value=(0, 0),
|
|
|
- top_png_img=pp_png_1,
|
|
|
- )
|
|
|
+ if pp_jpg_1:
|
|
|
+ pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_14.width)
|
|
|
+ pp_png_1 = pp_png_1.resize(value=pp_bg_14.width)
|
|
|
+ pp_bg_14 = pp_bg_14.to_overlay_pic_advance(
|
|
|
+ mode="pixel",
|
|
|
+ top_img=pp_jpg_1,
|
|
|
+ base="cc",
|
|
|
+ value=(0, 0),
|
|
|
+ top_png_img=pp_png_1,
|
|
|
+ )
|
|
|
detailed_images.append(pp_bg_14)
|
|
|
return self.pp_pic_subsection(
|
|
|
PictureProcessing(im=self.add_pic(detailed_images))
|
|
|
@@ -552,20 +553,22 @@ class DetailPicGet(DetailBase):
|
|
|
image_path = r"{}\15.jpg".format(self.root)
|
|
|
pp_bg_15 = PictureProcessing(image_path)
|
|
|
goods_art_no_list = list(self.data.keys())
|
|
|
+ print("执行15")
|
|
|
pp_jpg_1, pp_png_1 = self.image_one_pic(
|
|
|
return_orign=True,
|
|
|
goods_art_no=goods_art_no_list[0],
|
|
|
name="组合2",
|
|
|
)
|
|
|
- pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_15.width)
|
|
|
- pp_png_1 = pp_png_1.resize(value=pp_bg_15.width)
|
|
|
- pp_bg_15 = pp_bg_15.to_overlay_pic_advance(
|
|
|
- mode="pixel",
|
|
|
- top_img=pp_jpg_1,
|
|
|
- base="cc",
|
|
|
- value=(0, 0),
|
|
|
- top_png_img=pp_png_1,
|
|
|
- )
|
|
|
+ if pp_jpg_1:
|
|
|
+ pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_15.width)
|
|
|
+ pp_png_1 = pp_png_1.resize(value=pp_bg_15.width)
|
|
|
+ pp_bg_15 = pp_bg_15.to_overlay_pic_advance(
|
|
|
+ mode="pixel",
|
|
|
+ top_img=pp_jpg_1,
|
|
|
+ base="cc",
|
|
|
+ value=(0, 0),
|
|
|
+ top_png_img=pp_png_1,
|
|
|
+ )
|
|
|
detailed_images.append(pp_bg_15)
|
|
|
return self.pp_pic_subsection(
|
|
|
PictureProcessing(im=self.add_pic(detailed_images))
|
|
|
@@ -576,20 +579,22 @@ class DetailPicGet(DetailBase):
|
|
|
image_path = r"{}\16.jpg".format(self.root)
|
|
|
pp_bg_16 = PictureProcessing(image_path)
|
|
|
goods_art_no_list = list(self.data.keys())
|
|
|
+ print("执行16")
|
|
|
pp_jpg_1, pp_png_1 = self.image_one_pic(
|
|
|
return_orign=True,
|
|
|
goods_art_no=goods_art_no_list[0],
|
|
|
name="组合3",
|
|
|
)
|
|
|
- pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_16.width)
|
|
|
- pp_png_1 = pp_png_1.resize(value=pp_bg_16.width)
|
|
|
- pp_bg_16 = pp_bg_16.to_overlay_pic_advance(
|
|
|
- mode="pixel",
|
|
|
- top_img=pp_jpg_1,
|
|
|
- base="cc",
|
|
|
- value=(0, 0),
|
|
|
- top_png_img=pp_png_1,
|
|
|
- )
|
|
|
+ if pp_jpg_1:
|
|
|
+ pp_jpg_1 = pp_jpg_1.resize(value=pp_bg_16.width)
|
|
|
+ pp_png_1 = pp_png_1.resize(value=pp_bg_16.width)
|
|
|
+ pp_bg_16 = pp_bg_16.to_overlay_pic_advance(
|
|
|
+ mode="pixel",
|
|
|
+ top_img=pp_jpg_1,
|
|
|
+ base="cc",
|
|
|
+ value=(0, 0),
|
|
|
+ top_png_img=pp_png_1,
|
|
|
+ )
|
|
|
detailed_images.append(pp_bg_16)
|
|
|
return self.pp_pic_subsection(
|
|
|
PictureProcessing(im=self.add_pic(detailed_images))
|