修改登录逻辑

App.vue

@@ -14,12 +14,6 @@ export default {
       uni.hideTabBar()
       // 初始化应用配置
       this.initConfig()
-      if (!getOpenId()) {
-        this.applogin()
-        return
-      }
-      // 检查用户登录状态
-      // this.checkLogin()
     },
     initConfig() {
       this.globalData.config = config
@@ -33,21 +27,6 @@ export default {
           console.error('获取设备信息失败：', err)
         }
       })
-    },
-    checkLogin() {
-      if (!getAccessToken()) {
-        this.$tab.reLaunch('/pages/login')
-      }
-    },
-    async applogin() {
-      uni.login({
-        success: res => {
-          setOpenId(res.code)
-        },
-        fail: err => {
-          console.log('getOpenIdFail', err)
-        }
-      })
     }
   }
 }

pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [{
+			"path": "pages/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/index",
 			"style": {
 				"navigationBarTitleText": "首页",
@@ -10,13 +16,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/login",
-			"style": {
-				"navigationBarTitleText": "登录",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/enterprise",
 			"style": {

pages/login.vue

@@ -32,39 +32,53 @@ export default {
     // 初始化应用
     async initApp() {
       await uni.hideTabBar()
+      console.log('initapp')
       uni.hideTabBar({
         animation: false
       })
-      // 检查用户登录状态
-      this.checkLogin()
+      if (!getOpenId()) {
+        // 如果没有openid则获取
+        this.getWxOpenId().then(() => {
+          this.checkLogin()
+        })
+      } else {
+        // 检查用户登录状态
+        this.checkLogin()
+      }
     },
     checkLogin() {
       console.log('accessToken', getAccessToken())
       if (!getAccessToken()) {
+        // 如果没有token则获取
         this.login()
       } else {
         this.loginSuccess()
       }
     },
-    login() {
-      console.log('openId', getOpenId())
-      if (getOpenId()) {
-        clearTimeout(this.timer)
-        const data = {
-          type: 34,
-          code: getOpenId(),
-          state: 'default',
-          userType: this.getUserType()
-        }
-        this.$store.dispatch('Login', data).then(() => {
-          this.loginSuccess()
+    getWxOpenId() {
+      return new Promise((resolve, reject) => {
+        uni.login({
+          success: res => {
+            setOpenId(res.code)
+            resolve()
+          },
+          fail: err => {
+            console.log('getOpenIdFail', err)
+            reject()
+          }
         })
-      } else {
-        this.timer && clearTimeout(this.timer)
-        this.timer = setTimeout(() => {
-          this.login()
-        }, 200)
+      })
+    },
+    login() {
+      const data = {
+        type: 34,
+        code: getOpenId(),
+        state: 'default',
+        userType: this.getUserType()
       }
+      this.$store.dispatch('Login', data).then(() => {
+        this.loginSuccess()
+      })
     },
     getUserType() {
       // 企业邀请
@@ -76,15 +90,10 @@ export default {
     loginSuccess() {
       this.$store.dispatch('GetInfo').then(res => {
         this.handlerNavigateTo(res.data.user)
+        console.log('user', res.data.user)
       })
     },
     handlerNavigateTo(user) {
-      if (this.redirect) {
-        uni.reLaunch({
-          url: this.redirect
-        })
-        return
-      }
       // 邀请企业
       if (this.inviteId) {
         uni.reLaunch({
@@ -93,19 +102,11 @@ export default {
         return
       }
 
-      // 审核中
-      if (user.audit == 1) {
-        uni.reLaunch({
-          url: '/sub/common/waiting'
-        })
-        return
-      }
-
       // 局内用户首次登录
-      if (user.audit == null) {
+      if (user.audit == null || user.audit == 1) {
         // 局内用户首次登录
         uni.reLaunch({
-          url: '/sub/owner/edit'
+          url: `/sub/owner/edit?audit=${user.audit}`
         })
         return
       }

sub/invite/addEnterprise.vue

@@ -274,7 +274,7 @@ export default {
       this.form.tags = data
     })
     uni.$on('prove', data => {
-      if (this.form.id) {
+      if (this.form.id != '') {
         this.getProve()
       } else {
         this.prove.push(data)

sub/owner/edit.vue

@@ -137,7 +137,10 @@ export default {
       }
     }
   },
-  async onLoad() {
+  async onLoad(options) {
+    if (options.audit) {
+      this.form.audit = options.audit
+    }
     await this.getDict()
   },
   onShow() {
@@ -157,9 +160,12 @@ export default {
       }
     },
     init() {
-      getUserProfile().then(res => {
-        this.form = res.data
-      })
+      console.log('登录信息', this.$store.getters)
+      if (this.$store.getters.userId) {
+        getUserProfile().then(res => {
+          this.form = res.data
+        })
+      }
     },
     async getDict() {
       const dict = await getDictBatchByType({

sub/owner/invite.vue

@@ -24,7 +24,7 @@ export default {
   onShareAppMessage() {
     return {
       title: '邀请企业入驻',
-      path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`,
+      path: `/pages/login?inviteId=${this.$store.getters.userId}`,
       imageUrl:
         'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ'
     }
@@ -32,7 +32,7 @@ export default {
   onShareTimeline() {
     return {
       title: '邀请企业入驻', // 标题
-      path: `/sub/invite/index?inviteId=${this.$store.getters.userId}`,
+      path: `/pages/login?inviteId=${this.$store.getters.userId}`,
       imageUrl:
         'http://82.156.141.150:9001/api/v1/download-shared-object/aHR0cDovL2xvY2FsaG9zdDo5MDAwL2h1YW5iYW8vbWluaWFwcC9pbnZhdGUucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUQxODY1RVA2NEczMEdEUUhDVTglMkYyMDI1MDIxOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMThUMDcyMDI0WiZYLUFtei1FeHBpcmVzPTQzMTk5JlgtQW16LVNlY3VyaXR5LVRva2VuPWV5SmhiR2NpT2lKSVV6VXhNaUlzSW5SNWNDSTZJa3BYVkNKOS5leUpoWTJObGMzTkxaWGtpT2lKQlJERTROalZGVURZMFJ6TXdSMFJSU0VOVk9DSXNJbVY0Y0NJNk1UY3pPVGt3TmpJME55d2ljR0Z5Wlc1MElqb2lZV1J0YVc0aWZRLmp6djBhdEY5QVBYXzVjYWg4c18yeXhVV3oxek9BekFzSVdzemVrUmZwcXlHd0RPWkptazlUSGJRUnBDdVNmLVMyU0otWTI1cldUd2hpNUlrY0xBSThRJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCZ2ZXJzaW9uSWQ9bnVsbCZYLUFtei1TaWduYXR1cmU9MjcxZTkzOTE1MDkwYzUzYmRjYTg0MjQ1MTJhYjk3ZWQxZWMyN2QzM2MwM2U3NGUwYmRhNTBmYjQyNWI0N2MyOQ'
     }

utils/permission.js

@@ -36,6 +36,9 @@ export function checkRole(value) {
 		console.log(roles);
 		const permissionRoles = value
 		const super_admin = "admin"
+		if (!roles) {
+			return false
+		}
 		const hasRole = roles.some(role => {
 			return super_admin === role || permissionRoles.includes(role)
 		})