123

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

@@ -155,9 +155,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
         showWxrm: false,
         showPhoneNum: false,
         rsData: [],
-        channelPath: "",
         channelUserId: "",
         headerHidden: true,
+        channelName:'',
       };
     },
     created() {
@@ -197,7 +197,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
       getChannelPath() {
         var from = this.$route.path;
         var path = from.split('/')[1];
-        this.$root.channelPath = path;
+        this.channelName = path;
         return path;
       },
 

igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js

@@ -320,7 +320,7 @@
       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",);
+        console.log(this.$route.query.channelUserId, "11111111111ddd");
       }
       if (orderParams) {
         this.form = orderParams.tm;
@@ -1135,13 +1135,13 @@
       /** this.step++; */
       var that = this;
       if (this.nclOne.length > 0) {
-        console.log(this.nclOne,",,,,,,,,,,,,,,,,,,,,,,,,");
+        console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
         this.nclOne.map((item, index) => {
           if (item.nclThree.length < 10 && formName == "form") {
-            console.log(item,'111111111111111111111111111111111111111');
+            console.log(item, '111111111111111111111111111111111111111');
             item.checked = item.nclThree.length;
             this.showConfrim = true;
-            
+
             if (agree) {
               if (!this.form.tmName || !this.form.colorizedPicUrl) {
                 this.$message.warning("请完善信息");
@@ -1180,7 +1180,7 @@
               that.$message.warning(`请选择商标分类`);
               return false;
             }
-            if(!this.showConfrim){
+            if (!this.showConfrim) {
               that.toTop();
               that.step = Number(that.step) + 1;
             }
@@ -1194,7 +1194,88 @@
       if (formName == "order") {
         this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName;
         this.savehistory();
+        console.log(this.$root.channelName, "///////////////");
+        if (this.$root.channelName == "jd") {
+          var obj = { tm: this.form, apply: this.apply, nclones: this.nclOne, itemCode: this.itemCode };
+          if (!this.currentUser) {
+            obj["step"] = this.step;
+            localStorage.setItem("afterLogin", JSON.stringify({
+              title: "自主商标注册",
+              name: "/selftmreg",
+              params: { itemCode: this.itemCode, orderParams: obj }
+            }));
+            this.$root.pushx({
+              title: "登录",
+              name: "/login"
+            });
+            return false;
+          }
+          /**提报接口 */
+          that.$root.postReq("/web/orderCtl/createTmOrder", obj).then(function (d) {
+            if (d.code == "1") {
+              var order = d.data;
+              that.toTop();
+              that.$message.warning("订单提交成功");
+              that.$root.pushx({
+                title: "订单支付",
+                name: "/orderpay",
+                params: {
+                  orderNum: order.code
+                }
+              });
+            } else {
+              that.$message.warning(d.msg);
+            }
+            that.$root.hideMask();
+          }).catch(function (e) {
+            that.$message.warning("操作失败");
+            that.$root.hideMask();
+          });
+  
+        } else if (this.$root.channelName == "1688") {
+          console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
+          that.orderSubInfo = {
+            tm: that.form,
+            apply: that.apply,
+            nclones: that.nclOne,
+            itemCode: that.itemCode,
+          };
+          that.$root.loading = true;
+          var channelOrderNo = that.$root.copyParams({ channelOrderNo: that.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
+          that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
+            console.log(d);
+            that.orderSubInfo.channelOrder = d.data.channelOrder;
+            that.orderSubInfo.channelUser = d.data.channelUser;
+          }).then(() => {
+            console.log(that.orderSubInfo, '............................................');
+            var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
+            that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
+              console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
+              if (d.status == 0) {
+                var order = d.data;
+                that.toTop();
+                console.log(that.orderSubInfo, ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,");
+                that.$router.push({
+                  path: "/1688/jdindentlist",
+                  query: {
+                    channelUserId: that.$route.query.channelUserId,
+                  }
+                });
+                that.$message.warning("订单提交成功");
 
+              } else {
+                that.$message.warning(d.msg);
+              }
+
+            }).then(() => {
+              that.$root.loading = false;
+            }).catch(function (e) {
+              that.$message.warning("操作失败", e);
+              that.$root.loading = false;
+              console.log(e);
+            });
+          })
+        }
         /* 
         if (!this.currentUser) {
           obj["step"] = this.step;
@@ -1211,48 +1292,7 @@
         }
         */
 
-        console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
-        that.orderSubInfo = {
-          tm: that.form,
-          apply: that.apply,
-          nclones: that.nclOne,
-          itemCode: that.itemCode,
-        };
-        that.$root.loading = true;
-        var channelOrderNo = that.$root.copyParams({ channelOrderNo: that.$route.query.channelOrderNo }, "get1688ChannelOrderInfo", "/action/tmOrder/springBoard", "yes", "yes");
-        that.$root.postReq("/web/trademark/tmqueryCtl/doPost", channelOrderNo).then((d) => {
-          console.log(d);
-          that.orderSubInfo.channelOrder = d.data.channelOrder;
-          that.orderSubInfo.channelUser = d.data.channelUser;
-        }).then(() => {
-          console.log(that.orderSubInfo, '............................................');
-          var subInfo = that.$root.copyParams(that.orderSubInfo, "subExistTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
-          that.$root.postReq("/web/trademark/tmqueryCtl/doPost", subInfo).then(function (d) {
-            console.log('nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn0', d);
-            if (d.status == 0) {
-              var order = d.data;
-              that.toTop();
-              console.log(that.orderSubInfo, ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,");
-              that.$router.push({
-                path: "/1688/jdindentlist",
-                query: {
-                  channelUserId: that.$route.query.channelUserId,
-                }
-              });
-              that.$message.warning("订单提交成功");
-
-            } else {
-              that.$message.warning(d.msg);
-            }
 
-          }).then(() => {
-            that.$root.loading = false;
-          }).catch(function (e) {
-            that.$message.warning("操作失败", e);
-            that.$root.loading = false;
-            console.log(e);
-          });
-        })
 
       }