diff --git a/app.js b/app.js index 2adb92c..25c6969 100644 --- a/app.js +++ b/app.js @@ -51,11 +51,6 @@ App({ }, fail: error => { console.log(error); - wx.showModal({ - title:'提示', - content: error.errMsg, - showCancel:false - }) } }); }, diff --git a/pages/index/index.js b/pages/index/index.js index 4f7ea9c..9405769 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -66,7 +66,57 @@ Page({ }) wx.setStorageSync('options', JSON.stringify(options)) wx.setStorageSync('imgurl', imgurl) - app.getLocation(); + + wx.getSetting({ + success: (res) => { + console.log(res) + if (res.authSetting['scope.userLocation'] != undefined && res.authSetting['scope.userLocation'] != true) {//非初始化进入该页面,且未授权 + wx.showModal({ + title: '是否授权当前位置', + content: '需要获取您的地理位置,请确认授权,否则无法获取您所需数据', + success: function (res) { + debugger; + if (res.cancel) { + wx.showToast({ + title: '授权失败', + icon: 'success', + duration: 1000 + }) + } else if (res.confirm) { + wx.openSetting({ + success: function (dataAu) { + if (dataAu.authSetting["scope.userLocation"] == true) { + wx.showToast({ + title: '授权成功', + icon: 'success', + duration: 1000 + }) + //再次授权,调用getLocationt的API + app.getLocation(); + } else { + wx.showToast({ + title: '授权失败', + icon: 'success', + duration: 1000 + }) + } + } + }) + } + } + }) + } else if (res.authSetting['scope.userLocation'] == undefined) { + //初始化进入 + app.getLocation(); + } + else { + //授权后默认加载 + app.getLocation(); + } + } + }) + + if (options.couponChannelId || options.orderId || options.id) { that.userLogin(options); } else { diff --git a/pages/passCar/passCar.js b/pages/passCar/passCar.js index f10cf5b..8cd9aa3 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -161,7 +161,55 @@ Page({ scene: scene }); if (app.globalData.token) { } else { - app.getLocation(); + // app.getLocation(); + wx.getSetting({ + success: (res) => { + console.log(res) + if (res.authSetting['scope.userLocation'] != undefined && res.authSetting['scope.userLocation'] != true) {//非初始化进入该页面,且未授权 + wx.showModal({ + title: '是否授权当前位置', + content: '需要获取您的地理位置,请确认授权,否则无法获取您所需数据', + success: function (res) { + debugger; + if (res.cancel) { + wx.showToast({ + title: '授权失败', + icon: 'success', + duration: 1000 + }) + } else if (res.confirm) { + wx.openSetting({ + success: function (dataAu) { + if (dataAu.authSetting["scope.userLocation"] == true) { + wx.showToast({ + title: '授权成功', + icon: 'success', + duration: 1000 + }) + //再次授权,调用getLocationt的API + app.getLocation(); + } else { + wx.showToast({ + title: '授权失败', + icon: 'success', + duration: 1000 + }) + } + } + }) + } + } + }) + } else if (res.authSetting['scope.userLocation'] == undefined) { + //初始化进入 + app.getLocation(); + } + else { + //授权后默认加载 + app.getLocation(); + } + } + }) that.userLogin() } },