From abd7a3afc91a66576465af26719cb440fbf76c73 Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 11 Aug 2022 19:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Controllers/PageController.php |  3 ++-
 themes/default/layout/master.blade.php         |  4 +++-
 themes/default/pages/detail.blade.php          | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 themes/default/pages/detail.blade.php

diff --git a/beike/Shop/Http/Controllers/PageController.php b/beike/Shop/Http/Controllers/PageController.php
index 12b17e38..1f25761b 100644
--- a/beike/Shop/Http/Controllers/PageController.php
+++ b/beike/Shop/Http/Controllers/PageController.php
@@ -23,6 +23,7 @@ class PageController extends Controller
         $data = [
             'page' => (new PageDetail($page))->jsonSerialize()
         ];
-        dd($data);
+
+        return view('pages/detail', $data);
     }
 }
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index df2fd7ba..ad3ea2cc 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -5,7 +5,9 @@
   <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="csrf-token" content="{{ csrf_token() }}">
-  <title>首页</title>
+  <title>@yield('title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网')</title>
+  <meta name="keywords" content="@yield('keywords', '开源电商,开源代码,开源电商项目,b2b独立站,dtc独立站,跨境电商网')">
+  <meta name="description" content="@yield('description', 'BeikeShop 是一款开源好用的跨境电商建站系统，基于 Laravel 开发。主要面向外贸，和跨境行业。系统提供商品管理、订单管理、会员管理、支付、物流、系统管理等丰富功能')">
   <base href="{{ $shop_base_url }}">
   <link rel="stylesheet" type="text/css" href="{{ asset('/build/beike/shop/default/css/bootstrap.css') }}">
   <script src="{{ asset('vendor/jquery/jquery-3.6.0.min.js') }}"></script>
diff --git a/themes/default/pages/detail.blade.php b/themes/default/pages/detail.blade.php
new file mode 100644
index 00000000..8a9dcbed
--- /dev/null
+++ b/themes/default/pages/detail.blade.php
@@ -0,0 +1,11 @@
+@extends('layout.master')
+@section('body-class', 'page-pages')
+@section('title', $page['title'])
+@section('keywords', $page['meta_keyword'])
+@section('description', $page['meta_description'])
+
+@section('content')
+  <div class="container">
+    {!! $page['content'] !!}
+  </div>
+@endsection