From acace8dc21cb729cb3bc0b1f62493e78a674e888 Mon Sep 17 00:00:00 2001
From: scout <1134087124@qq.com>
Date: Thu, 12 Dec 2024 09:31:54 +0800
Subject: [PATCH] changemain
---
config/index.js | 16 ++++----
pages/index/index.vue | 88 ++++++++++++++++++++++---------------------
2 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/config/index.js b/config/index.js
index 9e0128d..be60f7e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,20 +1,20 @@
-const env = 'prod';
+const env = 'prod';
const configs = {
- LocalTest: {
- apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
- h5Url:'http://192.168.88.30:8080/#/'
- },
+ LocalTest: {
+ apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
+ h5Url: 'http://192.168.88.61:2367/#/'
+ },
dev: {
apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
- h5Url:'http://192.168.88.47:2367/#/'
+ h5Url: 'http://192.168.88.47:2367/#/'
},
test: {
apiBaseUrl: 'https://warehouse.szjixun.cn/oa_backend',
- h5Url:'http://114.218.158.24:8042/#/'
+ h5Url: 'http://114.218.158.24:8042/#/'
},
prod: {
apiBaseUrl: 'https://oa-a.szjixun.cn/api',
- h5Url:'https://oa-a.szjixun.cn/#/'
+ h5Url: 'https://oa-a.szjixun.cn/#/'
},
};
const config = configs[env];
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1ddb55a..110776e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,52 +42,54 @@ const shareH5 = () => {
}
});
}
-// import {
-// registerRequestPermissionTipsListener,
-// unregisterRequestPermissionTipsListener,
-// setRequestPermissionTips
-// } from "@/uni_modules/uni-registerRequestPermissionTips"
+import {
+ registerRequestPermissionTipsListener,
+ unregisterRequestPermissionTipsListener,
+ setRequestPermissionTips
+} from "@/uni_modules/uni-registerRequestPermissionTips"
-// const PermissionTips = {
-// "android.permission.READ_PHONE_STATE": "正在读取网络状态权限
通讯录权限不会获取任何信息，请注意通讯录权限不会获取任何信息，请注意通讯录权限不会获取任何信息，请注意",
-// "android.permission.CAMERA": "正在访问相机权限
需要扫描二维码或拍照，是否允许打开相机？",
-// "android.permission.WRITE_EXTERNAL_STORAGE": "正在读取相册权限
我们需要获取访问您设备相册的权限，以便您能够选择并上传图片或视频到我们的应用中。"
-// }
-// onExit(() => {
-// unregisterRequestPermissionTipsListener()
-// })
+const PermissionTips = {
+ "android.permission.READ_PHONE_STATE": "正在读取网络状态权限
通讯录权限不会获取任何信息，请注意通讯录权限不会获取任何信息，请注意通讯录权限不会获取任何信息，请注意",
+ "android.permission.CAMERA": "正在访问相机权限
需要扫描二维码或拍照，是否允许打开相机？",
+ "android.permission.WRITE_EXTERNAL_STORAGE": "正在读取相册权限
我们需要获取访问您设备相册的权限，以便您能够选择并上传图片或视频到我们的应用中。",
+ "android.permission.ACCESS_FINE_LOCATION": "正在访问位置权限
需要获取您的位置信息，以便您能够进行考勤打卡。",
+ "android.permission.ACCESS_COARSE_LOCATION": "正在访问位置权限
需要获取您的位置信息，以便您能够进行考勤打卡。"
+}
+onExit(() => {
+ unregisterRequestPermissionTipsListener()
+})
-// const brand = uni.getSystemInfoSync().deviceBrand
-// setRequestPermissionTips(PermissionTips)
-// registerRequestPermissionTipsListener({
-// onRequest: (e) => {
-// console.log('onRequest', e)
-// },
-// onConfirm: (e) => {
-// commun.sendToH5('permission-application', { action: 'open-permission', data: e });
-// },
-// onComplete: (e) => {
-// commun.sendToH5('permission-application', { action: 'close-permission', data: e });
+const brand = uni.getSystemInfoSync().deviceBrand
+setRequestPermissionTips(PermissionTips)
+registerRequestPermissionTipsListener({
+ onRequest: (e) => {
+ console.log('onRequest', e)
+ },
+ onConfirm: (e) => {
+ // commun.sendToH5('permission-application', { action: 'open-permission', data: e });
+ },
+ onComplete: (e) => {
+ commun.sendToH5('permission-application', { action: 'close-permission', data: e });
-// // 华为手机在权限禁止之后，再次申请权限不会出现权限申请框。此时应该引导用户去系统设置开启此权限，不应该频繁申请。
-// if (brand.toLowerCase() === "huawei") {
-// const tips = {}
-// let hasDeniedPermission = false
-// for (let k in PermissionTips) {
-// if (e[k] !== "denied") {
-// tips[k] = PermissionTips[k]
-// } else {
-// hasDeniedPermission = true
-// }
-// }
-// setRequestPermissionTips(tips) // 更新弹框提醒，防止华为手机不出现权限申请框时权限提醒框闪烁的情况
-// if (hasDeniedPermission)
-// uni.showModal({
-// content: "权限已经被拒绝，请前往设置中开启"
-// })
-// }
-// }
-// })
+ // 华为手机在权限禁止之后，再次申请权限不会出现权限申请框。此时应该引导用户去系统设置开启此权限，不应该频繁申请。
+ if (brand.toLowerCase() === "huawei") {
+ const tips = {}
+ let hasDeniedPermission = false
+ for (let k in PermissionTips) {
+ if (e[k] !== "denied") {
+ tips[k] = PermissionTips[k]
+ } else {
+ hasDeniedPermission = true
+ }
+ }
+ setRequestPermissionTips(tips) // 更新弹框提醒，防止华为手机不出现权限申请框时权限提醒框闪烁的情况
+ if (hasDeniedPermission)
+ uni.showModal({
+ content: "权限已经被拒绝，请前往设置中开启"
+ })
+ }
+ }
+})
const webLoad = (e) => {
const message = e.detail.data?.[0] || '';
commun.handleMessage(message);