fix:修复登录失败的问题

learnOnline/app.json

@@ -61,7 +61,7 @@
   },
   "plugins": {
     "tencentvideo": {
-      "version": "2.0.2",
+      "version": "2.0.5",
       "provider": "wxa75efa648b60994b"
     }
   },

learnOnline/pages/login/index.js

@@ -27,38 +27,48 @@ 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 => {
-      // 获取code
-      this.getCode(code => {
-        const { encryptedData, iv } = user
+    const p2 = this.getUserInfo()
+    Promise.all([p1, p2]).then(([code, user]) => {
+      const { encryptedData, iv } = user
         api.wechatLogin({ encryptedData, iv, code, identity: 'classes-mini' }).then(response => {
           if (response.code === 0) {
             this.handleSuccess(response.data)
@@ -69,7 +79,6 @@ Page({
             wx.showToast({ title: response.msg, icon: 'none' })
           }
         })
-      })
     })
   },
   // 手机号登录

learnOnline/pages/login/index.wxml

-<main-page>
+<!-- <main-page> -->
   <view class="container">
     <image src="../../assets/images/bg.png" mode="aspectFill" class="bg"></image>
     <view class="top">
@@ -21,7 +21,7 @@
       </view>
     </view>
   </view>
-</main-page>
+<!-- </main-page> -->
 <!-- 绑定相关 -->
 <dialog title="{{ type === 1 ? '绑定账号' : '绑定手机号' }}" model:show="{{ show }}">
   <!-- 绑定账号 -->

learnOnline/project.config.json

@@ -26,17 +26,19 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
+    "useIsolateContext": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.12.2",
+  "libVersion": "2.21.3",
   "appid": "wx81555c44ed2d7653",
   "projectname": "learnOnline-enterprise",
   "isGameTourist": false,