uni-auth 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-auth",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

package/src/common/index.js

@@ -10,8 +10,8 @@ export const contentEnum = {
     相机: `允许${appName}访问您的相册/相机，您可以上传/拍摄照片及视频`,
     麦克风: `允许${appName}访问您的麦克风来获取您的声音用于录音等信息`,
     设备信息: `允许${appName}访问您设备的唯一标识，用于数据统计和分析`,
-    电话: `允许${appName}访问您设备的电话，用于联系客服`,
-    位置: `允许${appName}访问您的位置，用于为你提供下单配送服务`,
+    电话: `允许${appName}访问您设备的电话，用于拨打客服电话`,
+    位置: `允许${appName}访问您的位置，用于为你提供推荐优质房源服务`,
   },
 }
 
@@ -32,3 +32,16 @@ export function hintOpenAuth(params = {}) {
     })
   })
 }
+
+export const safeHeight = () => {
+  const obj = {
+    statusBarHeight: uni.getWindowInfo().statusBarHeight,
+    menuButtonHeight: 0,
+  }
+  if (uni.getMenuButtonBoundingClientRect) {
+    console.log(uni.getMenuButtonBoundingClientRect())
+    obj.menuButtonHeight = uni.getMenuButtonBoundingClientRect().height
+    obj.statusBarHeight = uni.getMenuButtonBoundingClientRect().top
+  }
+  return obj
+}

package/src/components/AuthPop.vue

@@ -1,13 +1,13 @@
 <template>
-  <view class="auth-pop" v-if="isPermissionAlertShow">
+  <view class="auth-pop" :style="{ marginTop: safeH }" v-if="isPermissionAlertShow">
     <view class="title">{{ type }}权限使用说明</view>
     <view class="msg">{{ contentEnum['android'][type] }}</view>
   </view>
 </template>
 
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue'
-import { contentEnum } from '../common/index.js'
+import { onMounted, onUnmounted, computed, ref } from 'vue'
+import { contentEnum, safeHeight } from '../common/index.js'
 const type = ref('')
 const permissionListener = ref(null)
 const isPermissionAlertShow = ref(false)
@@ -22,6 +22,10 @@ onMounted(() => {
     isPermissionAlertShow.value = false
   })
 })
+const safeH = computed(() => {
+  const { statusBarHeight, menuButtonHeight } = safeHeight()
+  return statusBarHeight + menuButtonHeight + 20 + 'px'
+})
 onUnmounted(() => {
   permissionListener.value.stop()
 })
@@ -38,7 +42,8 @@ onUnmounted(() => {
   box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
   z-index: 999;
   border-radius: 14rpx;
-  margin: 100rpx 5% 0;
+  margin-left: 5%;
+  margin-right: 5%;
   animation: identifier 1s ease-in-out;
   padding: 20rpx 30rpx;
   box-sizing: border-box;