From 18a9fda4103aaf8c3e675856db73dc3db0477cac Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Wed, 14 Apr 2021 18:41:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(h5):=20getSystemInfo=E6=B7=BB=E5=8A=A0H5?= =?UTF-8?q?=E5=AF=B9iPadOS=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/platforms/h5/service/api/device/get-system-info.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/platforms/h5/service/api/device/get-system-info.js b/src/platforms/h5/service/api/device/get-system-info.js index 40a79286c..04facc3f2 100644 --- a/src/platforms/h5/service/api/device/get-system-info.js +++ b/src/platforms/h5/service/api/device/get-system-info.js @@ -23,6 +23,10 @@ const isMac = /Macintosh|Mac/i.test(ua) * 是否是Linux设备 */ const isLinux = /Linux|X11/i.test(ua) +/** + * 是否是iPadOS + */ +const isIPadOS = isMac && navigator.maxTouchPoints > 0 /** * 获取系统信息-同步 */ @@ -81,6 +85,10 @@ export function getSystemInfoSync () { break } } + } else if (isIPadOS) { + model = 'iPad' + osname = 'iPadOS' + osversion = window.BigInt ? '14' : '13' } else if (isWindows || isMac || isLinux) { model = 'PC' const osversionFind = ua.match(/\((.+?)\)/)[1] -- GitLab