Skip to content

Commit

Permalink
Merge branch '7.x' of http://git.bt.cn:30000/root/linux-panel into 7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@19950219
19950219 committed Apr 9, 2022
2 parents 7111af2 + 6f39b4a commit e36f0f2
Show file tree
Hide file tree
Showing 9 changed files with 215 additions and 105 deletions.
Binary file added BTPanel/static/img/nginx_firewall/1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BTPanel/static/img/nginx_firewall/7.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 22 additions & 7 deletions BTPanel/static/js/public_backup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4225,7 +4225,7 @@ bt.soft = {
</div>\
<div class="libPay-menu-type lib_ltd" >\
<p><span class="recommend-pay-icon"></span><span class="glyphicon glyphicon-vip"></span><span style="margin-left:8px">' + bt.os + '企业版</span></p>\
<p>适用于电商、教育、医疗、事业单位等企业用户</p>\
<p>适用于官网，电商、教育、医疗等企业用户</p>\
</div>\
<div class="libPay-menu-type lib_ver" >\
<p><span></span><span style="margin-left:8px">抵扣券</span></p>\
Expand Down Expand Up @@ -4414,20 +4414,35 @@ bt.soft = {
that.get_product_discount_cache(_data, function (rdata) {
var _ul = $("#libPay-theme-price ul").empty(),
num = 0,
html = '';
html = '',
payList = [];
for (var keys in rdata) {
var item = rdata[keys];
if (typeof item === 'object') {
num++;
if (num > 4) break
item['cycle'] = keys
var _li = $('<li class="pay-cycle-btns" data-type="' + keys + '"><div class="pay-head-price"><span><div class="libPrice"><i>' + item.price + '</i>元</div>/' + that.pro.conver_unit(item.cycle + '') + '</span><p>原价:' + item.sprice + '元</p></div><div class="pay-foo-price">低至' + (item.price / ((item.cycle / 12) * 365)).toFixed(2) + '元/天</div>' + (item.tip ? '<em>' + item.tip + '</em>' : '') + '</li>')
_li.data('data', item).click(function () {
that.create_pay_code($(this).index())
})
_ul.append(_li)
payList.push(item)
}
}
// 排序
for (var i = 0; i < payList.length; i++) {
for (var j = i + 1; j < payList.length; j++) {
if (payList[i].sort > payList[j].sort) {
var temp = payList[i];
payList[i] = payList[j];
payList[j] = temp;
}
}
}
$.each(payList, function (index, item) {
var keys = item.cycle;
var _li = $('<li class="pay-cycle-btns" data-type="' + keys + '"><div class="pay-head-price"><span><div class="libPrice"><i>' + item.price + '</i>元</div>/' + that.pro.conver_unit(item.cycle + '') + '</span><p>原价:' + item.sprice + '元</p></div><div class="pay-foo-price">低至' + (item.price / ((item.cycle / 12) * 365)).toFixed(2) + '元/天</div>' + (item.tip ? '<em>' + item.tip + '</em>' : '') + '</li>')
_li.data('data', item).click(function () {
that.create_pay_code($(this).index());
});
_ul.append(_li);
});
// if(num >= 4) $('#libPay-theme-price .pay-cycle-btns').css('width',((910 - ((num - 1) * 10)) / num) + 'px')
that.create_pay_code(0)
})
Expand Down
291 changes: 193 additions & 98 deletions BTPanel/templates/default/error3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,70 +17,66 @@
background: #20a53a10;
}
.daily-thumbnail{
width: 950px;
height: 350px;
margin:100px auto;
width: 1200px;
margin: 80px auto;
}
.thumbnail-box{
display: inline-block;
width: 460px;
text-align: center;
cursor: pointer;
position: relative;
display: inline-block;
padding: 5px;
background: #f9f9f9;
border-radius: 4px;
box-shadow: 1px 1px 30px rgb(0 0 0 / 10%);
}

.thumbnail-box::before{
content: '点击预览';
display: none;
background: #000;
opacity: 0.2;
color: #fff;
position: absolute;
left: 0;
top: 0;
width: 460px;
height: 350px;
line-height: 350px;
font-size: 18px;
vertical-align: bottom;
border-radius: 4px;
transition: all 1s;
}

.thumbnail-box:hover::before{
display: inline-block;
display: flex;
justify-content: center;
}

.thumbnail-introduce{
display: inline-block;
vertical-align: top;
margin-left: 100px;
margin-top: 70px;
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 40px;
}
.thumbnail-introduce span{
font-size: 20px;
font-weight: bold;
}
.thumbnail-introduce ul{
.thumbnail-introduce ul {
display: flex;
font-size: 16px;
line-height: 30px;
margin: 20px 0 20px 20px;
list-style: square;
margin: 20px 0;
list-style-type: square;
}
.thumbnail-introduce ul li + li {
margin-left: 40px;
}
.pluginTipsGg{
background-image: url(/static/img/btwaf-nginx.png);
width: 450px;
height: 340px;
background-size: contain;
position: relative;
width: 950px;
height: 720px;
background-color: #f1f1f1;
background-size: 100%;
background-repeat: no-repeat;
background-position: center;
background-position: top;
border-radius: 4px;
}
/*.pluginTipsGg:hover::before{*/
/* display: inline-block;*/
/*}*/
.pluginTipsGg::before {
content: '点击预览';
display: none;
background: #000;
opacity: 0.2;
color: #fff;
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
line-height: 621px;
font-size: 18px;
vertical-align: bottom;
text-align: center;
border-radius: 4px;
transition: all 1s;
}
.tab-list .tabs-item.active:after {
content: '';
width: 20px;
Expand All @@ -91,59 +87,153 @@
background: red;
margin-left: -10px;
background: #20a53a;
}
}
.thumbnail-box .thumbnail-tab {
margin-right: 20px;
width: 120px;
border-left: 1px solid #def2e2;
}
.thumbnail-tab li {
padding: 0 20px;
line-height: 36px;
cursor: pointer;
font-size: 14px;
}
.thumbnail-tab li.on {
border-left: 2px solid #20a53a;
color: #20a53a;
font-size: 16px;
font-weight: bold;
}
.thumbnail-item {
display: none;
}
.thumbnail-item.show {
display: block;
}
</style>
<div class="main-content pb55" style="min-height: 525px;">
<div class="container-fluid">
{% if 'error_msg' in data %}
<div class="pos-box bgw mtb15">
<div class="control-nav">
<div class="control-item active" name="control">概览</div>
<div class="container-fluid">
{% if 'error_msg' in data %}
<div class="pos-box bgw mtb15">
<div class="control-nav">
<div class="control-item active" name="control">防火墙</div>
</div>
</div>
<div class="mtb15 pd15 bgw daily-view">
<div class="info-title-tips">
<p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>提示：此页面可在面板设置中关闭</p>
</div>
<div class="daily-thumbnail">
<div class="thumbnail-introduce">
<span>Nginx防火墙功能介绍</span>
<ul>
<li>仅支持Nginx</li>
<li>抵御CC攻击</li>
<li>关键词拦截</li>
<li>拦截恶意扫描</li>
<li>阻止黑客入侵</li>
</ul>
<div class="daily-product-buy">
<a class="btn btn-default mr10" title="产品预览" href="https://www.bt.cn/new/product_nginx_firewall.html" target="_blank">产品预览</a>
<a title="购买专业/企业版" href="javascript:;" class="btn btn-success va0 ml15 payPlugin">立即购买</a>
</div>
</div>
<div class="mtb15 pd15 bgw daily-view">
<div class="info-title-tips">
<p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>提示：此页面可在面板设置中关闭</p>
</div>
<div class="daily-thumbnail">
<div class="thumbnail-box"><div class="pluginTipsGg"></div></div>
<div class="thumbnail-introduce">
<span>Nginx防火墙功能介绍：</span>
<ul>
<li>仅支持Nginx</li>
<li>CC防御</li>
<li>拦截SQL注入、xss、一句话木马等常见渗透功能</li>
</ul>
<div class="daily-product-buy">
<a title="购买专业/企业版" href="javascript:;" class="btn btn-success va0 ml15 payPlugin">立即购买</a>
</div>
</div>
<div class="thumbnail-box">
<ul class="thumbnail-tab">
<li class="on">概览</li>
<li>攻击地图</li>
<li>攻击报表</li>
<li>全局设置</li>
<li>站点设置</li>
<li>封锁记录</li>
<li>操作日志</li>
</ul>
<div class="thumbnail-item show">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/1.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/2.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/3.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/4.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/5.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/6.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/7.png);"></div>
</div>
</div>
{% else %}
<div class="pos-box bgw mtb15 ">
<div class="control-nav">
<div class="control-item active" name="control">概览</div>
</div>
</div>
{% else %}
<div class="pos-box bgw mtb15">
<div class="control-nav">
<div class="control-item active" name="control">防火墙</div>
</div>
</div>
<div class="mtb15 pd15 bgw daily-view">
<div class="info-title-tips">
<p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>提示：此页面可在面板设置中关闭</p>
</div>
<div class="daily-thumbnail">
<div class="thumbnail-introduce">
<span>Nginx防火墙功能介绍</span>
<ul>
<li>仅支持Nginx</li>
<li>抵御CC攻击</li>
<li>关键词拦截</li>
<li>拦截恶意扫描</li>
<li>阻止黑客入侵</li>
</ul>
<div class="daily-product-buy">
<a class="btn btn-default mr10" title="产品预览" href="https://www.bt.cn/new/product_nginx_firewall.html" target="_blank">产品预览</a>
<a title="购买专业/企业版" href="javascript:;" class="btn btn-success va0 ml15 payPlugin">立即购买</a>
</div>
</div>
<div class="mtb15 pd15 bgw daily-view">
<div class="daily-thumbnail">
<div class="thumbnail-box"><div class="pluginTipsGg"></div></div>
<div class="thumbnail-introduce">
<span>Nginx防火墙功能介绍：</span>
<ul>
<li>仅支持Nginx</li>
<li>CC防御</li>
<li>拦截SQL注入、xss、一句话木马等常见渗透功能</li>
</ul>
<div class="daily-product-buy">
<a title="购买专业/企业版" href="javascript:;" class="btn btn-success va0 ml15 installWaf">立即安装</a>
</div>
</div>
<div class="thumbnail-box">
<ul class="thumbnail-tab">
<li class="on">概览</li>
<li>攻击地图</li>
<li>攻击报表</li>
<li>全局设置</li>
<li>站点设置</li>
<li>封锁记录</li>
<li>操作日志</li>
</ul>
<div class="thumbnail-item show">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/1.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/2.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/3.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/4.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/5.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/6.png);"></div>
</div>
<div class="thumbnail-item">
<div class="pluginTipsGg" style="background-image: url(/static/img/nginx_firewall/7.png);"></div>
</div>
</div>
{% endif %}
</div>
</div>
</div>
{% endif %}
</div>
</div>
{% endblock %}
{% block scripts %}
Expand All @@ -159,15 +249,20 @@
},500);
});
})
$('.thumbnail-box').on('click',function(){
layer.open({
title:false,
btn:false,
shadeClose:true,
closeBtn: 2,
area:['950px','725px'],
content:'<div class="pd10"><img src="/static/img/btwaf-nginx.png" style="width:100%"/></div>'
})
$('.thumbnail-tab li').click(function () {
var index = $(this).index();
$(this).addClass('on').siblings('.on').removeClass('on');
$('.thumbnail-item').eq(index).addClass('show').siblings('.show').removeClass('show');
})
// $('.thumbnail-box').on('click',function(){
// layer.open({
// title:false,
// btn:false,
// shadeClose:true,
// closeBtn: 2,
// area:['950px','725px'],
// content:'<div class="pd10"><img src="/static/img/btwaf-nginx.png" style="width:100%"/></div>'
// })
// })
</script>
{% endblock %}

0 comments on commit e36f0f2

Please sign in to comment.