From 6f21ee66b5fde403068af263ed91520b9ff41d21 Mon Sep 17 00:00:00 2001
From: xuanchen120 <122383162@qq.com>
Date: Thu, 30 Jun 2022 13:50:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/index/css/style.css                      |  3 +++
 resources/views/articles/show.blade.php                |  3 +++
 resources/views/category/cxpt.blade.php                |  4 ++++
 resources/views/category/default.blade.php             |  4 +++-
 resources/views/category/kycg.blade.php                |  4 ++++
 resources/views/category/list.blade.php                |  4 ++++
 .../views/category/list_image_title_des_date.blade.php |  4 ++++
 resources/views/category/list_title_date.blade.php     |  4 ++++
 resources/views/category/lxwm.blade.php                |  2 --
 resources/views/category/nsjg.blade.php                |  4 ++++
 resources/views/category/nyhjxh.blade.php              |  4 ++++
 resources/views/category/only_title.blade.php          |  3 +++
 resources/views/category/xwdt.blade.php                |  4 ++++
 resources/views/category/ysjj.blade.php                |  4 ++++
 resources/views/category/zzjg.blade.php                |  5 -----
 resources/views/index/index.blade.php                  |  4 ++++
 resources/views/layouts/app.blade.php                  | 10 +++++++---
 resources/views/meta/article.blade.php                 |  8 ++++----
 resources/views/meta/index.blade.php                   |  6 +++---
 resources/views/meta/video.blade.php                   |  7 -------
 resources/views/meta/videos.blade.php                  |  5 -----
 21 files changed, 66 insertions(+), 30 deletions(-)
 delete mode 100644 resources/views/category/zzjg.blade.php
 delete mode 100644 resources/views/meta/video.blade.php
 delete mode 100644 resources/views/meta/videos.blade.php

diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css
index 2ce2612..0d350f4 100644
--- a/public/assets/index/css/style.css
+++ b/public/assets/index/css/style.css
@@ -2102,6 +2102,9 @@ input {
     margin-bottom: 20px;
     text-align: justify;
 }
+.details-text img {
+    max-width: 100%;
+}
 
 /* 无图片的列表 */
 .noGraphList li {
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
index 8339222..6ce55fa 100644
--- a/resources/views/articles/show.blade.php
+++ b/resources/views/articles/show.blade.php
@@ -2,6 +2,9 @@
 
 @section('title', $article->title)
 
+@section('meta')
+    @include('meta.article')
+@endsection
 
 @section('content')
     <!-- 内容 -->
diff --git a/resources/views/category/cxpt.blade.php b/resources/views/category/cxpt.blade.php
index da99e1c..b3a169e 100644
--- a/resources/views/category/cxpt.blade.php
+++ b/resources/views/category/cxpt.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
 
     <!-- 内容 -->
diff --git a/resources/views/category/default.blade.php b/resources/views/category/default.blade.php
index 34dd8b7..33193f2 100644
--- a/resources/views/category/default.blade.php
+++ b/resources/views/category/default.blade.php
@@ -1,6 +1,8 @@
 @extends('layouts.app')
 
-@section('title', $category->title)
+@section('meta')
+    @include('meta.list')
+@endsection
 
 @section('content')
     <!-- 详情 -->
diff --git a/resources/views/category/kycg.blade.php b/resources/views/category/kycg.blade.php
index 67516c3..4d2b253 100644
--- a/resources/views/category/kycg.blade.php
+++ b/resources/views/category/kycg.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/list.blade.php b/resources/views/category/list.blade.php
index 4456466..b62ad9f 100644
--- a/resources/views/category/list.blade.php
+++ b/resources/views/category/list.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/list_image_title_des_date.blade.php b/resources/views/category/list_image_title_des_date.blade.php
index eafd400..fc45e92 100644
--- a/resources/views/category/list_image_title_des_date.blade.php
+++ b/resources/views/category/list_image_title_des_date.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/list_title_date.blade.php b/resources/views/category/list_title_date.blade.php
index 1ed3a2c..9a367d8 100644
--- a/resources/views/category/list_title_date.blade.php
+++ b/resources/views/category/list_title_date.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/lxwm.blade.php b/resources/views/category/lxwm.blade.php
index ca5672c..1bad33c 100644
--- a/resources/views/category/lxwm.blade.php
+++ b/resources/views/category/lxwm.blade.php
@@ -1,7 +1,5 @@
 @extends('layouts.app')
 
-@section('title', $category->title)
-
 
 @section('content')
     <!-- 内容 -->
diff --git a/resources/views/category/nsjg.blade.php b/resources/views/category/nsjg.blade.php
index 9c9c88f..7b7a153 100644
--- a/resources/views/category/nsjg.blade.php
+++ b/resources/views/category/nsjg.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/nyhjxh.blade.php b/resources/views/category/nyhjxh.blade.php
index 464f013..874fd6a 100644
--- a/resources/views/category/nyhjxh.blade.php
+++ b/resources/views/category/nyhjxh.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
 
     <!-- 内容 -->
diff --git a/resources/views/category/only_title.blade.php b/resources/views/category/only_title.blade.php
index 33a56f7..baccc86 100644
--- a/resources/views/category/only_title.blade.php
+++ b/resources/views/category/only_title.blade.php
@@ -1,5 +1,8 @@
 @extends('wsb::layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
 
 @section('content')
     <!-- 内容 -->
diff --git a/resources/views/category/xwdt.blade.php b/resources/views/category/xwdt.blade.php
index 486c2a6..5e6f062 100644
--- a/resources/views/category/xwdt.blade.php
+++ b/resources/views/category/xwdt.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/ysjj.blade.php b/resources/views/category/ysjj.blade.php
index 3c0da6a..39cfae4 100644
--- a/resources/views/category/ysjj.blade.php
+++ b/resources/views/category/ysjj.blade.php
@@ -1,5 +1,9 @@
 @extends('layouts.app')
 
+@section('meta')
+    @include('meta.list')
+@endsection
+
 @section('content')
     <!-- 内容 -->
     <div class="second">
diff --git a/resources/views/category/zzjg.blade.php b/resources/views/category/zzjg.blade.php
deleted file mode 100644
index 3a85252..0000000
--- a/resources/views/category/zzjg.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-
-@endsection
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
index beb8e3d..d577ad5 100644
--- a/resources/views/index/index.blade.php
+++ b/resources/views/index/index.blade.php
@@ -2,6 +2,10 @@
 
 @section('title', '首页')
 
+@section('meta')
+    @include('meta.index')
+@endsection
+
 @section('content')
 
     <!-- 公告 -->
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 2eb8bc2..1d187f6 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -5,9 +5,13 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>{{ config('app.name', '') }} </title>
-    <meta name="description" content="{{ config('app.name', '') }}">
-    <meta name=”keywords” content="{{ config('app.name', '') }}">
+    <title>{{ config('settings.name', '') }} @yield('title') </title>
+    <meta name="keywords" content="{{ config('settings.keywords', '') }}">
+    <meta name=”description” content="{{ config('settings.description', '') }}">
+    <meta name="SiteName" content="{{ config('settings.name', '') }}">
+    <meta name="SiteDomain" content="{{ request()->server('HTTP_HOST') }}">
+    @section('meta')
+    @show
     <link rel="stylesheet" href="{{ asset('assets/index/css/bootstrap.min.css') }}" type="text/css"/>
     <link rel="stylesheet" href="{{ asset('assets/index/css/swiper.min.css') }}" type="text/css"/>
     <link rel="stylesheet" href="{{ asset('assets/index/css/style.css') }}" type="text/css"/>
diff --git a/resources/views/meta/article.blade.php b/resources/views/meta/article.blade.php
index b7f53c8..5196696 100644
--- a/resources/views/meta/article.blade.php
+++ b/resources/views/meta/article.blade.php
@@ -1,7 +1,7 @@
-<meta name="ColumnName" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnDescription" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnKeywords" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnType" content="{{ config('wsb.name', '') }}">
+<meta name="ColumnName" content="{{ config('settings.name', '') }}">
+<meta name="ColumnDescription" content="{{ config('settings.name', '') }}">
+<meta name="ColumnKeywords" content="{{ config('settings.name', '') }}">
+<meta name="ColumnType" content="文章详情">
 <meta name="“ContentSource”" content="“来源：{{ $article->origin }}”">
 <meta name="“ArticleTitle”" content="{{ $article->title }}">
 <meta name="“PubDate”" content="{{ $article->created_at }}">
\ No newline at end of file
diff --git a/resources/views/meta/index.blade.php b/resources/views/meta/index.blade.php
index addf5f7..d889cf2 100644
--- a/resources/views/meta/index.blade.php
+++ b/resources/views/meta/index.blade.php
@@ -1,4 +1,4 @@
-<meta name="ColumnName" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnDescription" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnKeywords" content="{{ config('wsb.name', '') }}">
+<meta name="ColumnName" content="{{ config('settings.name', '') }}">
+<meta name="ColumnDescription" content="{{ config('settings.description', '') }}">
+<meta name="ColumnKeywords" content="{{ config('settings.keywords', '') }}">
 <meta name="ColumnType" content="首页">
\ No newline at end of file
diff --git a/resources/views/meta/video.blade.php b/resources/views/meta/video.blade.php
deleted file mode 100644
index 358b9a9..0000000
--- a/resources/views/meta/video.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<meta name="ColumnName" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnDescription" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnKeywords" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnType" content="{{ config('wsb.name', '') }}">
-<meta name="“ContentSource”" content="“来源：{{ $video->origin }}”">
-<meta name="“ArticleTitle”" content="{{ $video->title }}">
-<meta name="“PubDate”" content="{{ $video->created_at }}">
\ No newline at end of file
diff --git a/resources/views/meta/videos.blade.php b/resources/views/meta/videos.blade.php
deleted file mode 100644
index 0aa8221..0000000
--- a/resources/views/meta/videos.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<meta name="ColumnName" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnDescription" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnKeywords" content="{{ config('wsb.name', '') }}">
-<meta name="ColumnType" content="视频列表">
-<meta name="“ContentSource”" content="来源：外事办">