|
@@ -46,6 +46,20 @@ const getScopeDesc = (name) => {
|
|
|
return title
|
|
return title
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+const settingModal = (content) => {
|
|
|
|
|
+ uni.showModal({
|
|
|
|
|
+ title: '提示',
|
|
|
|
|
+ content,
|
|
|
|
|
+ confirmText: '去设置',
|
|
|
|
|
+ cancelText: '暂不设置',
|
|
|
|
|
+ confirmColor: '#EF9944',
|
|
|
|
|
+ success: data => {
|
|
|
|
|
+ if (data.confirm) {
|
|
|
|
|
+ uni.openSetting();
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
//打开设置
|
|
//打开设置
|
|
|
const openSetting = (authName) => {
|
|
const openSetting = (authName) => {
|
|
@@ -56,21 +70,24 @@ const openSetting = (authName) => {
|
|
|
uni.getSetting({
|
|
uni.getSetting({
|
|
|
success: (res) => {
|
|
success: (res) => {
|
|
|
console.log(res.authSetting);
|
|
console.log(res.authSetting);
|
|
|
- if (res.authSetting[authName]) {
|
|
|
|
|
|
|
+ let status = res.authSetting[authName]
|
|
|
|
|
+ if (status == undefined) {
|
|
|
|
|
+ //首次授权
|
|
|
|
|
+ uni.authorize({
|
|
|
|
|
+ scope: authName,
|
|
|
|
|
+ success: (res) => {
|
|
|
|
|
+ //成功授权
|
|
|
|
|
+ resolve(res)
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ if (status) {
|
|
|
|
|
+ // 已授权
|
|
|
resolve(res)
|
|
resolve(res)
|
|
|
} else {
|
|
} else {
|
|
|
- uni.showModal({
|
|
|
|
|
- title: '提示',
|
|
|
|
|
- content,
|
|
|
|
|
- confirmText: '去设置',
|
|
|
|
|
- cancelText: '暂不设置',
|
|
|
|
|
- confirmColor: '#EF9944',
|
|
|
|
|
- success: data => {
|
|
|
|
|
- if (data.confirm) {
|
|
|
|
|
- uni.openSetting();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ //未授权
|
|
|
|
|
+ settingModal(content)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -294,13 +311,4 @@ mpi.versioning = (minVersion) => {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
export default mpi
|
|
export default mpi
|