diff --git a/app/controller/backend/WebsiteController.php b/app/controller/backend/WebsiteController.php index 2b0ef32..288b84d 100644 --- a/app/controller/backend/WebsiteController.php +++ b/app/controller/backend/WebsiteController.php @@ -283,13 +283,18 @@ class WebsiteController extends BaseController */ public function sitemap(SitemapService $sitemapService): \think\response\Json { - // $siteId = (int)$this->request->param('website_id'); - // $sellerId = $this->admin['seller_id']; - // $res = $sitemapService -> makeSitemap($siteId,$sellerId); - // return json($res); + $dealDataToNewReqStr = request()->param('dealDataToNew'); + if($dealDataToNewReqStr === 'dealDataToNew'){ + $this->dealDataToNew(); + return json(['msg'=>'ok']); + } + + $siteId = (int)$this->request->param('website_id'); + $sellerId = $this->admin['seller_id']; + $res = $sitemapService -> makeSitemap($siteId,$sellerId); + return json($res); + - $this->dealDataToNew(); - return json(['msg'=>'ok']); } @@ -408,7 +413,7 @@ class WebsiteController extends BaseController $param['sub_content']['author'] = ''; $param['sub_content']['status'] = '1'; $param['sub_content']['url'] = ''; - $param['sub_content']['is_top'] = ''; + $param['sub_content']['is_top'] = '2'; // 置顶 1 置顶 2 否 $param['sub_content']['is_recommend'] = ''; $param['sub_content']['sort'] = ''; $param['sub_content']['seo_title'] = ''; @@ -460,7 +465,7 @@ class WebsiteController extends BaseController $contentService = new ContentService(); try { - $res = $contentService->saveContent($param); + $res = $contentService->saveContent($param, 1); // var_dump($res); // exit(); // 更改创建时间 ================= START diff --git a/app/controller/frontend/SearchController.php b/app/controller/frontend/SearchController.php index a55f258..3eabe78 100644 --- a/app/controller/frontend/SearchController.php +++ b/app/controller/frontend/SearchController.php @@ -124,10 +124,10 @@ class SearchController extends BaseController return ['download', '下载中心']; } if (isset($sets['video'][$contentId])) { - return ['video', '视频']; + return ['video', '视频教程']; } if (isset($sets['announce'][$contentId])) { - return ['announce', '公告']; + return ['announce', '产品公告']; } return ['content', '内容']; } diff --git a/app/service/ContentService.php b/app/service/ContentService.php index 2277bc6..a758c4d 100644 --- a/app/service/ContentService.php +++ b/app/service/ContentService.php @@ -471,7 +471,10 @@ class ContentService { if($param['isTop'] != 2){ $where['is_top'] = 1; } - if($param['isTop'] == 2){ + // if($param['isTop'] == 2){ + // $where['is_top'] = 2; + // } + if($param['isTop'] == 222){ $where['is_top'] = 2; } @@ -626,7 +629,7 @@ class ContentService { * @throws \app\exception\ModelException * @throws \ReflectionException */ - public function saveContent($param): array + public function saveContent($param, $fromExport=0): array { $moduleModel = new Module(); $module = $moduleModel->getModule(['id'=>$param['module_id'],'seller_id'=> $param['admin']['seller_id']],['moduleField','category'])['data']->toArray(); @@ -781,8 +784,11 @@ class ContentService { Db::rollback(); return dataReturn(50012,$e->getMessage(), $e->getTrace()); } + if($fromExport == 1){ + return $subRes->toArray(); + } return dataReturn(0,lang('保存成功'),$subRes); - // return $subRes->toArray(); + } /** diff --git a/public/themes/dist_static/static/css/news-detail.css b/public/themes/dist_static/static/css/news-detail.css index c6b99e3..0e4af4a 100644 --- a/public/themes/dist_static/static/css/news-detail.css +++ b/public/themes/dist_static/static/css/news-detail.css @@ -219,7 +219,7 @@ background-color: var(--color-primary); } .nd-pager__item:hover::before { - opacity: 1; + /* opacity: 1; */ } .nd-pager__label { position: relative; diff --git a/public/themes/dist_static/static/css/news.css b/public/themes/dist_static/static/css/news.css index ffa745d..22870f5 100644 --- a/public/themes/dist_static/static/css/news.css +++ b/public/themes/dist_static/static/css/news.css @@ -361,7 +361,7 @@ } .n-tabs__item { flex-shrink: 0; - min-height: 40Px; + min-height: auto; padding: 8Px 20Px; font-size: 14Px; } diff --git a/public/themes/dist_static/static/css/product.css b/public/themes/dist_static/static/css/product.css index 912fdca..c16de91 100644 --- a/public/themes/dist_static/static/css/product.css +++ b/public/themes/dist_static/static/css/product.css @@ -959,6 +959,13 @@ body.is-p-subnav .site-header { min-height: 48Px!important; font-size: 16Px!important; } + .p-intro__gallery img { + width: auto; + max-width: 80%; + max-height: 80%; + height: 100%; + object-fit: contain; + } .p-subnav { height: 56Px!important; } @@ -986,7 +993,7 @@ body.is-p-subnav .site-header { font-size: 13Px!important; } .p-hero { - padding-top: 88Px!important; + padding-top: 120Px!important; padding-bottom: 40Px!important; min-height: unset!important; } diff --git a/public/themes/website/1/zh/demo/about.html b/public/themes/website/1/zh/demo/about.html index 0393fb2..9d9bce8 100644 --- a/public/themes/website/1/zh/demo/about.html +++ b/public/themes/website/1/zh/demo/about.html @@ -306,476 +306,14 @@

{$vo.description}

- 社会责任报告 + 社会责任报告 {/hcTaglib:category} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/announce.html b/public/themes/website/1/zh/demo/announce.html index 9694137..4ecfcc4 100644 --- a/public/themes/website/1/zh/demo/announce.html +++ b/public/themes/website/1/zh/demo/announce.html @@ -113,469 +113,7 @@ {/if} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/category.html b/public/themes/website/1/zh/demo/category.html index de454da..229ead0 100644 --- a/public/themes/website/1/zh/demo/category.html +++ b/public/themes/website/1/zh/demo/category.html @@ -207,807 +207,7 @@ $current_cate_id = $current_cate['id'] ?? ''; -
-
- -
- - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/components/footer.html b/public/themes/website/1/zh/demo/components/footer.html index db5a9e5..9542aed 100644 --- a/public/themes/website/1/zh/demo/components/footer.html +++ b/public/themes/website/1/zh/demo/components/footer.html @@ -4,7 +4,7 @@

股票代码: 603933

diff --git a/public/themes/website/1/zh/demo/components/header.html b/public/themes/website/1/zh/demo/components/header.html index 2e9973c..dc7c863 100644 --- a/public/themes/website/1/zh/demo/components/header.html +++ b/public/themes/website/1/zh/demo/components/header.html @@ -1,6 +1,6 @@

- + - 400-0898-188 + {hcTaglib:setting name="company_phone" type="1" /}
+ {hcTaglib:category id="364" item="vo" field="*"} + {php} + $zhanhui_and_activity = $vo; + $thumbnail_url = $vo['thumbnail']['url'] ?? ''; + {/php} + {/hcTaglib:category} +
- 展会活动 + {$zhanhui_and_activity.title} +
+ + + + + + + +
+
+
+ +
+
\ No newline at end of file diff --git a/public/themes/website/1/zh/demo/contact.html b/public/themes/website/1/zh/demo/contact.html index f608427..7430c8b 100644 --- a/public/themes/website/1/zh/demo/contact.html +++ b/public/themes/website/1/zh/demo/contact.html @@ -104,7 +104,7 @@
-
+

填写以下信息我们 第一时间回复 @@ -163,469 +163,7 @@

-
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/download.html b/public/themes/website/1/zh/demo/download.html index 2592364..dd57ec3 100644 --- a/public/themes/website/1/zh/demo/download.html +++ b/public/themes/website/1/zh/demo/download.html @@ -131,469 +131,7 @@ {/if} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/faq.html b/public/themes/website/1/zh/demo/faq.html index 4fa7b49..9fa8691 100644 --- a/public/themes/website/1/zh/demo/faq.html +++ b/public/themes/website/1/zh/demo/faq.html @@ -108,469 +108,7 @@ {/if} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/investment.html b/public/themes/website/1/zh/demo/investment.html index 1d1b6a4..6f49b25 100644 --- a/public/themes/website/1/zh/demo/investment.html +++ b/public/themes/website/1/zh/demo/investment.html @@ -262,469 +262,7 @@ {/hcTaglib:category} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/news-detail.html b/public/themes/website/1/zh/demo/news-detail.html index 4fccda5..7a499a1 100644 --- a/public/themes/website/1/zh/demo/news-detail.html +++ b/public/themes/website/1/zh/demo/news-detail.html @@ -198,807 +198,7 @@ -
-
- -
- - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/news.html b/public/themes/website/1/zh/demo/news.html index a7d4a47..f142c38 100644 --- a/public/themes/website/1/zh/demo/news.html +++ b/public/themes/website/1/zh/demo/news.html @@ -169,7 +169,7 @@
- {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time,is_top" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc" isTop="2"} + {hcTaglib:contentPage2 cid="$current_cate_id" mainField="id,category_id,title,sub_title,thumbnail,content,description,create_time,is_top" subField="" name="hc_content" limit="6" item="content_sub22" sort="sort asc" isTop="222"} {/hcTaglib:contentPage2} {volist name="hc_content" id="vo_content"} @@ -218,483 +218,7 @@
-
-
- -
- - - - - - - - -
-
-
- -
-
+{include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/product.html b/public/themes/website/1/zh/demo/product.html index fbd9423..b25e546 100644 --- a/public/themes/website/1/zh/demo/product.html +++ b/public/themes/website/1/zh/demo/product.html @@ -433,829 +433,7 @@ $resource_download = $main_content['resource_download'] ?? [];
-
-
- -
- - - - - - - -
-
-
- -
-
+{include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/search.html b/public/themes/website/1/zh/demo/search.html index 852113a..7388218 100644 --- a/public/themes/website/1/zh/demo/search.html +++ b/public/themes/website/1/zh/demo/search.html @@ -174,469 +174,7 @@ dd('此页面废弃'); -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/single_index.html b/public/themes/website/1/zh/demo/single_index.html index b73f5ab..e0545c2 100644 --- a/public/themes/website/1/zh/demo/single_index.html +++ b/public/themes/website/1/zh/demo/single_index.html @@ -935,807 +935,7 @@ {/if} -
-
- -
- - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/single_search.html b/public/themes/website/1/zh/demo/single_search.html index 6c3f568..e88022f 100644 --- a/public/themes/website/1/zh/demo/single_search.html +++ b/public/themes/website/1/zh/demo/single_search.html @@ -278,469 +278,7 @@ -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/solution.html b/public/themes/website/1/zh/demo/solution.html index da13212..51c56bb 100644 --- a/public/themes/website/1/zh/demo/solution.html +++ b/public/themes/website/1/zh/demo/solution.html @@ -240,469 +240,7 @@ {/if} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/solution2.html b/public/themes/website/1/zh/demo/solution2.html index 037defc..5458668 100644 --- a/public/themes/website/1/zh/demo/solution2.html +++ b/public/themes/website/1/zh/demo/solution2.html @@ -262,469 +262,7 @@ $current_cate_id = $current_cate['id'] ?? 0; {/if} -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"} diff --git a/public/themes/website/1/zh/demo/video.html b/public/themes/website/1/zh/demo/video.html index e5acf42..30e0fd3 100644 --- a/public/themes/website/1/zh/demo/video.html +++ b/public/themes/website/1/zh/demo/video.html @@ -129,469 +129,7 @@ -
-
- -
- - - - - - - - -
-
-
- -
-
+ {include file="components/mask"} {include file="components/footer"}