Merge remote-tracking branch 'ixarea/master'

This commit is contained in:
MengYX 2020-04-23 18:17:58 +08:00
commit f2ea85bae9
No known key found for this signature in database
GPG Key ID: E63F9C7303E8F604
2 changed files with 10 additions and 9 deletions

View File

@ -22,7 +22,7 @@
<div id="loader"></div> <div id="loader"></div>
<noscript> <noscript>
<img alt="" <img alt=""
src="https://stats.ixarea.com/ixarea-stats/report?idsite=2&rec=1&action_name=音乐解锁+-+By+IXarea" src="https://stats.ixarea.com/ixarea-stats/report?rec=1&action_name=音乐解锁-NoJS&idsite=2"
style="border:0"/> style="border:0"/>
</noscript> </noscript>
<div hidden id="loader-tips-outdated"> <div hidden id="loader-tips-outdated">
@ -53,12 +53,12 @@
var m; var m;
if (!ua) return true; if (!ua) return true;
if (/MSIE |Trident\//.exec(ua)) return true; // no IE if (/MSIE |Trident\//.exec(ua)) return true; // no IE
m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 16 m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
if (m && Number(m[1]) < 16) return true; if (m && Number(m[1]) < 17) return true;
m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 50 m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
if (m && Number(m[1]) < 50) return true; if (m && Number(m[1]) < 58) return true;
m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 38 m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
return m && Number(m[1]) < 38; return m && Number(m[1]) < 45;
})(); })();
if (detected) { if (detected) {
document.getElementById('loader-tips-outdated').hidden = false; document.getElementById('loader-tips-outdated').hidden = false;

View File

@ -92,12 +92,13 @@
try { try {
const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", { const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", {
method: "POST", headers: {"Content-Type": "application/json"}, method: "POST", headers: {"Content-Type": "application/json"},
body: JSON.stringify({Version: this.version}) body: JSON.stringify({"Version": this.version})
}); });
updateInfo = await resp.json(); updateInfo = await resp.json();
} catch (e) { } catch (e) {
} }
if (!!updateInfo && !!updateInfo.Found) { if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
(!!updateInfo.Found && window.location.protocol !== "https:"))) {
this.$notify.warning({ this.$notify.warning({
title: '发现更新', title: '发现更新',
message: '发现新版本 v' + updateInfo.Version + message: '发现新版本 v' + updateInfo.Version +