完善企微产品库自动登录

src/pages/login.vue

@@ -51,6 +51,22 @@ export default {
     handleLogin() {
       this.$refs.loginForm.validate(v => {
         if (v) {
+          this.handleSignIn({...this.form, module, corpId})
+        }
+      })
+    },
+    handleLogout() {
+      this.$http.delete("/auth/token/logout").finally(() => this.logout())
+    },
+    handleSignIn(params) {
+      this.getSystem().then(({module, corpId}) => this.getToken({...params, module, corpId}).then(() => {
+        if (module != 'AppCountryAlbum') {
+          this.getAccount({module})
+        }
+        this.target ? uni.reLaunch({url: this.target}) : uni.navigateBack({})
+      }).catch(() => 0))
+    },
+    getSystem() {
       let {name: module, libPath} = this.currentApp,
           corpId = 'ww596787bb70f08288'
       if (/\/project\/police\//.test(libPath)) {
@@ -64,41 +80,17 @@ export default {
         module = 'wangge'
       }
       this.setModule(module)
-          this.getToken({...this.form, module, corpId}).then(() => {
+      return {corpId, module}
-              if (module != 'AppCountryAlbum') {
-                this.getAccount({module})
-              }
-              this.target ? uni.reLaunch({url: this.target}) : uni.navigateBack({})
-          }).catch(() => 0)
-        }
-      })
-    },
-    handleLogout() {
-      this.$http.delete("/auth/token/logout").finally(() => this.logout())
     }
   },
   onShow() {
     if (/wxwork/.test(navigator.userAgent)) {
       //在企微端
       if (this.$route.query.code) {
-        let {name: module, libPath} = this.currentApp,
+        const {code} = this.$route.query
-            corpId = 'ww596787bb70f08288'
+        this.handleSignIn({code})
-        if (/\/project\/police\//.test(libPath)) {
-          module = 'hnjc'
-        } else if (/\/project\/beta\//.test(libPath)) {
-          corpId = 'ww2a667717a70164f1'
-          module = 'wangge'
-        }
-        let {code} = this.$route.query
-        this.getToken({code}).then(() => {
-            if (module != 'AppCountryAlbum') {
-              this.getAccount({module})
-            }
-            this.target ? uni.reLaunch({url: this.target}) : uni.navigateBack({})
-        }).catch(err => {
-          this.err = err
-        })
       } else {
+        this.getSystem()
         this.getCode().catch(err => {
           this.err = err
         })