uni-auth 1.0.5 → 1.0.7

package/package.json

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

package/src/common/index.js

@@ -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,28 +1,31 @@
 <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)
 onMounted(() => {
-  type.value = uni.getStorageSync('authCode') || ''
-  uni.removeStorageSync('authCode')
-  if (!type.value) return
   permissionListener.value = uni.createRequestPermissionListener()
   permissionListener.value.onConfirm((e) => {
-    isPermissionAlertShow.value = true
+    type.value = uni.getStorageSync('authCode') || ''
+    uni.removeStorageSync('authCode')
+    if (type.value) isPermissionAlertShow.value = true
   })
   permissionListener.value.onComplete((e) => {
     isPermissionAlertShow.value = false
   })
 })
+const safeH = computed(() => {
+  const { statusBarHeight, menuButtonHeight } = safeHeight()
+  return (statusBarHeight + menuButtonHeight || 70) + 20 + 'px'
+})
 onUnmounted(() => {
   permissionListener.value.stop()
 })
@@ -39,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;

package/src/index.js

@@ -1,5 +1,5 @@
 import { appAuth } from './util/app.js'
-import { wxAuth } from './util/wx.js'
+// import { wxAuth } from './util/wx.js'
 export { default as AuthPop } from './components/AuthPop.vue'
 
 export async function ifUserAuth(code) {