Compare commits

..

No commits in common. "1a23d640646f473eb863eff5f5615f586987bb8b" and "906a2aad94595f6b4932b8e67b042b2272614e3d" have entirely different histories.

5 changed files with 43 additions and 103 deletions

View File

@ -13,13 +13,14 @@
} }
.model-container { .model-container {
width: 446px; width: 360px;
height: 194px; height: 150px;
background: #fff; background: #fff;
border-radius: 10px;
/* box-shadow: 0px 0px 12px 4px #ff3; */
text-align: center; text-align: center;
font-size: 18px; font-size: 18px;
color: #707070; color: #333;
font-family: 'Alibaba PuHuiTi';
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
@ -32,32 +33,7 @@
} }
.model-container .model-title { .model-container .model-title {
height: 40px; font-size: 16px;
padding-left: 24px;
padding-right: 24px;
padding-top: 10px;
background: #007fff;
text-align: left;
}
.model-container .title-span {
font-family: 'Alibaba PuHuiTi';
font-size: 18px !important;
color: #ffffff;
}
.model-container .model-close {
position: absolute;
right: 20px;
top: 10px;
width: 18px;
height: 18px;
cursor: pointer;
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAALZJREFUOE9jZACC////ZwIpcyBOZGRk/A8SIwSAehqAatiB6itBahmBAhVAuh2qcRGQTiBkGNSQeqie6UA6G2QQyGSYIEgOr2E41UO9RpRh+CxlhIUFIZcRkocbhM9lUK/j9T6KQTgMuwgU10eKRaxhiGEQDsNg5uCMCKwGQQ07AKTtkVxyF8hWxZU0aOciLLFDehjhimKSYo1QOiEkDw4jQoqISbTUy2tUy/1Qr1FeHiElOIqYAKkPngur14nOAAAAAElFTkSuQmCC);
}
.model-container .model-content {
margin-top: 24px;
} }
.model-container .controls { .model-container .controls {
@ -75,32 +51,25 @@
cursor: pointer; cursor: pointer;
} }
.model-container .confirmChrome { .model-container .confirm {
width: 140px; width: 60px;
height: 36px; height: 30px;
background: #0087ff; background: #0087ff;
border-radius: 0.04rem !important; border-radius: 0.04rem !important;
font-size: 16px; font-size: 14px;
font-family: 'Alibaba PuHuiTi'; font-weight: 400;
color: #fff; color: #fff;
line-height: 36px; line-height: 30px;
border-radius: 6px;
} }
.model-container .confirm360 { .model-container .cancel {
width: 140px; width: 60px;
height: 36px; height: 30px;
background: #0087ff; background: #0087ff;
border-radius: 0.04rem !important; border-radius: 0.04rem !important;
font-size: 16px; font-size: 14px;
font-family: 'Alibaba PuHuiTi'; font-weight: 400;
color: #fff; color: #fff;
line-height: 36px; line-height: 30px;
margin-left: 50px; margin-left: 100px;
border-radius: 6px;
}
@font-face {
font-family: 'Alibaba PuHuiTi';
src: url('~@/assets/home/font/Alibaba-PuHuiTi-Light.otf');
} }

View File

@ -64,22 +64,17 @@ var ModelBox = (function() {
_this.isShow = this.option.isShow _this.isShow = this.option.isShow
var html = var html =
'<div class="model-container">' + '<div class="model-container">' +
'<div class="model-title">' + '<h1 class="model-title">title</h1>' +
'<span class="title-span">title</span>' + '<div class="model-content"></div>' +
'<div class="model-close"></div>' +
'</div>' +
'<div class="model-content">content</div>' +
'<div class="controls">' + '<div class="controls">' +
'<a class="confirmChrome">下载谷歌浏览器</a>' + '<a class="confirm">下载</a>' +
'<a class="confirm360">下载360浏览器</a>' + '<a class="cancel">取消</a>' +
'</div>' + '</div>' +
'</div>' '</div>'
var ModelBoxCon = document.createElement('div') var ModelBoxCon = document.createElement('div')
ModelBoxCon.setAttribute('class', 'mask-layer') ModelBoxCon.setAttribute('class', 'mask-layer')
ModelBoxCon.innerHTML = html ModelBoxCon.innerHTML = html
// ModelBoxCon.querySelector('.model-title').innerHTML = ModelBoxCon.querySelector('.model-title').innerHTML =
// _this.option.title
ModelBoxCon.querySelector('.title-span').innerHTML =
_this.option.title _this.option.title
ModelBoxCon.querySelector('.model-content').innerHTML = ModelBoxCon.querySelector('.model-content').innerHTML =
_this.option.content _this.option.content
@ -87,9 +82,8 @@ var ModelBox = (function() {
if (!_this.isShow) { if (!_this.isShow) {
ModelBoxCon.style.display = 'none' ModelBoxCon.style.display = 'none'
} }
ModelBoxCon.querySelector('.model-close').onclick = ModelBoxCon.querySelector('.cancel').onclick =
ModelBoxCon.querySelector('.confirmChrome').onclick = ModelBoxCon.querySelector('.confirm').onclick =
ModelBoxCon.querySelector('.confirm360').onclick =
_this.eventsFn.bind('', this, ModelBoxCon) _this.eventsFn.bind('', this, ModelBoxCon)
}, },
show: function() { show: function() {
@ -101,13 +95,9 @@ var ModelBox = (function() {
this.isShow = false this.isShow = false
}, },
eventsFn: function(e, doc, target) { eventsFn: function(e, doc, target) {
debugger
var _thisEvent = target.target var _thisEvent = target.target
if (_thisEvent.classList.contains('confirmChrome')) { if (_thisEvent.classList.contains('confirm')) {
e.option.confirmCallBack('Chrome') e.option.confirmCallBack()
} else if (_thisEvent.classList.contains('confirm360')) {
e.option.confirmCallBack('360')
} }
doc.style.display = 'none' doc.style.display = 'none'
e.isShow = false e.isShow = false
@ -118,16 +108,13 @@ var ModelBox = (function() {
})() })()
var opt = new ModelBox({ var opt = new ModelBox({
title: '提示信息', title: '当前系统不支持IE内核建议使用Chrome浏览器或360浏览器极速模式',
content: '平台暂不支持IE内核浏览器访问建议使用谷歌(Chrome)或360浏览器极速模式登录', content: '',
isShow: false, isShow: false,
confirmCallBack: function(data) { confirmCallBack: function() {
debugger
// //
const agent = getPCNum() const agent = getPCNum()
//console.log('agent------------>', agent) console.log('agent------------>', agent)
//console.log('datadatadatadata----------->', data)
if (data === 'Chrome') {
if (agent == 64) { if (agent == 64) {
// 64 // 64
downloadFile( downloadFile(
@ -141,22 +128,6 @@ var opt = new ModelBox({
'/static/download/standalonesetup32.exe' '/static/download/standalonesetup32.exe'
) )
} }
} else {
if (agent == 64) {
// 64
downloadFile(
'360se13.1.6260.0.exe',
'/static/download/360se13.1.6260.0.exe'
)
} else {
// 32
downloadFile(
'360se13.1.6110.0.exe',
'/static/download/360se13.1.6110.0.exe'
)
}
}
}, },
}) })

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B