From 186b0156df28ff80b5ddc0a87ecd7d94bc3adbf3 Mon Sep 17 00:00:00 2001
From: cikenerd <i@cikenerd.com>
Date: Wed, 26 Oct 2022 14:29:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E4=BD=BF=E7=94=A8=20van-tabs=20=E5=88=87=E6=8D=A2=20t?=
 =?UTF-8?q?ab=20=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20(#5073)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复插件内使用van-tabs切换tab报错的问题

* fix(van-tabs): 修复小程序插件内使用van-tabs切换tab没有反应的问题
feat(van-tabs): incorrect style
docs(van-tabs): 去除utils,version里面require循环依赖,修复插件内调用wx.canIUse抛异常问题

* fix(van-tabs): 修复小程序插件内使用van-tabs切换tab没有反应的问题
feat(van-tabs): incorrect style
docs(van-tabs): 去除utils,version里面require循环依赖,修复插件内调用wx.canIUse抛异常问题

* fix(van-tabs): incorrect style
feat(van-tabs): incorrect style
docs(van-tabs): incorrect style
---
 packages/common/utils.ts   | 12 ++----------
 packages/common/version.ts | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/common/utils.ts b/packages/common/utils.ts
index 1256a476..fe3f44e6 100644
--- a/packages/common/utils.ts
+++ b/packages/common/utils.ts
@@ -1,7 +1,8 @@
 import { isDef, isNumber, isPlainObject, isPromise } from './validator';
-import { canIUseGroupSetData, canIUseNextTick } from './version';
+import { canIUseGroupSetData, canIUseNextTick, getSystemInfoSync } from './version';
 
 export { isDef } from './validator';
+export { getSystemInfoSync } from './version';
 
 export function range(num: number, min: number, max: number) {
   return Math.min(Math.max(num, min), max);
@@ -17,15 +18,6 @@ export function nextTick(cb: (...args: any[]) => void) {
   }
 }
 
-let systemInfo: WechatMiniprogram.SystemInfo;
-export function getSystemInfoSync() {
-  if (systemInfo == null) {
-    systemInfo = wx.getSystemInfoSync();
-  }
-
-  return systemInfo;
-}
-
 export function addUnit(value?: string | number): string | undefined {
   if (!isDef(value)) {
     return undefined;
diff --git a/packages/common/version.ts b/packages/common/version.ts
index 0432c332..e8ee1868 100644
--- a/packages/common/version.ts
+++ b/packages/common/version.ts
@@ -1,4 +1,11 @@
-import { getSystemInfoSync } from './utils';
+let systemInfo: WechatMiniprogram.SystemInfo;
+export function getSystemInfoSync() {
+  if (systemInfo == null) {
+    systemInfo = wx.getSystemInfoSync();
+  }
+
+  return systemInfo;
+}
 
 function compareVersion(v1, v2) {
   v1 = v1.split('.');
@@ -50,7 +57,11 @@ export function canIUseGroupSetData() {
 }
 
 export function canIUseNextTick() {
-  return wx.canIUse('nextTick');
+  try {
+    return wx.canIUse('nextTick');
+  } catch (e) {
+    return gte('2.7.1');
+  }
 }
 
 export function canIUseCanvas2d() {