123

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

@@ -330,24 +330,6 @@
   created: function() {
     var that = this;
     var itemCode = this.$router.history.current.query.itemCode || 'zzsbzc';
-    var orderParams = this.$router.history.current.query.orderParams;
-    if (this.$route.query.channelUserId) {
-      this.$root.channelUserId = this.$route.query.channelUserId;
-      console.log(this.$route.query.channelUserId, "11111111111ddd");
-    }
-    if (orderParams) {
-      this.form = orderParams.tm;
-      this.apply = orderParams.apply;
-      this.nclOne = orderParams.nclones;
-      this.step = orderParams.step;
-    }
-    if (itemCode != null) {
-      this.itemCode = itemCode;
-    } else {
-      this.$message.warning('code参数错误');
-      return;
-    }
-    var scrollTop = document.documentElement.scrollTop || window.pageYOffset;
     this.toTop();
 
 
@@ -355,6 +337,7 @@
   watch: {
     nclOne: {
       handler(newVal, oldVal){
+        if (!this.$router.history.current.query.orderParams) {
           this.form.totalSum = 0;
           console.log(newVal.length, 1111111111111, oldVal.length);
           newVal.map((item, index) => {
@@ -364,7 +347,7 @@
               this.form.totalSum += Number(this.dataList.proPrice);
             }
           });
-
+        }
       },
       deep: true
     }
@@ -373,6 +356,7 @@
     this.titleName = this.$route.query.dqName || '商标注册服务';
     this.listPath.path = this.$route.query.dqPath ? `/${this.$root.channelName}` + this.$route.query.dqPath : `/${this.$root.channelName}/jdtrademark`;
     this.$root.selfFooterShow = false;
+    this.getCache();
     this.getItemCode();
     this.getOss();
     this.noLoginMask();
@@ -386,6 +370,16 @@
     */
   },
   methods: {
+    getCache(){
+      var orderParams = this.$router.history.current.query.orderParams;
+      if (orderParams && localStorage.bwSubHistory) {
+        this.form = orderParams.tm;
+        this.apply = orderParams.apply;
+        this.nclOne = orderParams.nclones;
+        this.step = orderParams.step;
+        localStorage.removeItem('bwSubHistory');
+      }
+    },
     goGsbLogin(){
       this.toLogin = false;
       location.href = `https://www.gongsibao.com/user.php?redirect=${encodeURIComponent('https://zcchannelweb.gongsibao.com/gsbhome?state=selftmreg')}`;
@@ -1185,7 +1179,7 @@
     },
     submitForm(formName, agree) {
 
-      console.log(agree,"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm");
+      console.log(agree, "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmm");
       var that = this;
       if (this.nclOne.length > 0) {
         console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
@@ -1199,7 +1193,7 @@
                   this.$message.warning("请完善信息");
                   console.log("]]]]]]]]]]]]]]]]]]]]]]]]]]]]]");
                   return
-                }else{
+                } else {
                   this.showConfrim = false;
                 }
               } else {
@@ -1207,7 +1201,7 @@
                   this.$message.warning("请完善信息");
                   return
                   console.log('ttttttttttttttttttttttttttt');
-                }else{
+                } else {
                   this.showConfrim = false;
                 }
               }
@@ -1374,6 +1368,8 @@
             });
             break;
           case 'bw':
+
+            if ($.cookie('userpin') && $.cookie('userpin') != '') {
               var obj = {
                 tm: that.form,
                 apply: that.apply,
@@ -1407,6 +1403,29 @@
                 that.$root.loading = false;
                 that.$message.warning("操作失败");
               });
+            } else {
+              var obj = {
+                tm: that.form,
+                apply: that.apply,
+                nclones: that.nclOne,
+                itemCode: that.dataList.channelItemCode,
+                channelUser: {
+                  channelUserId: that.$route.query.channelUserId
+                },
+                channelOrder: {
+                  quantity: 1,
+                  payStatus: "dfk"
+                }
+              };
+              obj.step = that.step;
+              localStorage.bwSubHistory = JSON.stringify(obj);
+              that.$message.warning("登录后重试");
+              that.$router.push({
+                path: `/${that.$root.channelName}/login`,
+              });
+
+            }
+
             break;
 
           default:
@@ -1641,7 +1660,6 @@
       if (scrollTop != 0) {
         let timer = setInterval(() => {
           window.scrollTo(0, scrollTop -= 20);
-          console.log(scrollTop);
           if (scrollTop <= 0) clearInterval(timer);
         }, 0);
       };

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

@@ -269,16 +269,13 @@
           if (code.channelItemCode) {
             switch (code.itemCode) {
               case "zzsbzc":
-                if ($.cookie('userpin') && $.cookie('userpin') != "") {
+                
                   this.$router.push({
                     path: `/${this.$root.channelName}/bwselftmreg`, query: {
                       sdsId: code.channelItemCode
                     }
                   });
-                } else {
-                  this.$message("请登录");
-                  this.$router.push({ path: `/${this.$root.channelName}/login` });
-                }
+                
                 /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
                 break;
               case "fzsbzc":

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

@@ -292,6 +292,18 @@
               $.cookie('userpin', d.data.userpin);
               this.$root.user_Name = d.data.userName;
               this.$root.channelUserId = d.data.channelUserId;
+              if (this.$store.state.reqUrl == `/${this.$root.channelName}/bwselftmreg`) {
+                let { bwSubHistory } = localStorage;
+                console.log(bwSubHistory, ".................................");
+                if (bwSubHistory) {
+                  this.$router.push({
+                    path: `${this.$store.state.reqUrl}`,
+                    query: { channelUserId: d.data.channelUserId, sdsId: 'zzsbzc', orderParams: { ...JSON.parse(bwSubHistory) } }
+                  })
+                }
+                return;
+              }
+
               if (!this.$store.state.reqUrl || this.$store.state.reqUrl == '/' || this.$store.state.reqUrl == `/${this.$root.channelName}/register`) {
                 this.$router.push({
                   path: `/${this.$root.channelName}/jdtrademark`,