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,
         showWxrm: false,
         showPhoneNum: false,
         showPhoneNum: false,
         rsData: [],
         rsData: [],
-        channelPath: "",
         channelUserId: "",
         channelUserId: "",
         headerHidden: true,
         headerHidden: true,
+        channelName:'',
       };
       };
     },
     },
     created() {
     created() {
@@ -197,7 +197,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
       getChannelPath() {
       getChannelPath() {
         var from = this.$route.path;
         var from = this.$route.path;
         var path = from.split('/')[1];
         var path = from.split('/')[1];
-        this.$root.channelPath = path;
+        this.channelName = path;
         return 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;
       var orderParams = this.$router.history.current.query.orderParams;
       if (this.$route.query.channelUserId) {
       if (this.$route.query.channelUserId) {
         this.$root.channelUserId = 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) {
       if (orderParams) {
         this.form = orderParams.tm;
         this.form = orderParams.tm;
@@ -1135,10 +1135,10 @@
       /** this.step++; */
       /** this.step++; */
       var that = this;
       var that = this;
       if (this.nclOne.length > 0) {
       if (this.nclOne.length > 0) {
-        console.log(this.nclOne,",,,,,,,,,,,,,,,,,,,,,,,,");
+        console.log(this.nclOne, ",,,,,,,,,,,,,,,,,,,,,,,,");
         this.nclOne.map((item, index) => {
         this.nclOne.map((item, index) => {
           if (item.nclThree.length < 10 && formName == "form") {
           if (item.nclThree.length < 10 && formName == "form") {
-            console.log(item,'111111111111111111111111111111111111111');
+            console.log(item, '111111111111111111111111111111111111111');
             item.checked = item.nclThree.length;
             item.checked = item.nclThree.length;
             this.showConfrim = true;
             this.showConfrim = true;
 
 
@@ -1180,7 +1180,7 @@
               that.$message.warning(`请选择商标分类`);
               that.$message.warning(`请选择商标分类`);
               return false;
               return false;
             }
             }
-            if(!this.showConfrim){
+            if (!this.showConfrim) {
               that.toTop();
               that.toTop();
               that.step = Number(that.step) + 1;
               that.step = Number(that.step) + 1;
             }
             }
@@ -1194,8 +1194,9 @@
       if (formName == "order") {
       if (formName == "order") {
         this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName;
         this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName;
         this.savehistory();
         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) {
           if (!this.currentUser) {
             obj["step"] = this.step;
             obj["step"] = this.step;
             localStorage.setItem("afterLogin", JSON.stringify({
             localStorage.setItem("afterLogin", JSON.stringify({
@@ -1209,8 +1210,29 @@
             });
             });
             return false;
             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, ">>>>>>>>>>>>>>>>>>>>>>>");
           console.log(this.$route.query.channelOrderNo, ">>>>>>>>>>>>>>>>>>>>>>>");
           that.orderSubInfo = {
           that.orderSubInfo = {
             tm: that.form,
             tm: that.form,
@@ -1253,6 +1275,24 @@
               console.log(e);
               console.log(e);
             });
             });
           })
           })
+        }
+        /* 
+        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;
+        }
+        */
+
+
 
 
       }
       }