提交 eac74259 authored 作者: haodaking's avatar haodaking

fix:修复登录失败的问题

上级 b261504e
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
}, },
"plugins": { "plugins": {
"tencentvideo": { "tencentvideo": {
"version": "1.5.2", "version": "2.0.5",
"provider": "wxa75efa648b60994b" "provider": "wxa75efa648b60994b"
} }
}, },
......
...@@ -27,38 +27,48 @@ Page({ ...@@ -27,38 +27,48 @@ Page({
}, },
// 获取用户code // 获取用户code
getCode(callback) { getCode(callback) {
wx.login({ return new Promise((resolve, reject) => {
success(res) { wx.login({
if (res.code) { success(res) {
callback && callback(res.code) if (res.code) {
} else { callback && callback(res.code)
resolve(res.code)
} else {
wx.showToast({ title: `登录失败!${res.errMsg}`, icon: 'none' })
reject(res)
}
},
fail(res) {
wx.showToast({ title: `登录失败!${res.errMsg}`, icon: 'none' }) wx.showToast({ title: `登录失败!${res.errMsg}`, icon: 'none' })
reject(res)
} }
}, })
fail(res) {
wx.showToast({ title: `登录失败!${res.errMsg}`, icon: 'none' })
}
}) })
}, },
// 获取用户信息 // 获取用户信息
getUserInfo(callback) { getUserInfo(callback) {
wx.getUserProfile({ return new Promise((resolve, reject) => {
desc: '登录注册', wx.getUserProfile({
success(res) { desc: '登录注册',
callback && callback(res) success(res) {
}, callback && callback(res)
fail(res) { resolve(res)
wx.showToast({ title: `获取用户信息失败!`, icon: 'none' }) },
} fail(res) {
wx.showToast({ title: `获取用户信息失败!`, icon: 'none' })
reject(res)
}
})
}) })
}, },
// 微信登录 // 微信登录
wechatLogin() { wechatLogin() {
// 获取code
const p1 = this.getCode()
// 获取用户信息 // 获取用户信息
this.getUserInfo(user => { const p2 = this.getUserInfo()
// 获取code Promise.all([p1, p2]).then(([code, user]) => {
this.getCode(code => { const { encryptedData, iv } = user
const { encryptedData, iv } = user
api.wechatLogin({ encryptedData, iv, code, identity: 'caas-mini' }).then(response => { api.wechatLogin({ encryptedData, iv, code, identity: 'caas-mini' }).then(response => {
if (response.code === 0) { if (response.code === 0) {
this.handleSuccess(response.data) this.handleSuccess(response.data)
...@@ -69,7 +79,6 @@ Page({ ...@@ -69,7 +79,6 @@ Page({
wx.showToast({ title: response.msg, icon: 'none' }) wx.showToast({ title: response.msg, icon: 'none' })
} }
}) })
})
}) })
}, },
// 手机号登录 // 手机号登录
......
...@@ -26,17 +26,19 @@ ...@@ -26,17 +26,19 @@
"disablePlugins": [], "disablePlugins": [],
"outputPath": "" "outputPath": ""
}, },
"useIsolateContext": true, "useIsolateContext": false,
"userConfirmedBundleSwitch": false, "userConfirmedBundleSwitch": false,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [], "packNpmRelationList": [],
"minifyWXSS": true, "minifyWXSS": true,
"disableUseStrict": false, "disableUseStrict": false,
"minifyWXML": true,
"showES6CompileOption": false, "showES6CompileOption": false,
"useCompilerPlugins": false "useCompilerPlugins": false,
"ignoreUploadUnusedFiles": true
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.12.2", "libVersion": "2.21.3",
"appid": "wxe26a76d121424527", "appid": "wxe26a76d121424527",
"projectname": "learnOnline", "projectname": "learnOnline",
"isGameTourist": false, "isGameTourist": false,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论