Merge branch 'next' into fix/pxTransform

# Conflicts: # packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap # packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
NervJS · Apr 26, 2021 · 83789da · 83789da
2 parents abd4a47 + 112c85b
commit 83789da
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/packages/taro-alipay/src/runtime.ts b/packages/taro-alipay/src/runtime.ts
@@ -1,5 +1,15 @@
 import { mergeReconciler, mergeInternalComponents } from '@tarojs/shared'
 import { hostConfig, components } from './runtime-utils'
 
+// 支付宝真机只有 navigator.swuserAgent
+const { userAgent } = navigator
+Object.defineProperty(navigator, 'userAgent', {
+  configurable: true,
+  enumerable: true,
+  get () {
+    return userAgent || (navigator as any).swuserAgent || ''
+  }
+})
+
 mergeReconciler(hostConfig)
 mergeInternalComponents(components)