From 8ffea6593697be3db59598a35c8c266e7e53fcb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Wed, 3 Feb 2021 13:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/articles/search.blade.php |  76 ++++++++--------
 resources/views/category/cgzh.blade.php   |   8 +-
 resources/views/layouts/app.blade.php     |   3 +-
 resources/views/patents/paper.blade.php   | 100 ++++++++++-----------
 resources/views/patents/patent.blade.php  | 104 +++++++++++-----------
 5 files changed, 144 insertions(+), 147 deletions(-)

diff --git a/resources/views/articles/search.blade.php b/resources/views/articles/search.blade.php
index 2971a28..74e3a91 100644
--- a/resources/views/articles/search.blade.php
+++ b/resources/views/articles/search.blade.php
@@ -1,38 +1,38 @@
-@extends('layouts.app')
-
-@section('title', '搜索结果')
-
-
-@section('content')
-    <!-- content -->
-    <div class="container mian">
-        <div class="mian-content-header">
-            <a href="#">首页</a>
-            <i class="fa fa-caret-right"></i>
-            <a href="#">搜索结果</a>
-        </div>
-        <!-- 文章列表 -->
-        <ul class="results-news-ul">
-
-            @if ($articles->isNotEmpty())
-                @foreach ($articles as $article)
-                    <li>
-                        <a class="nowrap" href="{{ $article->link }}">
-                            <i class="fa fa-angle-double-right"></i>
-                            {{ $article->title }}
-                            <span>{{ $article->created_at->format('Y-m-d') }}</span>
-                        </a>
-                    </li>
-                @endforeach
-            @endif
-
-        </ul>
-        <!-- 分页 -->
-        <div class="pages">
-            @if ($articles->isNotEmpty())
-                {{ $articles->links('layouts.pagination') }}
-            @endif
-        </div>
-    </div>
-    <!-- end content -->
-@endsection
+@extends('layouts.app')
+
+@section('title', '搜索结果')
+
+
+@section('content')
+    <!-- content -->
+    <div class="container mian">
+        <div class="mian-content-header">
+            <a href="#">首页</a>
+            <i class="fa fa-caret-right"></i>
+            <a href="#">搜索结果</a>
+        </div>
+        <!-- 文章列表 -->
+        <ul class="results-news-ul">
+
+            @if ($articles->isNotEmpty())
+                @foreach ($articles as $article)
+                    <li>
+                        <a class="nowrap" href="{{ $article->link }}">
+                            <i class="fa fa-angle-double-right"></i>
+                            {{ $article->title }}
+                            <span>{{ $article->created_at->format('Y-m-d') }}</span>
+                        </a>
+                    </li>
+                @endforeach
+            @endif
+
+        </ul>
+        <!-- 分页 -->
+        <div class="pages">
+            @if ($articles->isNotEmpty())
+                {{ $articles->links('layouts.pagination') }}
+            @endif
+        </div>
+    </div>
+    <!-- end content -->
+@endsection
diff --git a/resources/views/category/cgzh.blade.php b/resources/views/category/cgzh.blade.php
index f6ba003..c5d7c14 100644
--- a/resources/views/category/cgzh.blade.php
+++ b/resources/views/category/cgzh.blade.php
@@ -7,7 +7,7 @@
     <div class="container mian">
         <!-- content-nav -->
         <nav class="mian-nav">
-            @include('layouts.left',$parent)
+            @include('category.left',$parent)
         </nav>
         <!-- content-content -->
         <div class="mian-content">
@@ -25,8 +25,7 @@
                 @if(getArticlesBYCate(20,8)->isNotEmpty())
                     @foreach (getArticlesBYCate(20,8) as $article)
                         @if ($loop->first)
-                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});"
-                               href="{{ $article->link }}">
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
                                 <span>{{ $article->title }}</span>
                             </a>
                         @endif
@@ -55,8 +54,7 @@
                 @if(getArticlesBYCate(21,8)->isNotEmpty())
                     @foreach (getArticlesBYCate(21,8) as $article)
                         @if ($loop->first)
-                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});"
-                               href="{{ $article->link }}">
+                            <a class="results-news-cover" style="background-image: url({{ $article->cover_path }});" href="{{ $article->link }}">
                                 <span>{{ $article->title }}</span>
                             </a>
                         @endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index caf6b38..1288d6d 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -37,8 +37,7 @@
     <div class="container header-content">
         <img class="header-logo" src="{{ asset('assets/index/img/logo.png') }}" alt="黑龙江省科学院智能制造研究所">
         <div class="header-text">
-            <p>卓越创新，智慧创造。</p>
-            <p class="header-text-sign">——智能制造所办所训</p>
+            卓越创新&nbsp;&nbsp;智慧创造
         </div>
     </div>
 </header>
diff --git a/resources/views/patents/paper.blade.php b/resources/views/patents/paper.blade.php
index 0b63915..a83eb20 100644
--- a/resources/views/patents/paper.blade.php
+++ b/resources/views/patents/paper.blade.php
@@ -1,50 +1,50 @@
-<!-- 论文搜索 -->
-<form class="paper-form" action="{{ url()->current()}}">
-    <label class="paper-form-title">
-        论文搜索
-    </label>
-    <ul class="paper-form-ul">
-        <li class="paper-form-inputs">
-            <label>论文题目</label>
-            <input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
-        </li>
-        <li class="paper-form-inputs">
-            <label>论文作者</label>
-            <input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
-        </li>
-        <li class="paper-form-inputs">
-            <label>刊物名称</label>
-            <input name="publication" value="{{ request()->publication }}" placeholder="输入论文题目"/>
-        </li>
-        <li class="paper-form-inputs">
-            <label>发表年度</label>
-            <select name="year">
-                <option value="">选择年度</option>
-                @for ($i = 2020; $i > 2000; $i--)
-                    <option value="{{ $i }}" @if (request()->year==$i) selected @endif>{{ $i }}年度</option>
-                @endfor
-            </select>
-        </li>
-    </ul>
-    <input type="hidden" name="type" value="{{ request()->type }}">
-
-    <button class="paper-form-btn" type="submit">搜索</button>
-</form>
-<!-- 论文表格 -->
-<table class="paper-table" border="1" bordercolor="#d1d1d1">
-    <tr>
-        <th width="300">论文题目</th>
-        <th width="300">刊物名称</th>
-        <th width="400">刊物作者</th>
-        <th width="200">发表年度</th>
-    </tr>
-    @foreach ($patents as $patent)
-        <tr data-herf="{{ $patent->link }}">
-            <td>{{ $patent->title }}</td>
-            <td>{{ $patent->publication??'---' }}</td>
-            <td>{{ $patent->nickname??'---' }}</td>
-            <td>{{ $patent->created_at->format('Y-m-d') }}</td>
-        </tr>
-    @endforeach
-
-</table>
+<!-- 论文搜索 -->
+<form class="paper-form" action="{{ url()->current()}}">
+    <label class="paper-form-title">
+        论文搜索
+    </label>
+    <ul class="paper-form-ul">
+        <li class="paper-form-inputs">
+            <label>论文题目</label>
+            <input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
+        </li>
+        <li class="paper-form-inputs">
+            <label>论文作者</label>
+            <input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
+        </li>
+        <li class="paper-form-inputs">
+            <label>刊物名称</label>
+            <input name="publication" value="{{ request()->publication }}" placeholder="输入论文题目"/>
+        </li>
+        <li class="paper-form-inputs">
+            <label>发表年度</label>
+            <select name="year">
+                <option value="">选择年度</option>
+                @for ($i = 2020; $i > 2000; $i--)
+                    <option value="{{ $i }}" @if (request()->year==$i) selected @endif>{{ $i }}年度</option>
+                @endfor
+            </select>
+        </li>
+    </ul>
+    <input type="hidden" name="type" value="{{ request()->type }}">
+
+    <button class="paper-form-btn" type="submit">搜索</button>
+</form>
+<!-- 论文表格 -->
+<table class="paper-table" border="1" bordercolor="#d1d1d1">
+    <tr>
+        <th width="300">论文题目</th>
+        <th width="300">刊物名称</th>
+        <th width="400">刊物作者</th>
+        <th width="200">发表年度</th>
+    </tr>
+    @foreach ($patents as $patent)
+        <tr data-herf="{{ $patent->link }}">
+            <td>{{ $patent->title }}</td>
+            <td>{{ $patent->publication??'---' }}</td>
+            <td>{{ $patent->nickname??'---' }}</td>
+            <td>{{ $patent->created_at->format('Y-m-d') }}</td>
+        </tr>
+    @endforeach
+
+</table>
diff --git a/resources/views/patents/patent.blade.php b/resources/views/patents/patent.blade.php
index 75694f4..67eb652 100644
--- a/resources/views/patents/patent.blade.php
+++ b/resources/views/patents/patent.blade.php
@@ -1,53 +1,53 @@
-<form class="paper-form" action="{{ url()->current()}}">
-    <label class="paper-form-title">
-        专利搜索
-    </label>
-    <ul class="paper-form-ul">
-        <li class="paper-form-inputs">
-            <label>专利题目</label>
-            <input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
-        </li>
-        <li class="paper-form-inputs">
-            <label>专利类别</label>
-            <select name="category_id">
-                @if (getCateChild(16)->isNotEmpty())
-                    <option value="">专利类别</option>
-                    @foreach (getCateChild(16) as $child)
-                        <option value="{{ $child->id }}" @if($child->id==request()->category_id) selected @endif>{{ $child->title }}</option>
-                    @endforeach
-                @endif
-            </select>
-        </li>
-        <li class="paper-form-inputs">
-            <label>专利号</label>
-            <input name="number" value="{{ request()->number }}" placeholder="输入论文题目"/>
-        </li>
-        <li class="paper-form-inputs">
-            <label>第一发明人</label>
-            <input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
-        </li>
-    </ul>
-    <input type="hidden" name="type" value="{{ request()->type }}">
-    <button class="paper-form-btn" type="submit">搜索</button>
-</form>
-
-<!-- 论文表格 -->
-<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
-    <tr>
-        <th width="300">专利名称</th>
-        <th width="200">专利号</th>
-        <th width="200">专利类别</th>
-        <th width="200">申请日期</th>
-        <th width="300">第一发明人</th>
-    </tr>
-    @foreach ($patents as $patent)
-        <tr data-href="{{ $patent->link }}">
-            <td>{{ $patent->title }}</td>
-            <td>{{ $patent->number??'---' }}</td>
-            <td>{{ $patent->category->title??'---' }}</td>
-            <td>{{ $patent->application??'---' }}</td>
-            <td>{{ $patent->nickname }}</td>
-        </tr>
-    @endforeach
-
+<form class="paper-form" action="{{ url()->current()}}">
+    <label class="paper-form-title">
+        专利搜索
+    </label>
+    <ul class="paper-form-ul">
+        <li class="paper-form-inputs">
+            <label>专利题目</label>
+            <input name="title" value="{{ request()->title }}" placeholder="输入论文题目"/>
+        </li>
+        <li class="paper-form-inputs">
+            <label>专利类别</label>
+            <select name="category_id">
+                @if (getCateChild(16)->isNotEmpty())
+                    <option value="">专利类别</option>
+                    @foreach (getCateChild(16) as $child)
+                        <option value="{{ $child->id }}" @if($child->id==request()->category_id) selected @endif>{{ $child->title }}</option>
+                    @endforeach
+                @endif
+            </select>
+        </li>
+        <li class="paper-form-inputs">
+            <label>专利号</label>
+            <input name="number" value="{{ request()->number }}" placeholder="输入论文题目"/>
+        </li>
+        <li class="paper-form-inputs">
+            <label>第一发明人</label>
+            <input name="nickname" value="{{ request()->nickname }}" placeholder="输入论文题目"/>
+        </li>
+    </ul>
+    <input type="hidden" name="type" value="{{ request()->type }}">
+    <button class="paper-form-btn" type="submit">搜索</button>
+</form>
+
+<!-- 论文表格 -->
+<table class="paper-table patent-table" border="1" bordercolor="#d1d1d1">
+    <tr>
+        <th width="300">专利名称</th>
+        <th width="200">专利号</th>
+        <th width="200">专利类别</th>
+        <th width="200">申请日期</th>
+        <th width="300">第一发明人</th>
+    </tr>
+    @foreach ($patents as $patent)
+        <tr data-href="{{ $patent->link }}">
+            <td>{{ $patent->title }}</td>
+            <td>{{ $patent->number??'---' }}</td>
+            <td>{{ $patent->category->title??'---' }}</td>
+            <td>{{ $patent->application??'---' }}</td>
+            <td>{{ $patent->nickname }}</td>
+        </tr>
+    @endforeach
+
 </table>
\ No newline at end of file