Skip to content

ShopXO
ShopXO

纵之格 / ShopXO

通知 393
Star 16
Fork 11
ShopXO
ShopXO

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 9b4ef287 编写于 作者: G gongfuxiang
浏览文件
操作

新增web端首页关闭状态+新增电信经营许可证展示+细节优化

上级 03b69cde
隐藏空白更改
内联 并排
Showing with 97 addition and 22 deletion
app/admin/view/default/site/base/index.html
浏览文件 @ 9b4ef287
......@@ -83,6 +83,14 @@
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.home_site_web_state.name}}<span class="am-form-group-label-tips">{{$data.home_site_web_state.describe}}</span></label>
<select name="{{$data.home_site_web_state.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_site_web_state.error_tips}}" required>
{{foreach $common_close_open_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_site_web_state']['value']) and $data['home_site_web_state']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.home_site_close_reason.name}}<span class="am-form-group-label-tips">{{$data.home_site_close_reason.describe}}</span></label>
<textarea rows="3" name="{{$data.home_site_close_reason.only_tag}}" class="am-radius" placeholder="{{$data.home_site_close_reason.name}}" data-validation-message="{{$data.home_site_close_reason.error_tips}}">{{if !empty($data)}}{{$data.home_site_close_reason.value}}{{/if}}</textarea>
......@@ -109,6 +117,11 @@
<label>{{$data.home_site_security_record_url.name}}<span class="am-form-group-label-tips">{{$data.home_site_security_record_url.describe}}</span></label>
<input type="text" name="{{$data.home_site_security_record_url.only_tag}}" placeholder="{{$data.home_site_security_record_url.describe}}" data-validation-message="{{$data.home_site_security_record_url.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_site_security_record_url.value}}"{{/if}} />
</div>
<div class="am-form-group">
<label>{{$data.home_site_telecom_license.name}}<span class="am-form-group-label-tips">{{$data.home_site_telecom_license.describe}}</span></label>
<input type="text" name="{{$data.home_site_telecom_license.only_tag}}" placeholder="{{$data.home_site_telecom_license.describe}}" data-validation-message="{{$data.home_site_telecom_license.error_tips}}" class="am-radius" {{if !empty($data)}}value="{{$data.home_site_telecom_license.value}}"{{/if}} />
</div>
</div>
</div>
......
app/api/controller/Common.php
浏览文件 @ 9b4ef287
......@@ -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)));
}
}
......
app/index/controller/Common.php
浏览文件 @ 9b4ef287
......@@ -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($reason, -10000)));
} else {
// 默认提示信息增加样式，则使用用户自定义信息展示
if($reason == '升级中...')
{
exit('<!DOCTYPE html><html><head><meta charset="utf-8" /><title>'.MyC('home_site_name').'</title><body><div style="text-align: center;margin-top: 15%;font-size: 18px;color: #f00;">'.$reason.'</div></body></html>');
} 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(MyC('home_site_close_reason', '网站维护中...'), -10000)));
exit(json_encode(DataReturn($reason, -10000)));
} else {
exit('<div style="text-align: center;margin-top: 15%;font-size: 18px;color: #f00;">'.MyC('home_site_close_reason', '网站维护中...', true).'</div>');
// 默认提示信息增加样式，则使用用户自定义信息展示
if($reason == '升级中...')
{
exit('<!DOCTYPE html><html><head><meta charset="utf-8" /><title>'.MyC('home_site_name').'</title><body><div style="text-align: center;margin-top: 15%;font-size: 18px;color: #f00;">'.$reason.'</div></body></html>');
} else {
exit($reason);
}
}
}
}
......
app/index/controller/Index.php
浏览文件 @ 9b4ef287
......@@ -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);
}
......
app/index/view/default/public/footer_nav.html
浏览文件 @ 9b4ef287
......@@ -87,6 +87,7 @@
{{$home_theme_footer_bottom_powered|raw}} {{$Think.APPLICATION_VERSION}}
</p>
{{if !empty($home_site_icp)}}
<b>|</b>
<p class="footer-icp">
<a href="https://beian.miit.gov.cn/" target="_blank">
<img src="{{$attachment_host}}/static/common/images/beian-icp-icon.png" alt="ICP备案" />
......@@ -95,6 +96,7 @@
</p>
{{/if}}
{{if !empty($home_site_security_record_name)}}
<b>|</b>
<p class="footer-icp">
<a {{if empty($home_site_security_record_url)}}href="javascript:;"{{else /}}href="{{$home_site_security_record_url}}" target="_blank"{{/if}}>
<img src="{{$attachment_host}}/static/common/images/beian-gongan-icon.png" alt="公安备案" />
......@@ -102,6 +104,12 @@
</a>
</p>
{{/if}}
{{if !empty($home_site_telecom_license)}}
<b>|</b>
<p class="footer-icp">
<a href="javascript:;">{{$home_site_telecom_license}}</a>
</p>
{{/if}}
</div>
</div>
</footer>
......
app/service/AppService.php
浏览文件 @ 9b4ef287
......@@ -92,11 +92,6 @@ class AppService
// icon 图标（必填、参考uniapp扩展图标文档）
// url 访问地址（可选）
$data = [
[
'name' => '所有店铺',
'icon' => 'shop',
'url' => '/pages/plugins/shop/index/index',
],
[
'name' => '我的收藏',
'icon' => 'heart',
......
extend/payment/CashPayment.php
浏览文件 @ 9b4ef287
......@@ -136,7 +136,7 @@ class CashPayment
$padding = '10px;';
$radius = '10px;';
}
$html = '<h1 style="text-align:center;margin-top:'.$h1_margin.';">按照以下支付信息进行打款</h1>
$html = '<h1 style="text-align:center;margin-top:'.$h1_margin.'">按照以下信息进行打款</h1>
<div style="text-align: left;margin:0 auto;max-width:800px;height:auto;border: 1px solid #e5e5e5;padding: '.$padding.';background:#fff;margin-top:'.$margin.'border-radius:'.$radius.'">';
// 文本信息
......
public/static/index/default/css/common.css
浏览文件 @ 9b4ef287
......@@ -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;
}
}
/**
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或