Merge branch 'master' into release-20170915

pages/auth/logout.vue

@@ -4,7 +4,6 @@
   </div>
 </template>
 <script>
-
 export default {
   layout: 'login',
   mounted () {
@@ -15,18 +14,20 @@ export default {
       try {
         let { data } = await this.$http.get('/logout/crossBefore')
         const params = data || {}
-        this.proxyLogout(params.askUrl, params.returnUrl)
+        this.proxyLogout(params.askUrl, params.returnUrl, params.logoutUrl)
       } catch (err) {
         this.$router.replace('/')
         console.log(err)
       }
     },
-    proxyLogout (askUrl, returnUrl) {
+    proxyLogout (askUrl, returnUrl, logoutUrl) {
       this.$jsonp(`${askUrl}`, function (err, data) {
         if (err) throw err
-        console.log(data)
-
-        window.location.href = returnUrl && returnUrl !== 'null' ? returnUrl : '/'
+        if (data.error) {
+          window.location.href = logoutUrl
+        } else {
+          window.location.href = returnUrl && returnUrl !== 'null' ? returnUrl : '/'
+        }
       })
     }
   }