Merge branch 'super_signature'

pull/1/head
xiaoyu 4 years ago
commit a9b5e320c0
  1. 7
      fir_client/src/components/FirDownload.vue
  2. 7
      fir_download/src/components/FirDownload.vue

@ -451,7 +451,8 @@
android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //androiduc android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //androiduc
iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //iPhoneQQHD iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //iPhoneQQHD
iPad: u.indexOf('iPad') > -1, //iPad iPad: u.indexOf('iPad') > -1, //iPad
webApp: u.indexOf('Safari') == -1 //web webApp: u.indexOf('Safari') === -1, //web
macos: u.indexOf('Mac OS') > -1 && u.indexOf('Macintosh') > -1
}; };
}(), }(),
language: (navigator.browserLanguage || navigator.language).toLowerCase() language: (navigator.browserLanguage || navigator.language).toLowerCase()
@ -461,9 +462,13 @@
if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === "micromessenger") { if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === "micromessenger") {
this.agent = 'wxapple'; this.agent = 'wxapple';
// //
} else {
if(browser.versions.macos){
this.agent='';
}else { }else {
this.agent = 'apple'; this.agent = 'apple';
} }
}
} }
if (browser.versions.android) {// if (browser.versions.android) {//

@ -432,7 +432,8 @@
android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //androiduc android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //androiduc
iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //iPhoneQQHD iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //iPhoneQQHD
iPad: u.indexOf('iPad') > -1, //iPad iPad: u.indexOf('iPad') > -1, //iPad
webApp: u.indexOf('Safari') == -1 //web webApp: u.indexOf('Safari') === -1, //web
macos: u.indexOf('Mac OS') > -1 && u.indexOf('Macintosh') > -1
}; };
}(), }(),
language: (navigator.browserLanguage || navigator.language).toLowerCase() language: (navigator.browserLanguage || navigator.language).toLowerCase()
@ -442,9 +443,13 @@
if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === "micromessenger") { if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === "micromessenger") {
this.agent = 'wxapple'; this.agent = 'wxapple';
// //
} else {
if(browser.versions.macos){
this.agent='';
}else { }else {
this.agent = 'apple'; this.agent = 'apple';
} }
}
} }
if (browser.versions.android) {// if (browser.versions.android) {//

Loading…
Cancel
Save