|
@@ -2,12 +2,15 @@ import {
|
|
|
imgServerUrl
|
|
imgServerUrl
|
|
|
} from '../../config/config.js'
|
|
} from '../../config/config.js'
|
|
|
import {
|
|
import {
|
|
|
|
|
+ getWxCode,
|
|
|
|
|
+ hasAuth,
|
|
|
getUserInfo
|
|
getUserInfo
|
|
|
} from '../../utils/wx.js'
|
|
} from '../../utils/wx.js'
|
|
|
import {
|
|
import {
|
|
|
updataStorageData
|
|
updataStorageData
|
|
|
} from '../../utils/storage.js'
|
|
} from '../../utils/storage.js'
|
|
|
import {
|
|
import {
|
|
|
|
|
+ wxLogin,
|
|
|
saveLogin
|
|
saveLogin
|
|
|
} from '../../services/wx.js'
|
|
} from '../../services/wx.js'
|
|
|
var app = getApp()
|
|
var app = getApp()
|
|
@@ -19,14 +22,22 @@ Page({
|
|
|
onLoad: function() {
|
|
onLoad: function() {
|
|
|
|
|
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+ //用户授权
|
|
|
bindGetUserInfo: function(e) {
|
|
bindGetUserInfo: function(e) {
|
|
|
|
|
+ //检查登录态
|
|
|
|
|
+ wx.checkSession({
|
|
|
|
|
+ success() {
|
|
|
|
|
+ //session_key 未过期,并且在本生命周期一直有效
|
|
|
|
|
+ },
|
|
|
|
|
+ fail() {
|
|
|
|
|
+ // session_key 已经失效,需要重新执行登录流程
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
if (e.detail.userInfo) {
|
|
if (e.detail.userInfo) {
|
|
|
//用户按了允许授权按钮
|
|
//用户按了允许授权按钮
|
|
|
getUserInfo().then(res => {
|
|
getUserInfo().then(res => {
|
|
|
- if (!updataStorageData('city')) {
|
|
|
|
|
- updataStorageData('city', res.userInfo.city)
|
|
|
|
|
- }
|
|
|
|
|
saveLogin({
|
|
saveLogin({
|
|
|
encryptedData: encodeURIComponent(res.encryptedData),
|
|
encryptedData: encodeURIComponent(res.encryptedData),
|
|
|
iv: encodeURIComponent(res.iv),
|
|
iv: encodeURIComponent(res.iv),
|