fix:修复登录失败的问题

learnOnline/pages/login/index.js

@@ -27,57 +27,68 @@ Page({
   },
   // 获取用户code
   getCode(callback) {
-    wx.login({
-      success(res) {
-        if (res.code) {
-          callback && callback(res.code)
-        } else {
+    return new Promise((resolve, reject) => {
+      wx.login({
+        success(res) {
+          if (res.code) {
+            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' })
+          reject(res)
         }
-      },
-      fail(res) {
-        wx.showToast({ title: `登录失败！${res.errMsg}`, icon: 'none' })
-      }
+      })
     })
   },
   // 获取用户信息
   getUserInfo(callback) {
-    wx.getUserProfile({
-      desc: '登录注册',
-      success(res) {
-        callback && callback(res)
-      },
-      fail(res) {
-        wx.showToast({ title: `获取用户信息失败！`, icon: 'none' })
-      }
+    return new Promise((resolve, reject) => {
+      wx.getUserProfile({
+        desc: '登录注册',
+        success(res) {
+          callback && callback(res)
+          resolve(res)
+        },
+        fail(res) {
+          wx.showToast({ title: `获取用户信息失败！`, icon: 'none' })
+          reject(res)
+        }
+      })
     })
   },
   // 微信登录
   wechatLogin() {
+    // 获取code
+    const p1 = this.getCode()
     // 获取用户信息
-    this.getUserInfo(user => {
+    const p2 = this.getUserInfo()
+    Promise.all([p1, p2]).then(([code, user]) => {
       const { encryptedData, iv } = user
-      // 获取code
-      this.getCode(code => {
-        api.wechatLogin({ encryptedData, iv, code, identity: 'ciis-mini' }).then(response => {
-          if (response.code === 0) {
-            this.handleSuccess(response.data)
-          } else if (response.code === 2) {
-            // 绑定手机号
-            this.setData({ show: true, unionid: response.data.unionid })
+      api.wechatLogin({ encryptedData, iv, code, identity: 'ciis-mini' }).then(response => {
+        if (response.code === 0) {
+          this.handleSuccess(response.data)
+        } else if (response.code === 2) {
+          // 绑定手机号
+          this.setData({ show: true, unionid: response.data.unionid })
+        } else {
+          if (response.msg === '账号不存在') {
+            wx.showModal({ title: '账号不存在', content: '是否要成为学员', showCancel: true }).then(res => {
+              res.confirm &&
+                wx.navigateTo({
+                  url: `/pages/web/index?url=${encodeURIComponent(
+                    'https://webapp-pub.ezijing.com/pages/ciis/ciis.html?channel_num=96091'
+                  )}`
+                })
+            })
           } else {
-            if (response.msg === '账号不存在') {
-              wx.showModal({ title: '账号不存在', content: '是否要成为学员', showCancel: true }).then(res => {
-                res.confirm &&
-                  wx.navigateTo({
-                    url: `/pages/web/index?url=${encodeURIComponent('https://webapp-pub.ezijing.com/pages/ciis/ciis.html?channel_num=96091')}`
-                  })
-              })
-            } else {
-              wx.showToast({ title: response.msg, icon: 'none' })
-            }
+            wx.showToast({ title: response.msg, icon: 'none' })
           }
-        })
+        }
       })
     })
   },