diff --git a/pages/index/index.js b/pages/index/index.js index 9405769..4f7ea9c 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -66,57 +66,7 @@ Page({ }) wx.setStorageSync('options', JSON.stringify(options)) wx.setStorageSync('imgurl', imgurl) - - 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(); - } - } - }) - - + 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 8cd9aa3..f10cf5b 100644 --- a/pages/passCar/passCar.js +++ b/pages/passCar/passCar.js @@ -161,55 +161,7 @@ Page({ scene: scene }); if (app.globalData.token) { } else { - // 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(); - } - } - }) + app.getLocation(); that.userLogin() } },