Browse Source

不可 退出的bug修改

wangdy 8 years ago
parent
commit
ea4f586a92
2 changed files with 26 additions and 25 deletions
  1. 1 1
      nuxt.config.js
  2. 25 24
      pages/platform-b2c/logout/proxy.vue

+ 1 - 1
nuxt.config.js

@@ -107,5 +107,5 @@ module.exports = {
     ssr: false
   }],
   /* TODO 暂时代理到商城测试版,之后再做出调整 */
-  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/register/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/store**', '/order/proxy**', '/report/**', '/store/**#/**', '/kdn/**', '/product/**Submit', '/admin**', '/product/**Submit/**', '/release/**', '/auth/store/**', '/produce/**', '/file**']
+  proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/register/**', '/logout/**', '/static/**', '/vendor**', '/user**', '/trade/**', '/recommendation/**', '/store-service/**', '/basic/**', '/logout**', '/operation/**', '/help**', '/product**', '/store**', '/order/proxy**', '/report/**', '/store/**#/**', '/kdn/**', '/product/**Submit', '/admin**', '/product/**Submit/**', '/release/**', '/auth/store/**', '/produce/**', '/file**', '/rate/**']
 }

+ 25 - 24
pages/platform-b2c/logout/proxy.vue

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