diff --git a/front/public/static/css/modal.css b/front/public/static/css/modal.css index 858877fa..d8acc9dd 100644 --- a/front/public/static/css/modal.css +++ b/front/public/static/css/modal.css @@ -13,14 +13,13 @@ } .model-container { - width: 360px; - height: 150px; + width: 446px; + height: 194px; background: #fff; - border-radius: 10px; - /* box-shadow: 0px 0px 12px 4px #ff3; */ text-align: center; font-size: 18px; - color: #333; + color: #707070; + font-family: 'Alibaba PuHuiTi'; position: absolute; top: 50%; left: 50%; @@ -33,7 +32,32 @@ } .model-container .model-title { - font-size: 16px; + height: 40px; + 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 { @@ -51,25 +75,32 @@ cursor: pointer; } -.model-container .confirm { - width: 60px; - height: 30px; +.model-container .confirmChrome { + width: 140px; + height: 36px; background: #0087ff; border-radius: 0.04rem !important; - font-size: 14px; - font-weight: 400; + font-size: 16px; + font-family: 'Alibaba PuHuiTi'; color: #fff; - line-height: 30px; + line-height: 36px; + border-radius: 6px; } -.model-container .cancel { - width: 60px; - height: 30px; +.model-container .confirm360 { + width: 140px; + height: 36px; background: #0087ff; border-radius: 0.04rem !important; - font-size: 14px; - font-weight: 400; + font-size: 16px; + font-family: 'Alibaba PuHuiTi'; color: #fff; - line-height: 30px; - margin-left: 100px; + line-height: 36px; + margin-left: 50px; + border-radius: 6px; +} + +@font-face { + font-family: 'Alibaba PuHuiTi'; + src: url('~@/assets/home/font/Alibaba-PuHuiTi-Light.otf'); } \ No newline at end of file diff --git a/front/public/static/download/360se13.1.6110.0.exe b/front/public/static/download/360se13.1.6110.0.exe new file mode 100644 index 00000000..3971fcf5 Binary files /dev/null and b/front/public/static/download/360se13.1.6110.0.exe differ diff --git a/front/public/static/download/360se13.1.6260.0.exe b/front/public/static/download/360se13.1.6260.0.exe new file mode 100644 index 00000000..7f27509a Binary files /dev/null and b/front/public/static/download/360se13.1.6260.0.exe differ diff --git a/front/public/static/js/modal.js b/front/public/static/js/modal.js index cfd026dd..1da4faf9 100644 --- a/front/public/static/js/modal.js +++ b/front/public/static/js/modal.js @@ -64,17 +64,22 @@ var ModelBox = (function() { _this.isShow = this.option.isShow var html = '
' + - '

title

' + - '
' + + '
' + + 'title' + + '
' + + '
' + + '
content
' + '
' + - '下载' + - '取消' + + '下载谷歌浏览器' + + '下载360浏览器' + '
' + '
' var ModelBoxCon = document.createElement('div') ModelBoxCon.setAttribute('class', 'mask-layer') ModelBoxCon.innerHTML = html - ModelBoxCon.querySelector('.model-title').innerHTML = + // ModelBoxCon.querySelector('.model-title').innerHTML = + // _this.option.title + ModelBoxCon.querySelector('.title-span').innerHTML = _this.option.title ModelBoxCon.querySelector('.model-content').innerHTML = _this.option.content @@ -82,8 +87,9 @@ var ModelBox = (function() { if (!_this.isShow) { ModelBoxCon.style.display = 'none' } - ModelBoxCon.querySelector('.cancel').onclick = - ModelBoxCon.querySelector('.confirm').onclick = + ModelBoxCon.querySelector('.model-close').onclick = + ModelBoxCon.querySelector('.confirmChrome').onclick = + ModelBoxCon.querySelector('.confirm360').onclick = _this.eventsFn.bind('', this, ModelBoxCon) }, show: function() { @@ -95,9 +101,13 @@ var ModelBox = (function() { this.isShow = false }, eventsFn: function(e, doc, target) { + debugger var _thisEvent = target.target - if (_thisEvent.classList.contains('confirm')) { - e.option.confirmCallBack() + if (_thisEvent.classList.contains('confirmChrome')) { + e.option.confirmCallBack('Chrome') + + } else if (_thisEvent.classList.contains('confirm360')) { + e.option.confirmCallBack('360') } doc.style.display = 'none' e.isShow = false @@ -108,26 +118,45 @@ var ModelBox = (function() { })() var opt = new ModelBox({ - title: '当前系统不支持IE内核,建议使用Chrome浏览器或360浏览器极速模式', - content: '', + title: '提示信息', + content: '平台暂不支持IE内核浏览器访问,建议使用谷歌(Chrome)或360浏览器极速模式登录!', isShow: false, - confirmCallBack: function() { + confirmCallBack: function(data) { + debugger // 获取当前系统的方法 const agent = getPCNum() - console.log('agent------------>', agent) - if (agent == 64) { - // 64位操作系统 - downloadFile( - 'ChromeStandaloneSetup64.exe', - '/static/download/ChromeStandaloneSetup64.exe' - ) + //console.log('agent------------>', agent) + //console.log('datadatadatadata----------->', data) + if (data === 'Chrome') { + if (agent == 64) { + // 64位操作系统 + downloadFile( + 'ChromeStandaloneSetup64.exe', + '/static/download/ChromeStandaloneSetup64.exe' + ) + } else { + // 32位操作系统 + downloadFile( + 'ChromeStandalonesetup32.exe', + '/static/download/standalonesetup32.exe' + ) + } } else { - // 32位操作系统 - downloadFile( - 'ChromeStandalonesetup32.exe', - '/static/download/standalonesetup32.exe' - ) + 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' + ) + } } + }, }) diff --git a/front/src/assets/index/close-button-remind.png b/front/src/assets/index/close-button-remind.png new file mode 100644 index 00000000..fd302a9b Binary files /dev/null and b/front/src/assets/index/close-button-remind.png differ