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

src/components/AppBar.vue

@@ -89,7 +89,6 @@ export default {
         } else {
             this.show = true;
         }
-        console.log(this.$route);
     },
     methods: {
         onSelect(val) {

src/router/index.js

@@ -512,7 +512,6 @@ router.beforeEach((to, from, next) => {
         window.open(url);
         return;
     }
-    console.log(to);
 
     if (to.query.invitor) {
         sessionStorage.setItem('invitor', to.query.invitor);

src/views/Submit.vue

@@ -146,12 +146,12 @@ export default {
             }),
             inWeixin
                 ? this.$http.get('/sysConfig/get/enable_wx_pub').then(res => {
-                      this.enable_wx_pub = res.value === '1';
+                      this.enable_wx_pub = res.value.split(',').findIndex(i => i === this.$route.query.id) > -1;
                       return Promise.resolve();
                   })
                 : Promise.resolve(),
             this.$http.get('/sysConfig/get/enable_wx_lite').then(res => {
-                this.enable_wx_lite = res.value === '1';
+                this.enable_wx_lite = res.value.split(',').findIndex(i => i === this.$route.query.id) > -1;
                 return Promise.resolve();
             })
         ]).then(() => {

src/views/account/Login.vue

@@ -159,7 +159,7 @@ export default {
             this.check().then(() => {
                 this.$toast.success('登录成功');
                 setTimeout(() => {
-                    if (!fromRoute.name) {
+                    if (!fromRoute.name || fromRoute.name === 'userRegister' || fromRoute.name === 'userLogin') {
                         this.$router.replace('/home');
                     } else {
                         this.$router.back();

src/views/account/Register.vue

@@ -142,6 +142,7 @@ export default {
     },
     beforeRouteEnter(to, from) {
         fromRoute = from;
+        console.log(to, from);
     },
     methods: {
         sendPhone() {
@@ -167,7 +168,7 @@ export default {
                 .then(() => {
                     this.$toast.success('注册成功');
                     setTimeout(() => {
-                        if (!fromRoute.name) {
+                        if (!fromRoute.name || fromRoute.name === 'userRegister' || fromRoute.name === 'userLogin') {
                             this.$router.replace('/home');
                         } else {
                             this.$router.back();