From 8a78cea36da291ef7ae9acad997674e8621f5af2 Mon Sep 17 00:00:00 2001 From: ZF sun <34314687@qq.com> Date: Sat, 22 Nov 2025 16:14:32 +0800 Subject: [PATCH] =?UTF-8?q?chore(addon):=20=E5=90=8C=E6=AD=A5=E5=8D=8E?= =?UTF-8?q?=E4=B8=BA=E4=BA=91=E7=AC=AC1=E5=8F=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=B8=8A=E7=9A=84addon=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/addon/fenxiao/model/Poster.php | 28 ++++++++++----------- src/addon/fenxiao/model/PosterTemplate.php | 16 ++++++------ src/addon/form/shop/view/form/formdata.html | 8 ++---- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/addon/fenxiao/model/Poster.php b/src/addon/fenxiao/model/Poster.php index 9d023cccb..5728d3df7 100644 --- a/src/addon/fenxiao/model/Poster.php +++ b/src/addon/fenxiao/model/Poster.php @@ -44,7 +44,7 @@ class Poster extends BaseModel [ 'action' => 'imageCopy', // 背景图 'data' => [ - 'upload/poster/bg/fenxiao_3.png', + 'upload/poster/bg/fenxiao_2.png', 0, 0, 720, @@ -125,18 +125,18 @@ class Poster extends BaseModel 1 ] ], - // [ - // 'action' => 'imageText', // 写入分享语 - // 'data' => [ - // $params[ 'template_json' ][ 'share_content' ], - // $params[ 'template_json' ][ 'share_content_font_size' ] * $fontRate * 2, - // is_array($params[ 'template_json' ][ 'share_content_color' ]) ? $params[ 'template_json' ][ 'share_content_color' ] : hex2rgb($params[ 'template_json' ][ 'share_content_color' ]), - // $params[ 'template_json' ][ 'share_content_left' ] * 2, - // ( $params[ 'template_json' ][ 'share_content_top' ] + $params[ 'template_json' ][ 'share_content_font_size' ] ) * 2, - // $params[ 'template_json' ][ 'share_content_width' ] * 2, - // 1 - // ] - // ], + [ + 'action' => 'imageText', // 写入分享语 + 'data' => [ + $params[ 'template_json' ][ 'share_content' ], + $params[ 'template_json' ][ 'share_content_font_size' ] * $fontRate * 2, + is_array($params[ 'template_json' ][ 'share_content_color' ]) ? $params[ 'template_json' ][ 'share_content_color' ] : hex2rgb($params[ 'template_json' ][ 'share_content_color' ]), + $params[ 'template_json' ][ 'share_content_left' ] * 2, + ( $params[ 'template_json' ][ 'share_content_top' ] + $params[ 'template_json' ][ 'share_content_font_size' ] ) * 2, + $params[ 'template_json' ][ 'share_content_width' ] * 2, + 1 + ] + ], [ 'action' => 'imageCopy', // 写入用户头像 'data' => [ @@ -179,7 +179,7 @@ class Poster extends BaseModel $pic_name = "_" . $pic_name; } - $res = $option_res->jpeg('upload/poster/distribution', 'distribution_0516' . $qrcode_param[ 'source_member' ] . $pic_name . '_' . $app_type); + $res = $option_res->jpeg('upload/poster/distribution', 'distribution_' . $qrcode_param[ 'source_member' ] . $pic_name . '_' . $app_type); if ($res[ 'code' ] == 0) { $upload = new Upload($site_id); $cloud_res = $upload->fileCloud($res[ 'data' ][ 'path' ]); diff --git a/src/addon/fenxiao/model/PosterTemplate.php b/src/addon/fenxiao/model/PosterTemplate.php index 7c41b30df..da15d0d38 100644 --- a/src/addon/fenxiao/model/PosterTemplate.php +++ b/src/addon/fenxiao/model/PosterTemplate.php @@ -49,14 +49,14 @@ class PosterTemplate extends BaseModel 'nickname_top' => 515, 'nickname_left' => 20, //分享语 - // 'share_content' => '邀您一起分享赚佣金', - // 'share_content_is_show' => 1, - // 'share_content_font_size' => 14, - // 'share_content_color' => '#8D8D8D', - // 'share_content_width' => 130, - // 'share_content_height' => 30, - // 'share_content_top' => 550, - // 'share_content_left' => 20, + 'share_content' => '邀您一起分享赚佣金', + 'share_content_is_show' => 1, + 'share_content_font_size' => 14, + 'share_content_color' => '#8D8D8D', + 'share_content_width' => 130, + 'share_content_height' => 30, + 'share_content_top' => 550, + 'share_content_left' => 20, ] ]; diff --git a/src/addon/form/shop/view/form/formdata.html b/src/addon/form/shop/view/form/formdata.html index c41f6140e..cc2258249 100644 --- a/src/addon/form/shop/view/form/formdata.html +++ b/src/addon/form/shop/view/form/formdata.html @@ -7,16 +7,12 @@ .layui-layout-admin.admin-style-2 .table-tab .layui-tab-title{margin-bottom: 15px;} .form-img .form-img-wrap {width: 25px;height: 25px;margin: 0 10px 10px 0;border: 1px solid #EAEAEA;display: flex;align-items: center;justify-items: center} .form-img-wrap img {max-width: 100%;max-height: 100%;height: auto;width: 100%} - .layui-layer-content .layui-form-label {width: 250px} + .layui-layer-content .layui-form-label {width: 100px} .layui-layer-content .layui-form-label + .layui-input-block {margin-left: 100px} .layui-table .form-data-wrap {max-height: 50px;overflow: hidden} .layui-table .layui-form-item {margin-bottom: 0} .layui-table .layui-form-label {width: auto;height: 25px;line-height: 25px;} .layui-table .layui-form-label + .layui-input-block {margin-left: 0; height: 25px;line-height: 25px;min-height: unset;} - .layui-layer-content .form-data-wrap{ - height: 700px; - overflow: auto; - } @@ -211,7 +207,7 @@ layui.use(['form', 'laydate', 'laytpl'], function() { laytpl($('#formData').html()).render(data, function(string){ layer.open({ title: '查看信息', - area: ["600px","800px"], + area: "400px", type: 1, content: string, btn: ['确认']