|
|
@@ -476,16 +476,17 @@ class DetailPicGet(DetailBase):
|
|
|
pp_png_1 = pp_png_1.transpose()
|
|
|
pp_jpg_1 = pp_jpg_1.transpose()
|
|
|
|
|
|
-
|
|
|
+ posy=2325
|
|
|
if pp_jpg_1.height > pp_jpg_1.width:
|
|
|
aheight =350
|
|
|
# 等比计算目标宽度
|
|
|
awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
|
|
|
else:
|
|
|
if pp_jpg_1.height > (pp_jpg_1.width/2):
|
|
|
- awidth = int(pp_jpg_1.width * 0.13)
|
|
|
+ awidth = int(bg_img.width * 0.4)
|
|
|
else:
|
|
|
- awidth = int(pp_jpg_1.width * 0.30)
|
|
|
+ awidth = int(bg_img.width * 0.4)
|
|
|
+ posy=2380
|
|
|
|
|
|
|
|
|
pp_jpg_1 = pp_jpg_1.resize(value=awidth)
|
|
|
@@ -494,7 +495,7 @@ class DetailPicGet(DetailBase):
|
|
|
mode="pixel",
|
|
|
top_img=pp_jpg_1,
|
|
|
base="cs",
|
|
|
- value=(-15, 2325),
|
|
|
+ value=(-15, posy),
|
|
|
top_png_img=pp_png_1,
|
|
|
)
|
|
|
|