From 75d6b3ed3438f5e529a1924cc8539c078f3abc2a Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Fri, 12 Aug 2022 11:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/form/textarea.blade.php      |  2 +-
 .../beike/admin/views/pages/setting.blade.php     | 15 +++++++++++++--
 themes/default/layout/master.blade.php            |  6 +++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/resources/beike/admin/views/components/form/textarea.blade.php b/resources/beike/admin/views/components/form/textarea.blade.php
index 9cd2cc22..b6d87edd 100644
--- a/resources/beike/admin/views/components/form/textarea.blade.php
+++ b/resources/beike/admin/views/components/form/textarea.blade.php
@@ -6,7 +6,7 @@
 
 <x-admin::form.row :title="$title" :required="$required">
   <div class="{{ isset($html) && $html ? 'w-max-1000' : '' }}">
-    <textarea type="text" name="{{ $name }}" class="{{ isset($html) && $html ? 'tinymce' : 'form-control wp-400' }}" placeholder="{{ $title }}">{{ $value }}</textarea>
+    <textarea rows="4" type="text" name="{{ $name }}" class="{{ isset($html) && $html ? 'tinymce' : 'form-control wp-400' }}" placeholder="{{ $title }}">{{ $value }}</textarea>
   </div>
   {{ $slot }}
 </x-admin::form.row>
diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php
index d96cbb93..777e33b5 100644
--- a/resources/beike/admin/views/pages/setting.blade.php
+++ b/resources/beike/admin/views/pages/setting.blade.php
@@ -14,13 +14,24 @@
           <li class="nav-item" role="presentation">
             <a class="nav-link active" data-bs-toggle="tab" href="#tab-general">基础设置</a>
           </li>
+          <li class="nav-item" role="presentation">
+            <a class="nav-link" data-bs-toggle="tab" href="#tab-store">商店设置</a>
+          </li>
           <li class="nav-item" role="presentation">
             <a class="nav-link" data-bs-toggle="tab" href="#tab-image">图片设置</a>
           </li>
         </ul>
 
-        <div class="tab-content" id="myTabContent">
+        <div class="tab-content">
           <div class="tab-pane fade show active" id="tab-general">
+            <x-admin-form-input name="meta_title" title="Meta 标题" value="{{ old('meta_title', system_setting('base.meta_title', '')) }}" />
+            <x-admin-form-textarea name="meta_description" title="Meta 描述" value="{{ old('meta_description', system_setting('base.meta_description', '')) }}" />
+            <x-admin-form-textarea name="meta_keyword" title="Meta 关键词" value="{{ old('meta_keyword', system_setting('base.meta_keyword', '')) }}" />
+            <x-admin-form-input name="telephone" title="联系电话" value="{{ old('telephone', system_setting('base.telephone', '')) }}" />
+            <x-admin-form-input name="email" title="E-Mail" value="{{ old('email', system_setting('base.email', '')) }}" />
+          </div>
+
+          <div class="tab-pane fade" id="tab-store">
             <x-admin::form.row title="默认地址">
               <div class="d-flex">
                 <div>
@@ -66,12 +77,12 @@
               <div class="help-text font-size-12 lh-base">按什么地址计算税费</div>
             </x-admin-form-select>
           </div>
+
           <div class="tab-pane fade" id="tab-image">
             <x-admin-form-image name="logo" title="网站 Logo" :value="old('logo', system_setting('base.logo', ''))">
               <div class="help-text font-size-12 lh-base">网站前台显示 380*100</div>
             </x-admin-form-image>
 
-
             <x-admin-form-image name="favicon" title="favicon" :value="old('web_icon', system_setting('base.web_icon', ''))">
               <div class="help-text font-size-12 lh-base">显示在浏览器选项卡上的小图标，必须为PNG格式大小为：32*32</div>
             </x-admin-form-image>
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php
index a5bb0263..c013ab49 100644
--- a/themes/default/layout/master.blade.php
+++ b/themes/default/layout/master.blade.php
@@ -5,9 +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>@yield('title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网')</title>
-  <meta name="keywords" content="@yield('keywords', '开源电商,开源代码,开源电商项目,b2b独立站,dtc独立站,跨境电商网')">
-  <meta name="description" content="@yield('description', 'BeikeShop 是一款开源好用的跨境电商建站系统，基于 Laravel 开发。主要面向外贸，和跨境行业。系统提供商品管理、订单管理、会员管理、支付、物流、系统管理等丰富功能')">
+  <title>@yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网'))</title>
+  <meta name="keywords" content="@yield('keywords', system_setting('base.meta_keyword'))">
+  <meta name="description" content="@yield('description', system_setting('base.meta_description'))">
   <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>