From a90f4ad2f2b68bb79f30a2e6973a4e149b7ba66e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=A6=82=E6=91=B8=E9=B1=BC=E5=8E=BB?= <1780903673@qq.com> Date: Tue, 3 Dec 2024 18:35:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20vue-?= =?UTF-8?q?tsc=20=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#753)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ Closes: #752 --- src/uni_modules/wot-design-uni/components/common/util.ts | 8 +++++++- .../wot-design-uni/components/wd-fab/wd-fab.vue | 1 - .../wot-design-uni/components/wd-progress/wd-progress.vue | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/uni_modules/wot-design-uni/components/common/util.ts b/src/uni_modules/wot-design-uni/components/common/util.ts index 1f21718c..8d1b610a 100644 --- a/src/uni_modules/wot-design-uni/components/common/util.ts +++ b/src/uni_modules/wot-design-uni/components/common/util.ts @@ -695,7 +695,13 @@ export function isImageUrl(url: string): boolean { /** * 判断环境是否是H5 */ -export const isH5 = process.env.UNI_PLATFORM === 'h5' +export const isH5 = (() => { + let isH5 = false + // #ifdef H5 + isH5 = true + // #endif + return isH5 +})() /** * 剔除对象中的某些属性 diff --git a/src/uni_modules/wot-design-uni/components/wd-fab/wd-fab.vue b/src/uni_modules/wot-design-uni/components/wd-fab/wd-fab.vue index 7c8772fc..80128941 100644 --- a/src/uni_modules/wot-design-uni/components/wd-fab/wd-fab.vue +++ b/src/uni_modules/wot-design-uni/components/wd-fab/wd-fab.vue @@ -22,7 +22,6 @@ :custom-class="`wd-fab__actions wd-fab__actions--${fabDirection}`" :show="isActive" :duration="300" - name="" > diff --git a/src/uni_modules/wot-design-uni/components/wd-progress/wd-progress.vue b/src/uni_modules/wot-design-uni/components/wd-progress/wd-progress.vue index 51873548..7e4df514 100644 --- a/src/uni_modules/wot-design-uni/components/wd-progress/wd-progress.vue +++ b/src/uni_modules/wot-design-uni/components/wd-progress/wd-progress.vue @@ -34,7 +34,7 @@ const props = defineProps(progressProps) const showColor = ref('') const showPercent = ref(0) const changeCount = ref(0) -let timer: NodeJS.Timeout | null = null +let timer: ReturnType | null = null const rootStyle = computed(() => { return objToStyle({