优化登录流程，移除openid检查，调整微信登录逻辑，清除token和openid

App.vue

@@ -1,11 +1,18 @@
 <script>
 import config from './config.js'
-import { getAccessToken, setOpenId, getOpenId } from '@/utils/auth'
+import {
+  getAccessToken,
+  setOpenId,
+  getOpenId,
+  removeToken,
+  removeOpenId
+} from '@/utils/auth'
 export default {
   data() {
     return {}
   },
   async onLaunch(options) {
+    removeToken()
     await this.initApp()
   },
   onShow() {

pages/login.vue

@@ -34,18 +34,10 @@ export default {
       await uni.hideTabBar({
         animation: false
       })
-      if (!getOpenId()) {
-        // 如果没有openid则获取
-        this.getWxOpenId().then(() => {
-          this.checkLogin()
-        })
-      } else {
-        // 检查用户登录状态
-        this.checkLogin()
-      }
+      // 检查用户登录状态
+      this.checkLogin()
     },
     checkLogin() {
-      console.log('accessToken', getAccessToken())
       if (!getAccessToken()) {
         // 如果没有token则获取
         this.login()
@@ -53,31 +45,28 @@ export default {
         this.loginSuccess()
       }
     },
-    getWxOpenId() {
-      return new Promise((resolve, reject) => {
-        uni.login({
-          success: res => {
-            // 注意：这里保存的是微信的授权码 code，不是真正的 openId
-            // code 是临时的，只能使用一次，有效期约5分钟
-            // 后续应该通过后端接口用 code 换取真正的 openId
-            setOpenId(res.code)
-            resolve()
-          },
-          fail: err => {
-            reject()
-          }
-        })
-      })
-    },
     login() {
-      const data = {
-        type: 34,
-        code: getOpenId(),
-        state: 'default',
-        userType: this.getUserType()
-      }
-      this.$store.dispatch('Login', data).then(() => {
-        this.loginSuccess()
+      uni.login({
+        success: res => {
+          console.log('微信code', res.code)
+          // 获取code
+          const data = {
+            type: 34,
+            code: res.code,
+            state: 'default',
+            userType: this.getUserType()
+          }
+          this.$store.dispatch('Login', data).then(() => {
+            this.loginSuccess()
+          })
+        },
+        fail: err => {
+          uni.showToast({
+            title: err,
+            duration: 2000,
+            icon: 'none'
+          })
+        }
       })
     },
     getUserType() {

utils/auth.js

@@ -17,6 +17,7 @@ export function setToken(token) {
 }
 
 export function removeToken() {
+	console.log('removeToken');
 	uni.removeStorageSync(AccessTokenKey)
 	uni.removeStorageSync(RefreshTokenKey)
 }
@@ -30,5 +31,6 @@ export function getOpenId() {
 }
 
 export function removeOpenId() {
+	console.log('removeOpenId');
 	uni.removeStorageSync(OpenIdKey)
 }