diff --git a/app/Admin/Controllers/Advert/IndexController.php b/app/Admin/Controllers/Advert/IndexController.php index 812a577..e112139 100644 --- a/app/Admin/Controllers/Advert/IndexController.php +++ b/app/Admin/Controllers/Advert/IndexController.php @@ -35,7 +35,7 @@ class IndexController extends AdminController $grid->column('cover', '图片')->image('', 60, 60); $grid->column('category.title', '分类名称'); $grid->column('title', '图片名称'); - $grid->column('url', '地址'); + // $grid->column('url', '地址')->width(80); $grid->column('sort', '排序'); return $grid; diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index 26d035e..62eaf94 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -7,6 +7,7 @@ use App\Models\Category; use Encore\Admin\Controllers\AdminController; use Encore\Admin\Form; use Encore\Admin\Grid; +use Encore\Admin\Show; class IndexController extends AdminController { @@ -76,4 +77,16 @@ class IndexController extends AdminController return $form; } + public function detail($id) + { + $show = new Show(Article::findOrFail($id)); + + $show->field('id', 'ID'); + $show->field('title', '标题'); + $show->field('content', '内容'); + $show->field('created_at'); + + return $show; + } + } diff --git a/app/Http/Controllers/PatentController.php b/app/Http/Controllers/PatentController.php index 884932b..8c5fd8c 100644 --- a/app/Http/Controllers/PatentController.php +++ b/app/Http/Controllers/PatentController.php @@ -1,60 +1,60 @@ -', $patent->id)->where('status', 1)->first(); - - return view('patents.show', compact('patent', 'next')); - } - - //显示文章列表 - public function list(Request $request) - { - $type = $request->type; - $title = $request->title; - $number = $request->number; - $category_id = $request->category_id; - $nickname = $request->nickname; - $publication = $request->publication; - $year = $request->year; - - $patents = Patent::where('status', 1) - ->when($type, function ($q) use ($type) { - $q->where('type', $type); - }) - ->when($title, function ($q) use ($title) { - $q->where('title', 'like', "%{$title}%"); - }) - ->when($number, function ($q) use ($number) { - $q->where('number', $number); - }) - ->when($category_id, function ($q) use ($category_id) { - $q->where('category_id', $category_id); - }) - ->when($nickname, function ($q) use ($nickname) { - $q->where('nickname', 'like', "%{$nickname}%"); - }) - ->when($publication, function ($q) use ($publication) { - $q->where('publication', $publication); - }) - ->when($year, function ($q) use ($year) { - $q->where('year', 'like', "%{$year}%"); - }) - ->latest('sort') - ->latest() - ->paginate(2); - - return view('patents.list', compact('patents')); - } - -} +', $patent->id)->where('status', 1)->first(); + + return view('patents.show', compact('patent', 'next')); + } + + //显示文章列表 + public function list(Request $request) + { + $type = $request->type; + $title = $request->title; + $number = $request->number; + $category_id = $request->category_id; + $nickname = $request->nickname; + $publication = $request->publication; + $year = $request->year; + + $patents = Patent::where('status', 1) + ->when($type, function ($q) use ($type) { + $q->where('type', $type); + }) + ->when($title, function ($q) use ($title) { + $q->where('title', 'like', "%{$title}%"); + }) + ->when($number, function ($q) use ($number) { + $q->where('number', $number); + }) + ->when($category_id, function ($q) use ($category_id) { + $q->where('category_id', $category_id); + }) + ->when($nickname, function ($q) use ($nickname) { + $q->where('nickname', 'like', "%{$nickname}%"); + }) + ->when($publication, function ($q) use ($publication) { + $q->where('publication', $publication); + }) + ->when($year, function ($q) use ($year) { + $q->where('year', 'like', "%{$year}%"); + }) + ->latest('sort') + ->latest() + ->paginate(); + + return view('patents.list', compact('patents')); + } + +} diff --git a/public/assets/index/css/style.css b/public/assets/index/css/style.css index 7d7ff90..4f6f960 100644 --- a/public/assets/index/css/style.css +++ b/public/assets/index/css/style.css @@ -485,6 +485,7 @@ img { .nav-talent-job { color: gray; + font-size: 12px; } .nav-talent-cover { @@ -1238,6 +1239,7 @@ img { display: block; float: left; font-weight: bold; + cursor: pointer; } .org-inst-ul span i, @@ -1257,10 +1259,16 @@ img { overflow: hidden; } -.org-inst-ul li span { +.org-inst-ul li span, +.org-inst-ul li a { float: left; color: gray; margin-right: 20px; + display: inline-block; +} + +.org-inst-ul li a:hover{ + color: #273981; } .org-inst-ul li span:first-child, @@ -1287,6 +1295,7 @@ img { float: left; position: relative; box-sizing: border-box; + cursor: pointer; } .research-award-cover { @@ -1378,6 +1387,7 @@ img { .lw-left-lg { height: 160px; top: calc(50% - 80px); + cursor: pointer; } /* 党建与科学文化 */ @@ -1427,6 +1437,7 @@ img { margin-bottom: 20px; width: calc(12.5% - 20px); background-color: #eee; + cursor: pointer; } .rcdw-cover { @@ -1448,6 +1459,10 @@ img { color: white; } +.rcdw-xxh p{ + font-size: 12px; +} + /* 人才队伍 - 省领军人才梯队 */ .rctd-boeder { border-bottom: 1px solid #eee; @@ -1571,3 +1586,49 @@ img { background-color: #273981; color: white; } + +/* 漂浮的工具栏 */ +.laytool{ + position: fixed; + top: 45vh; + left: calc(50% + 615px); + z-index: 99; +} + +.laytool-ul li{ + position: relative; + margin-bottom: 5px; + width: 40px; + height: 40px; + line-height: 40px; + text-align: center; + background: #4864ae; + font-size: 18px; + transition: background .3s; +} + +.wechat-code{ + position: absolute; + left: -305px; + top: -205px; + width: 300px; + height: 448px; + display: none; +} + +.wechat-code img{ + width: 100%; + vertical-align: top; +} + +.laytool-ul i{ + color: white; +} + +.laytool-ul li:hover{ + background: #273981; +} + +.laytool-ul li:hover .wechat-code{ + display: block; +} diff --git a/public/assets/index/img/jisuanjijuece.png b/public/assets/index/img/jisuanjijuece.png new file mode 100644 index 0000000..2188252 Binary files /dev/null and b/public/assets/index/img/jisuanjijuece.png differ diff --git a/public/assets/index/img/kexueyujishu.png b/public/assets/index/img/kexueyujishu.png new file mode 100644 index 0000000..05cc653 Binary files /dev/null and b/public/assets/index/img/kexueyujishu.png differ diff --git a/public/assets/index/img/z19_ewm3.jpg b/public/assets/index/img/z19_ewm3.jpg new file mode 100644 index 0000000..9b0fc11 Binary files /dev/null and b/public/assets/index/img/z19_ewm3.jpg differ diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f0d40f7..946cf2b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -42,6 +42,12 @@ + +
+ 漂浮 +
+ + @include('layouts.header') @section('content')