Merge remote-tracking branch 'origin/dev' into dev

components/login/Login.vue

@@ -680,7 +680,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)