Skip to content

Commit 1a775f3

Browse files
committed
feat: VisitStatistic added
1 parent 973e79b commit 1a775f3

File tree

47 files changed

+568
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+568
-62
lines changed

config/module.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,8 @@
3131
'Banner' => [
3232
'enable' => true,
3333
],
34+
'VisitStatistic' => [
35+
'enable' => true,
36+
],
3437
],
3538
];

module/Banner/View/pc/public/banner.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{!! \ModStart\ModStart::css('asset/vendor/swiper/swiper.css') !!}
2020
{!! \ModStart\ModStart::js('asset/vendor/swiper/swiper.js') !!}
2121
{!! \ModStart\ModStart::css('vendor/Banner/style/banner.css') !!}
22-
<div class="ub-banner ratio-{{$bannerRatio}} {{$mobileBannerRatio}}" id="{{$bannerId}}">
22+
<div class="ub-banner margin-bottom ratio-{{$bannerRatio}} {{$mobileBannerRatio}}" id="{{$bannerId}}">
2323
<div class="swiper-container">
2424
<div class="swiper-wrapper">
2525
@if(empty($banners))

module/Blog/View/pc/blog/message.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
博主回复
6363
</div>
6464
<div class="ub-html">
65-
{!! $record['content'] !!}
65+
{!! $record['reply'] !!}
6666
</div>
6767
</div>
6868
</div>

module/ModuleStore/Admin/Controller/ModuleStoreController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public function uninstall()
140140
$isLocal = $dataInput->getBoolean('isLocal');
141141
BizException::throwsIfEmpty('module为空', $module);
142142
BizException::throwsIfEmpty('version为空', $version);
143-
BizException::throwsIf('系统模块不能动态配置', ModuleManager::isSystemModule($module));
143+
BizException::throwsIf('系统模块不能动态设置', ModuleManager::isSystemModule($module));
144144
$this->moduleOperateCheck($module);
145145
if ($isLocal) {
146146
switch ($step) {
@@ -263,7 +263,7 @@ public function install()
263263
$isLocal = $dataInput->getBoolean('isLocal');
264264
BizException::throwsIfEmpty('module为空', $module);
265265
BizException::throwsIfEmpty('version为空', $version);
266-
BizException::throwsIf('系统模块不能动态配置', ModuleManager::isSystemModule($module));
266+
BizException::throwsIf('系统模块不能动态设置', ModuleManager::isSystemModule($module));
267267
$this->moduleOperateCheck($module);
268268

269269
if ($isLocal) {

module/Nav/Admin/Controller/NavController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ protected function crud(AdminCRUDBuilder $builder)
8484
->canBatchDelete(true)
8585
->asTree('id', 'pid', 'sort', 'name')
8686
->treeMaxLevel(2)
87-
->title('导航');
87+
->title('导航设置');
8888
}
8989
}

module/Nav/Core/ModuleServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function boot(Dispatcher $events)
2323
'sort' => 200,
2424
'children' => [
2525
[
26-
'title' => '导航配置',
26+
'title' => '导航设置',
2727
'url' => '\Module\Nav\Admin\Controller\NavController@index',
2828
],
2929
]

module/Site/Admin/Controller/ConfigController.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ public function setting(AdminConfigBuilder $builder)
3030
$builder->text('siteBeian', 'ICP备案编号');
3131
$builder->text('siteBeianGonganText', '公安备案文字');
3232
$builder->text('siteBeianGonganLink', '公安备案链接');
33+
$builder->textarea('Site_CopyrightOthers', '其他备案信息')->help('支持HTML');
34+
35+
$builder->layoutSeparator('联系信息');
36+
$builder->text('Site_ContactEmail', '邮箱');
37+
$builder->text('Site_ContactPhone', '电话');
38+
$builder->text('Site_ContactAddress', '地址');
39+
$builder->image('Site_ContactQrcode', '联系二维码')->help('可传带二维码的公众号/微信/QQ等,方便用户扫码联系');
3340

3441
$builder->formClass('wide');
3542
return $builder->perform();

module/Site/Core/ModuleServiceProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public function boot(Dispatcher $events)
1919
'children' => [
2020
[
2121
'title' => '基本设置',
22+
'sort' => 1,
2223
'url' => '\Module\Site\Admin\Controller\ConfigController@setting',
2324
],
2425
]

module/Vendor/Email/MailSendJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MailSendJob extends BaseJob
2424
private static function checkConfig()
2525
{
2626
$provider = app()->config->get('EmailSenderProvider');
27-
BizException::throwsIfEmpty('邮箱发送未配置', $provider);
27+
BizException::throwsIfEmpty('邮箱发送未设置', $provider);
2828
}
2929

3030
public static function createHtml($email, $subject, $html, $emailUserName = null, $option = [], $delay = 0)

module/Vendor/Sms/SmsUtil.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static function templates()
5959
public static function send($phone, $template, $templateData = [])
6060
{
6161
$provider = app()->config->get('SmsSenderProvider');
62-
BizException::throwsIfEmpty('短信发送未配置', $provider);
62+
BizException::throwsIfEmpty('短信发送未设置', $provider);
6363
$ret = SmsSenderProvider::get($provider)->send($phone, $template, $templateData);
6464
BizException::throwsIfResponseError($ret);
6565
return Response::generateSuccess();

0 commit comments

Comments
 (0)