diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php index 6841bda6..cbd46bf4 100644 --- a/database/seeders/SettingsSeeder.php +++ b/database/seeders/SettingsSeeder.php @@ -123,7 +123,7 @@ class SettingsSeeder extends Seeder */ private function getFooterSetting(): bool|string { - $json = '{"services":{"enable":true,"items":[{"image":"catalog\/demo\/services-icon\/4.png","title":{"en":"Material world","zh_cn":"\u7269\u884c\u5929\u4e0b"},"sub_title":{"en":"Multi - warehouse fast delivery","zh_cn":"\u591a\u4ed3\u76f4\u53d1 \u6781\u901f\u914d\u9001\u591a\u4ed3\u76f4\u53d1 \u6781\u901f\u914d\u9001"},"show":false},{"image":"catalog\/demo\/services-icon\/3.png","title":{"en":"Return all","zh_cn":"\u9000\u6362\u65e0\u5fe7"},"sub_title":{"en":"Rest assured shopping return worry","zh_cn":"\u653e\u5fc3\u8d2d\u7269 \u9000\u8fd8\u65e0\u5fe7\u653e\u5fc3\u8d2d\u7269 \u9000\u8fd8\u65e0\u5fe7"},"show":false},{"image":"catalog\/demo\/services-icon\/1.png","title":{"en":"Delicate service","zh_cn":"\u7cbe\u81f4\u670d\u52a1"},"sub_title":{"en":"Exquisite service and after-sales guarantee","zh_cn":"\u7cbe\u81f4\u670d\u52a1 \u552e\u540e\u4fdd\u969c\u7cbe\u81f4\u670d\u52a1 \u552e\u540e\u4fdd\u969c"},"show":false},{"image":"catalog\/demo\/services-icon\/2.png","title":{"en":"With reduced activity","zh_cn":"\u6ee1\u51cf\u6d3b\u52a8"},"sub_title":{"en":"If 500 yuan is exceeded, a reduction of 90 yuan will be given","zh_cn":"\u6ee1500\u5143\u7acb\u51cf90\uff0c\u65b0\u7528\u6237\u7acb\u51cf200"},"show":true}]},"content":{"intro":{"logo":"catalog\/logo.png","text":{"en":"

Chengdu Guangda Network Technology Co., Ltd. is a high-tech enterprise mainly engaged in Internet development. The company was established in August 2014.<\/p>","zh_cn":"

\u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8<\/strong><\/p>\n

\u662f\u4e00\u5bb6\u4e13\u4e1a\u4e92\u8054\u7f51\u5f00\u53d1\u7684\u9ad8\u79d1\u6280\u4f01\u4e1a\uff0c\u516c\u53f8\u6210\u7acb\u4e8e2014\u5e748\u6708\u3002<\/p>\n

\u516c\u53f8\u4ee5\u4e3a\u5ba2\u6237\u521b\u9020\u4ef7\u503c\u4e3a\u6838\u5fc3\u4ef7\u503c\u89c2\uff0c\u5e2e\u52a9\u4e2d\u5c0f\u4f01\u4e1a\u5229\u7528\u4e92\u8054\u7f51\u5de5\u5177\u63d0\u5347\u4ea7\u54c1\u9500\u552e\u3002<\/p>"},"social_network":[]},"link1":{"title":{"en":"About us","zh_cn":"\u5173\u4e8e\u6211\u4eec"},"links":[{"link":"","type":"page","value":21,"text":{"en":"about us","zh_cn":"\u5173\u4e8e\u6211\u4eec"}},{"type":"page","value":18,"text":[],"link":""},{"type":"page","value":12,"text":[],"link":""},{"type":"static","value":"account.order.index","text":{"en":"","zh_cn":""},"link":""}]},"link2":{"title":{"en":"Account","zh_cn":"\u4f1a\u5458\u4e2d\u5fc3"},"links":[{"type":"static","value":"account.index","text":[],"link":""},{"type":"static","value":"account.order.index","text":[],"link":""},{"type":"static","value":"account.wishlist.index","text":[],"link":""},{"type":"static","value":"brands.index","text":{"en":"","zh_cn":""},"link":""}]},"link3":{"title":{"en":"Other","zh_cn":"\u5176\u4ed6"},"links":[{"type":"static","value":"brands.index","text":[],"link":""},{"type":"static","value":"account.index","text":{"en":"","zh_cn":""},"link":""},{"type":"page","value":20,"text":{"en":"","zh_cn":""},"link":""},{"type":"page","value":21,"text":{"en":"","zh_cn":""},"link":""}]},"contact":{"telephone":"028-87966209","address":{"en":"G8 Tianfu Software Park Chengdu China, Guangda Network Technology Co., Ltd.","zh_cn":"\u6210\u90fd\u5e02\u9ad8\u65b0\u533a\u76ca\u5dde\u5927\u9053\u4e2d\u6bb51858\u53f7\u5929\u5e9c\u8f6f\u4ef6\u56edG8 \u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8"},"email":"marketing@guangda.work"}},"bottom":{"copyright":{"en":"

Technical Support beikeshop.com<\/a>  - Chengdu Guangda Network Technology © 2022<\/div>","zh_cn":"
\u6280\u672f\u652f\u6301 beikeshop.com<\/a>  - \u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280 © 2022<\/div>"},"image":"catalog\/demo\/banner\/pay_icons.png"}}'; + $json = '{"services":{"enable":true,"items":[{"image":"catalog\/demo\/services-icon\/4.png","title":{"en":"Material world","zh_cn":"\u7269\u884c\u5929\u4e0b"},"sub_title":{"en":"Multi - warehouse fast delivery","zh_cn":"\u591a\u4ed3\u76f4\u53d1 \u6781\u901f\u914d\u9001\u591a\u4ed3\u76f4\u53d1 \u6781\u901f\u914d\u9001"},"show":false},{"image":"catalog\/demo\/services-icon\/3.png","title":{"en":"Return all","zh_cn":"\u9000\u6362\u65e0\u5fe7"},"sub_title":{"en":"Rest assured shopping return worry","zh_cn":"\u653e\u5fc3\u8d2d\u7269 \u9000\u8fd8\u65e0\u5fe7\u653e\u5fc3\u8d2d\u7269 \u9000\u8fd8\u65e0\u5fe7"},"show":false},{"image":"catalog\/demo\/services-icon\/1.png","title":{"en":"Delicate service","zh_cn":"\u7cbe\u81f4\u670d\u52a1"},"sub_title":{"en":"Exquisite service and after-sales guarantee","zh_cn":"\u7cbe\u81f4\u670d\u52a1 \u552e\u540e\u4fdd\u969c\u7cbe\u81f4\u670d\u52a1 \u552e\u540e\u4fdd\u969c"},"show":false},{"image":"catalog\/demo\/services-icon\/2.png","title":{"en":"With reduced activity","zh_cn":"\u6ee1\u51cf\u6d3b\u52a8"},"sub_title":{"en":"If 500 yuan is exceeded, a reduction of 90 yuan will be given","zh_cn":"\u6ee1500\u5143\u7acb\u51cf90\uff0c\u65b0\u7528\u6237\u7acb\u51cf200"},"show":true}]},"content":{"intro":{"logo":"catalog\/logo.png","text":{"en":"

Chengdu Guangda Network Technology Co., Ltd. is a high-tech enterprise mainly engaged in Internet development. The company was established in August 2014.<\/p>","zh_cn":"

\u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8<\/strong><\/p>\n

\u662f\u4e00\u5bb6\u4e13\u4e1a\u4e92\u8054\u7f51\u5f00\u53d1\u7684\u9ad8\u79d1\u6280\u4f01\u4e1a\uff0c\u516c\u53f8\u6210\u7acb\u4e8e2014\u5e748\u6708\u3002<\/p>\n

\u516c\u53f8\u4ee5\u4e3a\u5ba2\u6237\u521b\u9020\u4ef7\u503c\u4e3a\u6838\u5fc3\u4ef7\u503c\u89c2\uff0c\u5e2e\u52a9\u4e2d\u5c0f\u4f01\u4e1a\u5229\u7528\u4e92\u8054\u7f51\u5de5\u5177\u63d0\u5347\u4ea7\u54c1\u9500\u552e\u3002<\/p>"},"social_network":[]},"link1":{"title":{"en":"About us","zh_cn":"\u5173\u4e8e\u6211\u4eec"},"links":[{"link":"","type":"page","value":21,"text":{"en":"about us","zh_cn":"\u5173\u4e8e\u6211\u4eec"}},{"type":"page","value":18,"text":[],"link":""},{"type":"page","value":12,"text":[],"link":""},{"type":"static","value":"account.order.index","text":{"en":"","zh_cn":""},"link":""}]},"link2":{"title":{"en":"Account","zh_cn":"\u4f1a\u5458\u4e2d\u5fc3"},"links":[{"type":"static","value":"account.index","text":[],"link":""},{"type":"static","value":"account.order.index","text":[],"link":""},{"type":"static","value":"account.wishlist.index","text":[],"link":""},{"type":"static","value":"brands.index","text":{"en":"","zh_cn":""},"link":""}]},"link3":{"title":{"en":"Other","zh_cn":"\u5176\u4ed6"},"links":[{"type":"static","value":"brands.index","text":[],"link":""},{"type":"static","value":"account.index","text":{"en":"","zh_cn":""},"link":""},{"type":"page","value":20,"text":{"en":"","zh_cn":""},"link":""},{"type":"page","value":21,"text":{"en":"","zh_cn":""},"link":""}]},"contact":{"telephone":"028-87966209","address":{"en":"G8 Tianfu Software Park Chengdu China, Guangda Network Technology Co., Ltd.","zh_cn":"\u6210\u90fd\u5e02\u9ad8\u65b0\u533a\u76ca\u5dde\u5927\u9053\u4e2d\u6bb51858\u53f7\u5929\u5e9c\u8f6f\u4ef6\u56edG8 \u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8"},"email":"marketing@guangda.work"}},"bottom":{"copyright":{"en":"

  - Chengdu Guangda Network Technology © 2023<\/div>","zh_cn":"
  - \u6210\u90fd\u5149\u5927\u7f51\u7edc\u79d1\u6280 © 2023<\/div>"},"image":"catalog\/demo\/banner\/pay_icons.png"}}'; $setting = json_decode($json, true); if (empty($setting)) { throw new \Exception("无效的底部配置数据"); diff --git a/plugins/Social/Bootstrap.php b/plugins/Social/Bootstrap.php index a4e2c214..7fb8e5f0 100644 --- a/plugins/Social/Bootstrap.php +++ b/plugins/Social/Bootstrap.php @@ -16,6 +16,18 @@ class Bootstrap public function boot() { $this->addSocialData(); + + add_hook_blade('admin.plugin.form', function ($callback, $output, $data) { + $code = $data['plugin']->code; + + if ($code == 'social') { + $view = view('Social::admin.config_form', $data)->render(); + + return $view; + } + + return $output; + }); } /** diff --git a/plugins/Social/Views/admin/config.blade.php b/plugins/Social/Views/admin/config.blade.php deleted file mode 100644 index 6e564352..00000000 --- a/plugins/Social/Views/admin/config.blade.php +++ /dev/null @@ -1,192 +0,0 @@ -@extends('admin::layouts.master') - -@section('title', __('admin/plugin.plugins_show')) - -@section('page-title-right') - -@endsection - -@section('content') -
-
-
-
{{ $plugin->name }}
- -
- - @if (session('success')) - - @endif - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ __('Social::setting.entry_provider') }}{{ __('Social::setting.entry_status') }}{{ __('Social::setting.entry_key') }}{{ __('Social::setting.entry_secret') }}{{ __('Social::setting.entry_callback') }}{{ __('Social::setting.entry_sort_order') }}
- - - - - - - - - - - - - - - - - - - - -
- - -
- - 		- - - - - -
- -
-
- -
-
-
{{ __('Social::setting.text_help_msg') }}
-
    -
  1. {{ __('Social::setting.text_omni_explain') }}
    2. -
  2. {{ __('Social::setting.text_omni_explain_2') }}
    3. -
  3. {{ __('Social::setting.text_facebook_title') }} - Facebook -
    4. -
  4. {{ __('Social::setting.text_twitter_title') }} - Twitter -
    5. -
  5. {{ __('Social::setting.text_google_title') }} - Google -
    6. - ....... -
-
-
- - - - - -@endsection diff --git a/plugins/Social/Views/admin/config_form.blade.php b/plugins/Social/Views/admin/config_form.blade.php new file mode 100644 index 00000000..456053ea --- /dev/null +++ b/plugins/Social/Views/admin/config_form.blade.php @@ -0,0 +1,187 @@ +@section('page-title-right') + +@endsection + +
+ {{--
+
{{ $plugin->name }}
+ +
--}} + {{-- --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ __('Social::setting.entry_provider') }}{{ __('Social::setting.entry_status') }}{{ __('Social::setting.entry_key') }}{{ __('Social::setting.entry_secret') }}{{ __('Social::setting.entry_callback') }}{{ __('Social::setting.entry_sort_order') }}
+ + + + + + + + + + + + + + + + + + + + +
+ + +
+ + 		+ + + + + +
+
+
{{ __('common.no_data') }}
+ +
+
+ +
+ +
{{ __('Social::setting.text_help_msg') }}
+
    +
  1. {{ __('Social::setting.text_omni_explain') }}
    2. +
  2. {{ __('Social::setting.text_omni_explain_2') }}
    3. +
  3. {{ __('Social::setting.text_facebook_title') }} + Facebook +
    4. +
  4. {{ __('Social::setting.text_twitter_title') }} + Twitter +
    5. +
  5. {{ __('Social::setting.text_google_title') }} + Google +
    6. + ....... +
+ + + + + diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php index 145d9bd0..1c38fc2a 100644 --- a/resources/beike/admin/views/pages/plugins/form.blade.php +++ b/resources/beike/admin/views/pages/plugins/form.blade.php @@ -3,82 +3,87 @@ @section('title', __('admin/plugin.plugins_show')) @section('content') -
+
{{ $plugin->getLocaleName() }}
@if (session('success')) @endif -
- @csrf - {{ method_field('put') }} - @foreach ($plugin->getColumns() as $column) - @if ($column['type'] == 'string') - - @endif + @hookwrapper('admin.plugin.form') + + @csrf + {{ method_field('put') }} - @if ($column['type'] == 'select') - getColumns() as $column) + @if ($column['type'] == 'string') + + @endif + + @if ($column['type'] == 'select') + + @if (isset($column['description'])) +
{{ $column['description'] }}
+ @endif + + @endif + + @if ($column['type'] == 'bool') + + @if (isset($column['description'])) +
{{ $column['description'] }}
+ @endif + + @endif + + @if ($column['type'] == 'textarea') + + @if (isset($column['description'])) +
{{ $column['description'] }}
+ @endif + + @endif + + @if ($column['type'] == 'rich-text') + - @if (isset($column['description'])) -
{{ $column['description'] }}
- @endif - - @endif - - @if ($column['type'] == 'bool') - - @if (isset($column['description'])) -
{{ $column['description'] }}
- @endif - - @endif - - @if ($column['type'] == 'textarea') - + :multiple="$column['multiple']" + > @if (isset($column['description']))
{{ $column['description'] }}
@endif - + @endif - @if ($column['type'] == 'rich-text') - - @if (isset($column['description'])) -
{{ $column['description'] }}
- @endif - - @endif + @endforeach - @endforeach - - - - - + + + + + @endhookwrapper
+ + @endsection diff --git a/themes/default/layout/footer.blade.php b/themes/default/layout/footer.blade.php index 785d04c8..180e68e8 100644 --- a/themes/default/layout/footer.blade.php +++ b/themes/default/layout/footer.blade.php @@ -75,7 +75,6 @@
@endhookwrapper @hook('footer.contact.after') -
@@ -85,7 +84,7 @@
- {!! $footer_content['bottom']['copyright'][$locale] ?? '' !!} +
Powered By  BeikeShop {!! $footer_content['bottom']['copyright'][$locale] ?? '' !!}
@if (isset($footer_content['bottom']['image']) && $footer_content['bottom']['image'])
diff --git a/themes/default/layout/master.blade.php b/themes/default/layout/master.blade.php index 4d189402..3eb90d3b 100644 --- a/themes/default/layout/master.blade.php +++ b/themes/default/layout/master.blade.php @@ -5,7 +5,7 @@ - @yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网')) + @yield('title', system_setting('base.meta_title', 'BeikeShop开源好用的跨境电商系统 - BeikeShop官网') . ' Powered By BeikeShop')