From 6f9c89da7b39c2f3882f68215312380e6f8ffca5 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 30 Jul 2025 11:12:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/validate/v1/VideoValidate.php | 4 ++-- database/migrations/20241220072926_create_video.php | 2 +- database/migrations/20241231020620_create_sys_banner_item.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/validate/v1/VideoValidate.php b/app/admin/validate/v1/VideoValidate.php index f374ce34..da7a751d 100644 --- a/app/admin/validate/v1/VideoValidate.php +++ b/app/admin/validate/v1/VideoValidate.php @@ -17,7 +17,7 @@ class VideoValidate extends Validate 'id' => 'require|integer', 'language_id' => 'require|integer', 'category_id' => 'require|integer', - 'name' => 'require|max:64', + 'name' => 'require|max:128', 'desc' => 'max:512', 'image' => 'max:125', 'video' => 'max:125', @@ -43,7 +43,7 @@ class VideoValidate extends Validate 'category_id.require' => '分类不能为空', 'category_id.integer' => '分类参数类型错误', 'name.require' => '名称不能为空', - 'name.max' => '名称不能超过64个字符', + 'name.max' => '名称不能超过128个字符', 'desc.max' => '描述不能超过512个字符', 'image.max' => '图片不能超过125个字符', 'video.max' => '视频不能超过125个字符', diff --git a/database/migrations/20241220072926_create_video.php b/database/migrations/20241220072926_create_video.php index e49b5a0c..abaadc34 100644 --- a/database/migrations/20241220072926_create_video.php +++ b/database/migrations/20241220072926_create_video.php @@ -31,7 +31,7 @@ class CreateVideo extends Migrator $table = $this->table('video', ['engine' => 'MyISAM', 'comment' => '视频表']); $table->addColumn('language_id', 'integer', ['signed' => false , 'null' => false, 'comment' => '语言ID']) ->addColumn('category_id', 'integer', ['signed' => false , 'null' => false, 'comment' => '分类ID']) - ->addColumn('name', 'string', ['limit' => 64 , 'null' => false, 'comment' => '名称']) + ->addColumn('name', 'string', ['limit' => 128 , 'null' => false, 'comment' => '名称']) ->addColumn('desc', 'string', ['limit' => 512, 'null' => true, 'default' => null, 'comment' => '描述信息']) ->addColumn('image', 'string', ['limit' => 125, 'null' => true, 'default' => null, 'comment' => '封面图片']) ->addColumn('video', 'string', ['limit' => 125, 'null' => true, 'default' => null, 'comment' => '视频地址']) diff --git a/database/migrations/20241231020620_create_sys_banner_item.php b/database/migrations/20241231020620_create_sys_banner_item.php index e7512b92..37fe926f 100644 --- a/database/migrations/20241231020620_create_sys_banner_item.php +++ b/database/migrations/20241231020620_create_sys_banner_item.php @@ -39,7 +39,7 @@ class CreateSysBannerItem extends Migrator ->addColumn('extra_image', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '额外的图片']) ->addColumn('video', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '视频']) ->addColumn('link_to', 'string', ['limit' => 64, 'null' => true, 'default' => null, 'comment' => '链接到(类型): article:文章, article_category:文章分类, product:产品, product_category:产品分类, custom:自定义链接']) - ->addColumn('link', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '链接']) + ->addColumn('link', 'string', ['limit' => 510, 'null' => true, 'default' => null, 'comment' => '链接']) ->addColumn('sort', 'integer', ['limit' => 11, 'null' => false, 'default' => 0, 'comment' => '排序']) ->addColumn('status', 'boolean', ['limit' => 1, 'null' => false, 'default' => 1, 'comment' => '-1为禁用, 1为启用']) ->addColumn('created_at', 'timestamp', ['null' => false, 'default' =>'CURRENT_TIMESTAMP', 'comment' => '创建时间']) From d31d2359c6e6b33cfcf004489d2abbc6ea6cb648 Mon Sep 17 00:00:00 2001 From: liangjiami <2249412933@qq.com> Date: Wed, 30 Jul 2025 15:24:58 +0800 Subject: [PATCH 2/6] =?UTF-8?q?style:=E8=AF=A6=E6=83=85=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/index/pc/css/public.css | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/public/static/index/pc/css/public.css b/public/static/index/pc/css/public.css index e827a57e..f29463fc 100755 --- a/public/static/index/pc/css/public.css +++ b/public/static/index/pc/css/public.css @@ -1544,4 +1544,34 @@ div{ width: 100px; margin: -2px 0; /* 与标签对齐 */ +} +/*详情样式*/ +.o_detail_all { + text-align: center; +} +.o_detail_title { + font-size: 2.25em; + color: #101010; + padding: 4% 0 2.8%; +} +.o_detail_small { + font-size: 1.5em; + color: #333; + padding-bottom: 1.8%; +} +.o_detail_text { + font-size: 1.125em; + color: #737373; + padding: 0 0 1.8%; + line-height: 1.875em; + width: 80%; + margin: auto; +} +.star { + position: absolute; + top: 0; + width: 40%; + height: 15px; + background-image: url(../images/star_orange.png); + background-position: 0 0; } \ No newline at end of file From 3544c08005fd69dd5b35b95d79e9871617ea115b Mon Sep 17 00:00:00 2001 From: liangjiami <2249412933@qq.com> Date: Wed, 30 Jul 2025 15:35:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?style:=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index/view/pc/product/detail.html | 6 ++- public/static/index/pc/css/public.css | 61 +++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/app/index/view/pc/product/detail.html b/app/index/view/pc/product/detail.html index 7b061f50..0a339e34 100644 --- a/app/index/view/pc/product/detail.html +++ b/app/index/view/pc/product/detail.html @@ -133,8 +133,10 @@ {/notempty} -
- {$product.detail|default=''|raw} +
+
+ {$product.detail|default=''|raw} +
diff --git a/public/static/index/pc/css/public.css b/public/static/index/pc/css/public.css index f29463fc..fc0a4d2e 100755 --- a/public/static/index/pc/css/public.css +++ b/public/static/index/pc/css/public.css @@ -1567,11 +1567,56 @@ div{ width: 80%; margin: auto; } -.star { - position: absolute; - top: 0; - width: 40%; - height: 15px; - background-image: url(../images/star_orange.png); - background-position: 0 0; -} \ No newline at end of file + +.products_des { + width: 100%; + margin-bottom: 50px; +} +.products_des img { + width: 100%; +} +.de_t_n { + font-size: 1.5em; + color: #333; +} +.detail_title { + text-align: center; + padding: 2% 0; +} +.detail_title p { + line-height: 2em; +} +.detail_con_a { + margin: auto; + overflow: hidden; +} +.lj_detail_text, +.lj_detail_texts { + font-size: 0.875em; +} +.lj_detail_text p { + line-height: 1.6em; + padding: 0.5% 0; +} +/*seo-pro*/ +.seo-pro h3 { + font-size: 1.5em; + text-align: center; + color: #333; + margin: 2% 0 1%; + line-height: 1.2; + font-weight: 400; +} +.seo-pro p { + text-align: center; + margin: 0 0 11px; +} +.seo-pro a { + color: #333; + text-decoration: none; +} +.sa_blue, +.sa_blue a, +.seo-pro a:hover { + color: #009fdf; +} From 047d7979ff5ee14ad6431a6651615f8e4820985b Mon Sep 17 00:00:00 2001 From: liangjiami <2249412933@qq.com> Date: Wed, 30 Jul 2025 15:42:52 +0800 Subject: [PATCH 4/6] .ql-editor --- public/static/index/mobile/css/public.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/static/index/mobile/css/public.css b/public/static/index/mobile/css/public.css index de89a9c2..be9ccc75 100755 --- a/public/static/index/mobile/css/public.css +++ b/public/static/index/mobile/css/public.css @@ -154,7 +154,7 @@ body { tab-size: 4; -moz-tab-size: 4; text-align: left; - white-space: pre-wrap; + /* white-space: pre-wrap; */ word-wrap: break-word } From 9f9a384075277ec4c993bad72dbebeac28286cc6 Mon Sep 17 00:00:00 2001 From: liangjiami <2249412933@qq.com> Date: Wed, 30 Jul 2025 15:43:42 +0800 Subject: [PATCH 5/6] .ql-editor --- public/static/index/pc/css/public.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/static/index/pc/css/public.css b/public/static/index/pc/css/public.css index fc0a4d2e..17d443ee 100755 --- a/public/static/index/pc/css/public.css +++ b/public/static/index/pc/css/public.css @@ -256,7 +256,7 @@ div{ tab-size: 4; -moz-tab-size: 4; text-align: left; - white-space: pre-wrap; + /* white-space: pre-wrap; */ word-wrap: break-word } From 234658f443949732b916eaa1d98d59028ec63351 Mon Sep 17 00:00:00 2001 From: liangjiami <2249412933@qq.com> Date: Wed, 30 Jul 2025 16:13:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?style:=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/index/mobile/css/style.css | 58 +++++++++++++++++++++++- public/static/index/pc/css/public.css | 22 ++++++--- 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/public/static/index/mobile/css/style.css b/public/static/index/mobile/css/style.css index 291a046d..fdefbc7f 100755 --- a/public/static/index/mobile/css/style.css +++ b/public/static/index/mobile/css/style.css @@ -2314,7 +2314,10 @@ video img { margin-left: 0.4rem; margin-right: 0.4rem; } -/*详情样式*/ +//*详情样式*/ +.o_detail_title {font-size:2.25em; color: #101010; margin-top:3.125vw; font-weight: 600; margin-bottom:1.25vw; line-height: 1.2em;} +.o_detail_small {font-size:1.5em; color: #333; margin-bottom:0.7vw;} +.o_detail_text {font-size:1em;color: #737373; line-height: 1.5em;width:80%; margin-left: auto; margin-right: auto; margin-bottom: 0.7vw;} .o_detail_all { text-align: center; background-color: #fff; @@ -2342,6 +2345,59 @@ video img { margin-bottom: 1.3rem; } +.products_des { + width: 100%; + margin-bottom: 50px; +} +.products_des img { + width: 100%; +} +.de_t_n { + font-size: 1.5em; + color: #333; +} +.detail_title { + text-align: center; + padding: 2% 0; +} +.detail_title p { + line-height: 2em; +} +.detail_con_a { + margin: auto; + overflow: hidden; +} +.lj_detail_text, +.lj_detail_texts { + font-size: 0.875em; +} +.lj_detail_text p { + line-height: 1.6em; + padding: 0.5% 0; +} +/*seo-pro*/ +.seo-pro h3 { + font-size: 1.5em; + text-align: center; + color: #333; + margin: 2% 0 1%; + line-height: 1.2; + font-weight: 400; +} +.seo-pro p { + text-align: center; + margin: 0 0 11px; +} +.seo-pro a { + color: #333; + text-decoration: none; +} +.sa_blue, +.sa_blue a, +.seo-pro a:hover { + color: #009fdf; +} + /*两列*/ .list_two { width: 100%; diff --git a/public/static/index/pc/css/public.css b/public/static/index/pc/css/public.css index 17d443ee..ac838fef 100755 --- a/public/static/index/pc/css/public.css +++ b/public/static/index/pc/css/public.css @@ -1546,26 +1546,34 @@ div{ /* 与标签对齐 */ } /*详情样式*/ +.o_detail_title {font-size:2.25em; color: #101010; margin-top:3.125vw; font-weight: 600; margin-bottom:1.25vw; line-height: 1.2em;} +.o_detail_small {font-size:1.5em; color: #333; margin-bottom:0.7vw;} +.o_detail_text {font-size:1em;color: #737373; line-height: 1.5em;width:80%; margin-left: auto; margin-right: auto; margin-bottom: 0.7vw;} .o_detail_all { text-align: center; + background-color: #fff; + overflow: hidden; } .o_detail_title { - font-size: 2.25em; + font-size: 0.85rem; color: #101010; - padding: 4% 0 2.8%; } .o_detail_small { - font-size: 1.5em; + font-size: 0.75rem; color: #333; - padding-bottom: 1.8%; + margin-top: 0.4rem; } .o_detail_text { - font-size: 1.125em; + font-size: 0.64rem; color: #737373; - padding: 0 0 1.8%; - line-height: 1.875em; + line-height: 1rem; width: 80%; margin: auto; + margin-top: 0.5rem; +} +.o_detail_img { + margin-top: 0.3rem; + margin-bottom: 1.3rem; } .products_des {