From 9b4ef2878d4da476137006b18899dcd9a1cf052d Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Wed, 8 Dec 2021 15:11:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eweb=E7=AB=AF=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=85=B3=E9=97=AD=E7=8A=B6=E6=80=81+=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=94=B5=E4=BF=A1=E7=BB=8F=E8=90=A5=E8=AE=B8=E5=8F=AF?= =?UTF-8?q?=E8=AF=81=E5=B1=95=E7=A4=BA+=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/default/site/base/index.html | 13 ++++ app/api/controller/Common.php | 2 +- app/index/controller/Common.php | 67 +++++++++++++++---- app/index/controller/Index.php | 10 ++- app/index/view/default/public/footer_nav.html | 8 +++ app/service/AppService.php | 5 -- extend/payment/CashPayment.php | 2 +- public/static/index/default/css/common.css | 12 ++++ 8 files changed, 97 insertions(+), 22 deletions(-) diff --git a/app/admin/view/default/site/base/index.html b/app/admin/view/default/site/base/index.html index 2364cd38e..c55b40981 100755 --- a/app/admin/view/default/site/base/index.html +++ b/app/admin/view/default/site/base/index.html @@ -83,6 +83,14 @@ {{/foreach}} +
+ + +
@@ -109,6 +117,11 @@
+ +
+ + +
diff --git a/app/api/controller/Common.php b/app/api/controller/Common.php index 65e6f7468..65a5a7010 100755 --- a/app/api/controller/Common.php +++ b/app/api/controller/Common.php @@ -125,7 +125,7 @@ class Common extends BaseController { if(MyC('home_site_state') != 1) { - exit(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); + exit(json_encode(DataReturn(MyC('home_site_close_reason', '升级中...'), -10000))); } } diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 3c6234ca5..e74e5beed 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -299,6 +299,7 @@ class Common extends BaseController MyViewAssign('home_site_icp', MyC('home_site_icp')); MyViewAssign('home_site_security_record_name', MyC('home_site_security_record_name')); MyViewAssign('home_site_security_record_url', MyC('home_site_security_record_url')); + MyViewAssign('home_site_telecom_license', MyC('home_site_telecom_license')); // 布局样式+管理 MyViewAssign('is_load_layout', 0); @@ -370,11 +371,12 @@ class Common extends BaseController } /** - * [NavInit 导航初始化] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2016-12-19T22:41:20+0800 + * 导航初始化 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-12-08 + * @desc description */ private function NavInit() { @@ -388,22 +390,63 @@ class Common extends BaseController } /** - * [SiteStstusCheck 站点状态校验] - * @author Devil - * @blog http://gong.gg/ - * @version 0.0.1 - * @datetime 2017-02-25T21:43:07+0800 + * 站点状态校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-12-08 + * @desc description */ private function SiteStstusCheck() { if(MyC('home_site_state') != 1) { + // 提示信息 + $reason = MyC('home_site_close_reason', '升级中...', true); + // 是否ajax请求 if(IS_AJAX) { - exit(json_encode(DataReturn(MyC('home_site_close_reason', '网站维护中...'), -10000))); + exit(json_encode(DataReturn($reason, -10000))); } else { - exit('
'.MyC('home_site_close_reason', '网站维护中...', true).'
'); + // 默认提示信息增加样式，则使用用户自定义信息展示 + if($reason == '升级中...') + { + exit(''.MyC('home_site_name').'
'.$reason.'
'); + } else { + exit($reason); + } + } + } + } + + /** + * 站点状态校验 - web端 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2021-12-08 + * @desc description + */ + public function SiteWebStstusCheck() + { + if(MyC('home_site_web_state') != 1) + { + // 提示信息 + $reason = MyC('home_site_close_reason', '升级中...', true); + + // 是否ajax请求 + if(IS_AJAX) + { + exit(json_encode(DataReturn($reason, -10000))); + } else { + // 默认提示信息增加样式，则使用用户自定义信息展示 + if($reason == '升级中...') + { + exit(''.MyC('home_site_name').'
'.$reason.'
'); + } else { + exit($reason); + } } } } diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 7463c227e..9c609c675 100755 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -42,6 +42,9 @@ class Index extends Common public function __construct() { parent::__construct(); + + // web端首页状态 + $this->SiteWebStstusCheck(); } /** @@ -57,8 +60,9 @@ class Index extends Common $banner = BannerService::Banner(); MyViewAssign('banner_list', $banner); - // H5导航 - MyViewAssign('navigation', AppHomeNavService::AppHomeNav()); + // 手机默认下导航 + $navigation = IsMobile() ? AppHomeNavService::AppHomeNav() : []; + MyViewAssign('navigation', $navigation); // 用户订单状态 $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); @@ -139,7 +143,7 @@ class Index extends Common // 加载百度地图api // 存在地图事件则载入 - if(in_array(3, array_column($banner, 'event_type'))) + if((!empty($banner) && in_array(3, array_column($banner, 'event_type'))) || (!empty($navigation) && in_array(3, array_column($navigation, 'event_type')))) { MyViewAssign('is_load_baidu_map_api', 1); } diff --git a/app/index/view/default/public/footer_nav.html b/app/index/view/default/public/footer_nav.html index bff4c3f50..c3a7f4b99 100755 --- a/app/index/view/default/public/footer_nav.html +++ b/app/index/view/default/public/footer_nav.html @@ -87,6 +87,7 @@ {{$home_theme_footer_bottom_powered|raw}} {{$Think.APPLICATION_VERSION}}

{{if !empty($home_site_icp)}} + |

ICP备案 @@ -95,6 +96,7 @@

{{/if}} {{if !empty($home_site_security_record_name)}} + |

公安备案 @@ -102,6 +104,12 @@

{{/if}} + {{if !empty($home_site_telecom_license)}} + | +

+ {{$home_site_telecom_license}} +

+ {{/if}} diff --git a/app/service/AppService.php b/app/service/AppService.php index 1adbba2c0..310cd9d13 100644 --- a/app/service/AppService.php +++ b/app/service/AppService.php @@ -92,11 +92,6 @@ class AppService // icon 图标（必填、参考uniapp扩展图标文档） // url 访问地址（可选） $data = [ - [ - 'name' => '所有店铺', - 'icon' => 'shop', - 'url' => '/pages/plugins/shop/index/index', - ], [ 'name' => '我的收藏', 'icon' => 'heart', diff --git a/extend/payment/CashPayment.php b/extend/payment/CashPayment.php index 806cab663..8b0521994 100755 --- a/extend/payment/CashPayment.php +++ b/extend/payment/CashPayment.php @@ -136,7 +136,7 @@ class CashPayment $padding = '10px;'; $radius = '10px;'; } - $html = '

按照以下支付信息进行打款

+ $html = '

按照以下信息进行打款

'; // 文本信息 diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index 2ae0dab62..2cfffb8d3 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -275,9 +275,18 @@ input.add,input.min{width:15px} .am-footer-default p.am-text-truncate { line-height: 24px; } +.am-footer-default b { + margin: 0 3px; + font-weight: 400; + color: #585858; +} .am-footer-default a { font-size: 12px; color: #b1b1b1; + text-decoration: none; +} +.am-footer-default a:hover { + color: #d1d1d1; } .footer-nav-list { padding: 0; @@ -347,6 +356,9 @@ input.add,input.min{width:15px} padding-top: 10px; margin-top: 10px; } + .am-footer-default b { + display: none; + } } /**