修改登录通知逻辑

components/login/Login.vue

@@ -330,20 +330,28 @@
                   for (let n in param) {
                     a += (n + '=' + param[n] + '&')
                   }
-                  const crossAfter = this.crossAfter
-                  let promises = []
-                  for (let i in response.data.content.loginUrls) {
-                    promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
-                  }
-                  Promise.all(promises).then(() => {
-                    crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
-                  }).catch(() => {
-                    crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
-                  })
                   this.isShowLoading = true
-//                  setTimeout(function () {
-//                    window.location.href = response.data.content.returnUrl || 'http://www.ubtob.com'
-//                  }, 3000)
+                  this.$jsonp(`${response.data.content.currentUrl}?${a.substr(0, a.length - 1)}`, {
+                    name: 'successCallback',
+                    timeout: 3000
+                  }, (err, data) => {
+                    if (err) {
+                      this.$message.error('登录超时，请重试')
+                      this.isShowLoading = false
+                      throw err
+                    } else {
+                      const crossAfter = this.crossAfter
+                      let promises = []
+                      for (let i in response.data.content.loginUrls) {
+                        promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
+                      }
+                      Promise.all(promises).then(() => {
+                        crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                      }).catch(() => {
+                        crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                      })
+                    }
+                  })
                 }
               } else {
                 this.$message.error(response.data)
@@ -384,7 +392,7 @@
         return new Promise((resolve, reject) => {
           this.$jsonp(url, {
             name: 'successCallback',
-            timeout: 1500
+            timeout: 500
           }, function (err, data) {
             if (err) {
               reject(err)

components/mobile/loginMobile.vue

@@ -155,25 +155,28 @@
                 for (let n in param) {
                   a += (n + '=' + param[n] + '&')
                 }
-                // for (let i in response.data.content.loginUrls) {
-                //   this.$jsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1), function (err) {
-                //     if (err) throw err
-                //   })
-                // }
                 this.$indicator.open('跳转中...')
-                const crossAfter = this.crossAfter
-                let promises = []
-                for (let i in response.data.content.loginUrls) {
-                  promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
-                }
-                Promise.all(promises).then(() => {
-                  crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
-                }).catch(() => {
-                  crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                this.$jsonp(`${response.data.content.currentUrl}?${a.substr(0, a.length - 1)}`, {
+                  name: 'successCallback',
+                  timeout: 5000
+                }, (err, data) => {
+                  if (err) {
+                    this.$indicator.open('登录超时，请重试')
+                    this.$indicator.close()
+                    throw err
+                  } else {
+                    const crossAfter = this.crossAfter
+                    let promises = []
+                    for (let i in response.data.content.loginUrls) {
+                      promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
+                    }
+                    Promise.all(promises).then(() => {
+                      crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                    }).catch(() => {
+                      crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                    })
+                  }
                 })
-                // setTimeout(function () {
-                //   window.location.href = response.data.content.returnUrl || 'http://www.ubtob.com'
-                // }, 3000)
               }
             } else {
               this.login.password = ''
@@ -206,7 +209,7 @@
         return new Promise((resolve, reject) => {
           this.$jsonp(url, {
             name: 'successCallback',
-            timeout: 5000
+            timeout: 500
           }, function (err, data) {
             if (err) {
               reject(err)

pages/agency/index.vue

@@ -75,15 +75,26 @@
                 for (let n in param) {
                   a += (n + '=' + param[n] + '&')
                 }
-                const crossAfter = this.crossAfter
-                let promises = []
-                for (let i in response.data.content.loginUrls) {
-                  promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
-                }
-                Promise.all(promises).then(() => {
-                  crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
-                }).catch(() => {
-                  crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                this.$jsonp(`${response.data.content.currentUrl}?${a.substr(0, a.length - 1)}`, {
+                  name: 'successCallback',
+                  timeout: 5000
+                }, (err, data) => {
+                  if (err) {
+                    this.$indicator.open('登录超时，请重试')
+                    this.$indicator.close()
+                    throw err
+                  } else {
+                    const crossAfter = this.crossAfter
+                    let promises = []
+                    for (let i in response.data.content.loginUrls) {
+                      promises.push(this.getJsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1)))
+                    }
+                    Promise.all(promises).then(() => {
+                      crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                    }).catch(() => {
+                      crossAfter(response.data.content.returnUrl || 'http://www.ubtob.com')
+                    })
+                  }
                 })
                 // for (let i in response.data.content.loginUrls) {
                 //   this.$jsonp(`${response.data.content.loginUrls[i]}?` + a.substr(0, a.length - 1), function (err, data) {
@@ -108,7 +119,7 @@
         return new Promise((resolve, reject) => {
           this.$jsonp(url, {
             name: 'successCallback',
-            timeout: 5000
+            timeout: 500
           }, function (err, data) {
             if (err) {
               reject(err)