diff --git a/src/app.vue b/src/app.vue index e8fd0d7..8d08122 100644 --- a/src/app.vue +++ b/src/app.vue @@ -82,8 +82,7 @@ const startProgress = () => { // 生成随机进度增长(1-9%) const randomStep = Math.floor(Math.random() * 9 + 1) progress.value = Math.min(progress.value + randomStep, 100) - const deviceInfo: Device.DeviceInfo = await initDeviceInfo() - if (deviceInfo.deviceType === deviceType.LargeSpaceDM_B) { + if (__DEVICE_TYPE__ === deviceType.LargeSpaceDM_B) { await initData() // 核心数据 } else { diff --git a/src/components/common/SoftKeyboard/index.vue b/src/components/common/SoftKeyboard/index.vue index 237600b..dd31f81 100644 --- a/src/components/common/SoftKeyboard/index.vue +++ b/src/components/common/SoftKeyboard/index.vue @@ -41,7 +41,7 @@ onMounted(() => { const isOpen = ref(false) watchEffect(() => { // 在焦点内二次点击时不触发EventListener,做一下延迟处理 - if (deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B) { // 大空间标准版 + if (__DEVICE_TYPE__ !== deviceState.deviceTypeMap.LargeSpaceDM_B) { // 大空间标准版 setTimeout(() => { isOpen.value = props.isVisible }, 100) @@ -52,7 +52,7 @@ watchEffect(() => { watch( () => props.isVisible, (newVal) => { - if (deviceState.deviceInfo.deviceType !== deviceState.deviceTypeMap.LargeSpaceDM_B) { + if (__DEVICE_TYPE__ !== deviceState.deviceTypeMap.LargeSpaceDM_B) { isOpen.value = newVal } }, diff --git a/src/components/home/HomeSetting.vue b/src/components/home/HomeSetting.vue index 81acc92..4a0adcb 100644 --- a/src/components/home/HomeSetting.vue +++ b/src/components/home/HomeSetting.vue @@ -58,8 +58,7 @@ watchEffect(() => { * @description 初始化压力配置 */ onMounted(async () => { - const deviceInfo: Device.DeviceInfo = deviceStore.deviceInfo - if (deviceInfo.deviceType !== useDeviceStore().deviceTypeMap.LargeSpaceDM_B) { + if (__DEVICE_TYPE__ !== useDeviceStore().deviceTypeMap.LargeSpaceDM_B) { await getPressureConfig() // 获取压力配置 } }) diff --git a/src/components/setting/Device.vue b/src/components/setting/Device.vue index 4d60679..e5cbb9d 100644 --- a/src/components/setting/Device.vue +++ b/src/components/setting/Device.vue @@ -18,6 +18,7 @@ const deviceInfo = ref(deviceStore.deviceInfo) // const screenHeight = ref(height) const webVersion = computed(() => __APP_VERSION__) +const deviceType = computed(() => __DEVICE_TYPE__)