Browse Source

登录发请求时排除当前应用以及碧合登录默认显示普通账号和密码登录界面

hangb 7 years ago
parent
commit
119a1ce5e2

+ 4 - 2
components/mobile/loginMobile.vue

@@ -94,7 +94,7 @@
         bhToken: '',
         bhImg: '',
         bhName: '',
-        activeTab: 1
+        activeTab: 0
       }
     },
     mounted () {
@@ -290,7 +290,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         Promise.all(promises).then(() => {
           crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)

+ 3 - 1
components/mobile/registerEnterprise/index.vue

@@ -537,7 +537,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         let returnUrl = decodeURIComponent(this.$route.query.returnURL)
         Promise.all(promises).then(() => {

+ 3 - 1
components/mobile/registerPersonal/index.vue

@@ -351,7 +351,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         let returnUrl = decodeURIComponent(this.$route.query.returnURL)
         Promise.all(promises).then(() => {

+ 6 - 2
components/register/EnterpriseRegistration.vue

@@ -851,7 +851,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         let returnUrl = decodeURIComponent(this.$route.query.returnURL)
         Promise.all(promises).then(() => {
@@ -864,7 +866,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         Promise.all(promises).then(() => {
           crossAfter('/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath || '/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath, timeout)

+ 6 - 2
components/register/PersonalRegistration.vue

@@ -570,7 +570,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         let returnUrl = decodeURIComponent(this.$route.query.returnURL)
         Promise.all(promises).then(() => {
@@ -583,7 +585,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         Promise.all(promises).then(() => {
           crossAfter('/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath || '/overRegister/cityRegisterOver/' + this.$store.state.option.fullPath, timeout)

+ 3 - 1
pages/agency/index.vue

@@ -135,7 +135,9 @@
         const crossAfter = this.crossAfter
         let promises = []
         for (let i in response.data.content.loginUrls) {
-          promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          if (response.data.content.currentUrl !== response.data.content.loginUrls[i]) {
+            promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?${a}`))
+          }
         }
         Promise.all(promises).then(() => {
           crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com', timeout)

+ 1 - 1
server.js

@@ -3,7 +3,7 @@ const app = require('express')()
 const proxy = require('http-proxy-middleware')
 const cookiejar = require('cookiejar')
 const host = process.env.HOST || '127.0.0.1'
-const port = process.env.PORT || 80
+const port = process.env.PORT || 3001
 process.noDeprecation = true
 
 app.set('port', port)