Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front

src/views/auction/Home.vue

@@ -152,7 +152,7 @@ export default {
     },
     methods: {
         goBack() {
-            if (!fromRoute || !fromRoute.name) {
+            if (!fromRoute || !fromRoute.name || fromRoute.name !== 'discover') {
                 this.$router.replace('/home');
             } else {
                 this.$router.back();