123

igirl-channel-web/app/front/entry/public/js/index.js

@@ -79,7 +79,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
     if (to.path.includes('login')) {
       store.state.reqUrl = from.path;
       console.log(to, from, store.state.reqUrl);
-
     }
     next();
   });
@@ -174,9 +173,6 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
       };
     },
     created() {
-      $(window).resize(() => {
-        $("#app").css("min-height", $(window).height());
-      });
       $("#app").css("visibility", 'visible');
       this.loading = false;
       this.channelName = location.hash.split('/')[1];

igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js

@@ -170,7 +170,6 @@
           } else {
             this.$router.push({
               path: `/${this.$root.channelName}/login`,
-              query: { reqUrl: location.href }
             });
           }
 

igirl-channel-web/app/front/vues/pages/login/login.js

@@ -272,15 +272,13 @@
               $.cookie('userpin', d.data.userpin);
               this.$root.user_Name = d.data.userName;
               this.$root.channelUserId = d.data.channelUserId;
-
-
-
-              if (!this.$store.state.reqUrl) {
+              if (!this.$store.state.reqUrl && this.$store.state.reqUrl != '/') {
                 this.$router.push({
                   path: `/${this.$root.channelName}/jdtrademark`,
                   query: { channelUserId: d.data.channelUserId }
                 })
               } else {
+
                 this.$router.push({
                   path: `${this.$store.state.reqUrl}`,
                   query: { channelUserId: d.data.channelUserId }
@@ -327,7 +325,7 @@
               $.cookie('userpin', d.data.userpin);
               this.$root.user_Name = d.data.userName;
               this.$root.channelUserId = d.data.channelUserId;
-              if (!this.$store.state.reqUrl) {
+              if (!this.$store.state.reqUrl || this.$store.state.reqUrl == '/') {
                 this.$router.push({
                   path: `/${this.$root.channelName}/jdtrademark`,
                   query: { channelUserId: d.data.channelUserId }