uni-auth 1.1.8 → 1.2.0

package/README.md

@@ -0,0 +1,26 @@
+### 使用
+
+1. 引入模块
+
+```
+import { ifUserAuth, AuthPop } from 'uni-auth'
+```
+
+2. 调用方法
+
+ifUserAuth 方法
+
+```
+const res = await ifUserAuth('设备信息', '请授权设备信息xxxx')
+```
+
+//参数1为授权类型，参数2为授权提示信息 参数2可不传用默认提示
+res true为通过授权 false为拒绝授权
+
+AuthPop 组件
+
+```
+<AuthPop />
+```
+
+为授权弹窗组件，用于弹出授权弹窗

package/package.json

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

package/src/common/index.js

@@ -25,7 +25,7 @@ export function hintOpenAuth(params = {}) {
       confirmText: platform === 'ios' ? '下一步' : '同意',
       success: (res) => {
         if (!res.confirm) return resolve(false)
-        uni.setStorageSync('authCode', code)
+        uni.setStorageSync('applyAuthCode', code)
         resolve(true)
         isOpenAuth && uni.openAppAuthorizeSetting()
       },

package/src/components/AuthPop.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- #ifdef APP -->
+  <!-- #ifdef APP-PLUS -->
   <view class="auth-pop" :style="{ marginTop: safeH }" v-if="isPermissionAlertShow">
     <view class="title">{{ type }}权限使用说明</view>
     <view class="msg">{{ contentEnum['android'][type] }}</view>
@@ -8,12 +8,13 @@
 </template>
 
 <script setup>
-// #ifdef APP
+// #ifdef APP-PLUS
 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)
+const systemInfo = ref(uni.getSystemInfoSync())
 const props = defineProps({
   top: {
     type: String,
@@ -21,16 +22,15 @@ const props = defineProps({
   },
 })
 onMounted(() => {
-  const systemInfo = uni.getSystemInfoSync()
-  if (systemInfo.platform !== 'ios') {
+  if (systemInfo.value.platform !== 'ios') {
     permissionListener.value = uni.createRequestPermissionListener()
     permissionListener.value.onConfirm((e) => {
-      type.value = uni.getStorageSync('authCode') || ''
-      uni.removeStorageSync('authCode')
+      type.value = uni.getStorageSync('applyAuthCode') || ''
       if (type.value) isPermissionAlertShow.value = true
     })
     permissionListener.value.onComplete((e) => {
       isPermissionAlertShow.value = false
+      uni.removeStorageSync('applyAuthCode')
     })
   }
 })
@@ -40,7 +40,9 @@ const safeH = computed(() => {
   return statusBarHeight + menuButtonHeight + 20 + 'px'
 })
 onUnmounted(() => {
-  permissionListener.value.stop()
+  if (systemInfo.value.platform !== 'ios') {
+    permissionListener.value.stop()
+  }
 })
 // #endif
 </script>
@@ -54,7 +56,7 @@ onUnmounted(() => {
   min-height: 120rpx;
   background: #f2f2f2;
   box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
-  z-index: 999;
+  z-index: 999999;
   border-radius: 14rpx;
   margin-left: 5%;
   margin-right: 5%;

package/src/index.js

@@ -2,12 +2,12 @@ import { appAuth } from './util/app.js'
 import { wxAuth } from './util/wx.js'
 export { default as AuthPop } from './components/AuthPop.vue'
 
-export async function ifUserAuth(code) {
+export async function ifUserAuth(code, msg) {
   // #ifdef APP-PLUS
-  return await appAuth(code)
+  return await appAuth(code, msg)
   // #endif
   // #ifdef MP-WEIXIN
-  return await wxAuth(code)
+  return await wxAuth(code, msg)
   // #endif
   return true
 }

package/src/util/app.js

@@ -13,9 +13,10 @@ const APP = {
     电话: 'android.permission.CALL_PHONE',
   },
 }
-export function appAuth(code = '相册') {
+export function appAuth(code = '相册', msg = '') {
   return new Promise((resolve, reject) => {
     const platform = uni.getSystemInfoSync().platform // ios/android
+    if (msg) contentEnum[platform][code] = msg
     if (platform === 'ios') {
       const permissionInfo = uni.getAppAuthorizeSetting()
       const authStatus = permissionInfo[APP[platform][code]]