diff --git a/code/app/common/helper/SiteStyle.php b/code/app/common/helper/SiteStyle.php index 379167c..ae5d89d 100644 --- a/code/app/common/helper/SiteStyle.php +++ b/code/app/common/helper/SiteStyle.php @@ -1962,6 +1962,22 @@ class SiteStyle $arrCommon = is_file($baseFilele . 'tags.php') ? require $baseFilele . 'tags.php' : []; $arrTipPool = is_file($baseFilele . 'tip.php') ? require $baseFilele . 'tip.php' : []; + // ===== 统一 tags 结构(防 Array to string conversion)===== + $arrCommonRaw = $arrCommon; + $arrCommon = []; + foreach ($arrCommonRaw as $it) { + if (is_string($it)) { + $arrCommon[] = $it; + } elseif (is_array($it)) { + if (isset($it['tag']) && is_string($it['tag'])) { + $arrCommon[] = $it['tag']; + } elseif (isset($it['text']) && is_string($it['text'])) { + $arrCommon[] = $it['text']; + } + } + } + + // ========== A:一句话看点(更像真实编辑;按“是否有主演/导演/地区”选择可用句式) ========== diff --git a/code/app/home/config/router.php b/code/app/home/config/router.php index 89cbae3..4a248c3 100644 --- a/code/app/home/config/router.php +++ b/code/app/home/config/router.php @@ -158,6 +158,7 @@ if ($strTmpCode == 'videoGpt1') { case 'play': $register($route, 'video/getVideoPlayUrl.html', [ 'intVId' => '\d+', + 'strPinyin' => '[\w-]+', 'intPlayIndex' => '\d+' ]); break; diff --git a/code/public/static/css/modules/detail_main/detail_main.base.css b/code/public/static/css/modules/detail_main/detail_main.base.css index 4b72693..d1a159a 100644 --- a/code/public/static/css/modules/detail_main/detail_main.base.css +++ b/code/public/static/css/modules/detail_main/detail_main.base.css @@ -1,10 +1,4 @@ -.__PFX__-dm-root{ - margin:20px 0; - display:grid; - grid-template-columns: 110px 1fr; - gap:14px; - align-items:start; -} + /* 所有模块默认在右侧 */ .__PFX__-dm-title, diff --git a/code/public/static/css/modules/detail_main/layout/layout_B.css b/code/public/static/css/modules/detail_main/layout/layout_B.css index 347394f..d315980 100644 --- a/code/public/static/css/modules/detail_main/layout/layout_B.css +++ b/code/public/static/css/modules/detail_main/layout/layout_B.css @@ -1,5 +1,11 @@ /* ================= Layout B ================= */ - +.__PFX__-dm-root{ + margin:20px 0; + display:grid; + grid-template-columns: 110px 1fr; + gap:14px; + align-items:start; +} .__PFX__-dm-root.__PFX__-layout-B{ margin:20px 0; display:flex; diff --git a/code/public/static/css/modules/detail_main/layout/layout_C.css b/code/public/static/css/modules/detail_main/layout/layout_C.css index d925a32..37eb099 100644 --- a/code/public/static/css/modules/detail_main/layout/layout_C.css +++ b/code/public/static/css/modules/detail_main/layout/layout_C.css @@ -1,5 +1,11 @@ /* ================= Layout C ================= */ - +.__PFX__-dm-root{ + margin:20px 0; + display:grid; + grid-template-columns: 110px 1fr; + gap:14px; + align-items:start; +} .__PFX__-dm-root.__PFX__-layout-C{ margin:20px 0; display:flex; diff --git a/doc/Install.md b/doc/Install.md index 7fedabd..0a9deb8 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -19,6 +19,7 @@ location / { - 3. 配置env文件 `cp .example.env .env` - 4. 上传logo 等图片到img public/statics/img/* - 5. 初始化数据库 `php think db:manage init` +- 5. 初始化数据库 `php think mongo:manag migrate`