From 58b1fd06ac5dd7fbef8ad4966c30f807bd469e56 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Wed, 16 Sep 2020 11:31:48 +0800 Subject: [PATCH 1/2] fix a bug --- fir_client/src/components/FirDownload.vue | 9 +++++++-- fir_download/src/components/FirDownload.vue | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index 0c623e8..aa09ad7 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -451,7 +451,8 @@ android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 iPad: u.indexOf('iPad') > -1, //是否iPad - webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 + webApp: u.indexOf('Safari') === -1, //是否web应该程序，没有头部与底部 + macos: u.indexOf('Mac OS') > -1 }; }(), language: (navigator.browserLanguage || navigator.language).toLowerCase() @@ -462,7 +463,11 @@ this.agent = 'wxapple'; //微信 } else { - this.agent = 'apple'; + if(browser.versions.macos){ + this.agent=''; + }else { + this.agent = 'apple'; + } } } diff --git a/fir_download/src/components/FirDownload.vue b/fir_download/src/components/FirDownload.vue index ceafefd..6b19746 100644 --- a/fir_download/src/components/FirDownload.vue +++ b/fir_download/src/components/FirDownload.vue @@ -432,7 +432,8 @@ android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1, //android终端或者uc浏览器 iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 iPad: u.indexOf('iPad') > -1, //是否iPad - webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部 + webApp: u.indexOf('Safari') === -1, //是否web应该程序，没有头部与底部 + macos: u.indexOf('Mac OS') > -1 }; }(), language: (navigator.browserLanguage || navigator.language).toLowerCase() @@ -443,7 +444,11 @@ this.agent = 'wxapple'; //微信 } else { - this.agent = 'apple'; + if(browser.versions.macos){ + this.agent=''; + }else { + this.agent = 'apple'; + } } } From b4bf20f960dd6420f9edca42b7ac71995d2e99b2 Mon Sep 17 00:00:00 2001 From: xiaoyu Date: Wed, 16 Sep 2020 11:43:47 +0800 Subject: [PATCH 2/2] fix a bug --- fir_client/src/components/FirDownload.vue | 2 +- fir_download/src/components/FirDownload.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fir_client/src/components/FirDownload.vue b/fir_client/src/components/FirDownload.vue index aa09ad7..af946ae 100644 --- a/fir_client/src/components/FirDownload.vue +++ b/fir_client/src/components/FirDownload.vue @@ -452,7 +452,7 @@ iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 iPad: u.indexOf('iPad') > -1, //是否iPad webApp: u.indexOf('Safari') === -1, //是否web应该程序，没有头部与底部 - macos: u.indexOf('Mac OS') > -1 + macos: u.indexOf('Mac OS') > -1 && u.indexOf('Macintosh') > -1 }; }(), language: (navigator.browserLanguage || navigator.language).toLowerCase() diff --git a/fir_download/src/components/FirDownload.vue b/fir_download/src/components/FirDownload.vue index 6b19746..b5ff263 100644 --- a/fir_download/src/components/FirDownload.vue +++ b/fir_download/src/components/FirDownload.vue @@ -433,7 +433,7 @@ iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1, //是否为iPhone或者QQHD浏览器 iPad: u.indexOf('iPad') > -1, //是否iPad webApp: u.indexOf('Safari') === -1, //是否web应该程序，没有头部与底部 - macos: u.indexOf('Mac OS') > -1 + macos: u.indexOf('Mac OS') > -1 && u.indexOf('Macintosh') > -1 }; }(), language: (navigator.browserLanguage || navigator.language).toLowerCase()