登陆

src/utils/util.js

@@ -292,7 +292,8 @@ function getUserInfoByBtn(userInfo) {
       mask: true
     })
     const currentEnv = wx.getStorageSync('_qyWeChat')
-    let currentLoginUrl = currentEnv ? `/member/qiyeweixin/minaLogin` : `/member/minaLogin`
+    // let currentLoginUrl = currentEnv ? `/member/qiyeweixin/minaLogin` : `/member/minaLogin`
+    let currentLoginUrl = `/member/minaLogin`
     console.log('登陆', currentLoginUrl)
 
     return wxService.post(`${currentLoginUrl}`, {

src/utils/wxService.js

@@ -163,28 +163,37 @@ class WXService extends Http {
     const currentEnv = wx.getStorageSync('_qyWeChat')
     console.log('全局', currentEnv)
     return new Promise((resolve, reject) => {
+      wx.login({
+        success: (res) => {
+          resolve(res)
+          wx.setStorageSync('_loginCode', res.code)
+        },
+        fail: (res) => {
+          reject(res)
+        }
+      })
       // 企业 wx.qy.login
-      if (currentEnv) {
-        wx.qy.login({
-          success: (res) => {
-            resolve(res)
-            wx.setStorageSync('_loginCode', res.code)
-          },
-          fail: (res) => {
-            reject(res)
-          }
-        })
-      } else {
-        wx.login({
-          success: (res) => {
-            resolve(res)
-            wx.setStorageSync('_loginCode', res.code)
-          },
-          fail: (res) => {
-            reject(res)
-          }
-        })
-      }
+      // if (currentEnv) {
+      //   wx.qy.login({
+      //     success: (res) => {
+      //       resolve(res)
+      //       wx.setStorageSync('_loginCode', res.code)
+      //     },
+      //     fail: (res) => {
+      //       reject(res)
+      //     }
+      //   })
+      // } else {
+      //   wx.login({
+      //     success: (res) => {
+      //       resolve(res)
+      //       wx.setStorageSync('_loginCode', res.code)
+      //     },
+      //     fail: (res) => {
+      //       reject(res)
+      //     }
+      //   })
+      // }
     })
   }