fix:修复登录失败的问题

learnOnline/pages/login/index.js

@@ -27,38 +27,48 @@ Page({
   },
   // 获取用户code
   getCode(callback) {
+    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)
         }
       })
+    })
   },
   // 获取用户信息
   getUserInfo(callback) {
+    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)
@@ -70,7 +80,9 @@ Page({
             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')}`
+                  url: `/pages/web/index?url=${encodeURIComponent(
+                    'https://webapp-pub.ezijing.com/pages/ciis/ciis.html?channel_num=96091'
+                  )}`
                 })
             })
           } else {
@@ -79,7 +91,6 @@ Page({
         }
       })
     })
-    })
   },
   // 手机号登录
   phoneLogin() {