fix:修复登录失败的问题

learnOnline/app.json

@@ -60,8 +60,8 @@
     "van-collapse-item": "@vant/weapp/collapse-item/index"
   },
   "plugins": {
-    "player": {
-      "version": "2.0.3",
+    "tencentvideo": {
+      "version": "2.0.5",
       "provider": "wxa75efa648b60994b"
     }
   },

learnOnline/pages/login/index.js

@@ -27,37 +27,47 @@ 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() {
-    // 获取用户信息
-    this.getUserInfo(user => {
    // 获取code
-      this.getCode(code => {
+    const p1 = this.getCode()
+    // 获取用户信息
+    const p2 = this.getUserInfo()
+    Promise.all([p1, p2]).then(([code, user]) => {
       const { encryptedData, iv } = user
         api.wechatLogin({ encryptedData, iv, code, identity: 'kelley-mini' }).then(response => {
           if (response.code === 0) {
@@ -70,7 +80,6 @@ Page({
           }
         })
     })
-    })
   },
   // 手机号登录
   phoneLogin() {

learnOnline/project.config.json

@@ -36,7 +36,7 @@
     "minifyWXSS": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.14.1",
+  "libVersion": "2.21.3",
   "appid": "wxf77457fef076f8a6",
   "projectname": "learnOnline",
   "isGameTourist": false,