@uxda/appkit 1.2.34 → 1.2.38

package/src/shared/components/DeviceVersion.vue

@@ -1,67 +1,67 @@
-<template>
-  <DdNoticeBar
-    v-if="showAlert"
-    showClose
-    :style="topStype"
-    @close="showAlert = !showAlert"
-    text="您当前使用的微信客户端版本较低，可能不支持全部功能或体验效果可能不佳，建议至应用商店或App Store升级至最新版本。"
-  />
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, computed } from 'vue'
-import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
-import { useSafeArea } from '../composables'
-import Taro from '@tarojs/taro'
-import { useHttp } from '../../balance/api'
-
-const showAlert = ref(false)
-const safeArea = useSafeArea()
-
-const topStype = computed(() => {
-  return `top: ${safeArea.nav + safeArea.status}px;`
-})
-
-onMounted(async () => {
-  await getPropertieByCode()
-
-  const systemInfo = Taro.getSystemInfoSync()
-  const version = systemInfo.SDKVersion
-
-  // 版本号比较函数
-  function compareVersion(v1, v2) {
-    const v1Arr = v1.split('.').map(Number)
-    const v2Arr = v2.split('.').map(Number)
-
-    for (let i = 0; i < v1Arr.length || i < v2Arr.length; i++) {
-      if ((v1Arr[i] || 0) > (v2Arr[i] || 0)) {
-        return true
-      } else if ((v1Arr[i] || 0) < (v2Arr[i] || 0)) {
-        return false
-      }
-    }
-    return false
-  }
-
-  if (!compareVersion(version, recommendVersions.value?.Mini || '2.24.0')) {
-    showAlert.value = true
-  }
-})
-
-const recommendVersions = ref()
-// 获取系统配置 - 小程序推荐版本
-async function getPropertieByCode() {
-  if (recommendVersions.value) return
-
-  const $http = useHttp()
-  $http
-    .get('/cas/properties/getPropertie', {
-      code: 'pcRecommendVersion',
-    })
-    .then((res: any) => {
-      recommendVersions.value = JSON.parse(res.value || '{}')
-    })
-}
-</script>
-
-<style lang="less"></style>
+<template>
+  <DdNoticeBar
+    v-if="showAlert"
+    showClose
+    :style="topStype"
+    @close="showAlert = !showAlert"
+    text="您当前使用的微信客户端版本较低，可能不支持全部功能或体验效果可能不佳，建议至应用商店或App Store升级至最新版本。"
+  />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from 'vue'
+import DdNoticeBar from '../../components/dd-notice-bar/index.vue'
+import { useSafeArea } from '../composables'
+import Taro from '@tarojs/taro'
+import { useHttp } from '../../balance/api'
+
+const showAlert = ref(false)
+const safeArea = useSafeArea()
+
+const topStype = computed(() => {
+  return `top: ${safeArea.nav + safeArea.status}px;`
+})
+
+const recommendVersions = ref()
+// 获取系统配置 - 小程序推荐版本
+async function getPropertieByCode() {
+  if (recommendVersions.value) return
+
+  const $http = useHttp()
+  await $http
+    .get('/cas/properties/getPropertie', {
+      code: 'pcRecommendVersion',
+    })
+    .then((res: any) => {
+      recommendVersions.value = JSON.parse(res.value || '{}')
+    })
+}
+
+onMounted(async () => {
+  await getPropertieByCode()
+
+  const systemInfo = Taro.getSystemInfoSync()
+  const version = systemInfo.SDKVersion
+
+  // 版本号比较函数
+  function compareVersion(v1, v2) {
+    const v1Arr = v1.split('.').map(Number)
+    const v2Arr = v2.split('.').map(Number)
+
+    for (let i = 0; i < v1Arr.length || i < v2Arr.length; i++) {
+      if ((v1Arr[i] || 0) > (v2Arr[i] || 0)) {
+        return true
+      } else if ((v1Arr[i] || 0) < (v2Arr[i] || 0)) {
+        return false
+      }
+    }
+    return false
+  }
+
+  if (!compareVersion(version, recommendVersions.value?.Mini || '2.24.0')) {
+    showAlert.value = true
+  }
+})
+</script>
+
+<style lang="less"></style>

package/src/shared/composables/useSafeArea.ts

@@ -6,23 +6,24 @@ export type SafeArea = {
   /**
    * 状态条高度
    */
-  status: number,
+  status: number
   /**
    * 导航条区域(胶囊)
    */
-  nav: number,
+  nav: number
   /**
    * 屏幕底部范围
    */
   bottom: number
+  menuRect: any
 }
 
 /**
  * 获取屏幕安全区域
  * 从系统 API 获取
- * @returns 
+ * @returns
  */
-export function useSafeArea (): SafeArea {
+export function useSafeArea(): SafeArea {
   const systemInfo = Taro.getSystemInfoSync(),
     capsule = Taro.getMenuButtonBoundingClientRect()
   /**
@@ -39,6 +40,7 @@ export function useSafeArea (): SafeArea {
   return {
     status,
     nav,
-    bottom
+    bottom,
+    menuRect: capsule,
   }
-}
+}