123

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html

@@ -37,7 +37,7 @@
             </el-form-item>
             <div style="clear:both;"></div>
             <el-form-item label="商标名称" style="width:860px;float:left" prop="name" v-if="form.tmFormType != 4">
-              <el-input v-model="form.name" style="width:330px" placeholder="请输入商标名称"></el-input><span
+              <el-input v-model="form.tmName" style="width:330px" placeholder="请输入商标名称"></el-input><span
                 v-if="form.tmFormType == 5"
                 style="font-size:14px;font-family:PingFangSC-Regular;font-weight:400;color:rgba(99,101,105,1);margin-left: 10px">及图</span>
             </el-form-item>
@@ -538,7 +538,7 @@
             </div>
             <div style="width: 100%;margin-bottom: 23px">
               <div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标名称:</div>
-              <div style="display:inline-block;padding-left:10px;">{{form.name}}</div>
+              <div style="display:inline-block;padding-left:10px;">{{form.tmName}}</div>
             </div>
             <div style="width: 100%;margin-bottom: 23px">
               <div style="width:120px;display:inline-block;text-align: right;color:#636569;">商标图样:</div>

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

@@ -204,7 +204,7 @@
           notes: "",
         },
         rules: {
-          name: [
+          tmName: [
             { required: true, message: '请输入商标名称' }
           ],
           picUrl: [
@@ -1034,14 +1034,14 @@
       }
     },
     word2pic(){
-      if (this.form.name == "" || this.form.name == null) {
+      if (this.form.tmName == "" || this.form.tmName == null) {
         this.loading = true;
         this.loading = false;
         return false;
       }
       var that = this;
       this.loading = true;
-      var word2pic = { word: this.form.name };
+      var word2pic = { word: this.form.tmName };
       var word2pic = this.$root.copyParams(word2pic, "word2pic", "/action/tmTools/springBoard");
       this.$root.postReq("/web/trademark/tmqueryCtl/doPost", word2pic).then(function (d) {
         if (d.status == 0) {
@@ -1119,7 +1119,7 @@
           this.showConfrim = true;
           this.nclSelected = this.nclOne[0].nclThree.length;
           if (agree) {
-            if (!this.form.name || !this.form.colorizedPicUrl) {
+            if (!this.form.tmName || !this.form.colorizedPicUrl) {
               this.$message.warning("请完善信息");
               console.log('ppppppppppppppppppppp');
               return;
@@ -1132,7 +1132,7 @@
         }
       }
 
-      if (!this.form.name || !this.form.colorizedPicUrl) {
+      if (!this.form.tmName || !this.form.colorizedPicUrl) {
         this.$message.warning("请完善信息");
         return false;
       }
@@ -1167,7 +1167,7 @@
       }
 
       if (formName == "order") {
-        this.form.name = this.form.tmFormType == 5 ? this.form.name + '及图' : this.form.name;
+        this.form.tmName = this.form.tmFormType == 5 ? this.form.tmName + '及图' : this.form.tmName;
         this.savehistory();
 
         /* 
@@ -1198,31 +1198,21 @@
           console.log(d);
           that.orderSubInfo.channelOrder = d.data.channelOrder;
           that.orderSubInfo.channelUser = d.data.channelUser;
-        }).then((res) => {
-          console.log(that.orderSubInfo, res, '............................................');
+        }).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) {
+            if (d.data.status == 0) {
               var order = d.data;
               that.toTop();
-              that.$message.warning("订单提交成功");
               that.$router.push({
                 path: "/1688/jdindentlist",
                 query: {
                   channelUserId: this.$route.query.channelUserId,
                 }
               });
-              this.$router.push({
-                path: "/1688/jdindentdetail",
-                query: {
-                  deliveryOrderNo: row.deliveryOrderNo,
-                  channelUserId: this.$root.channelUserId,
-                  itemName: this.currentOrderType,
-                  deliveryStatus: this.deliveryStatus,
-                  totalSum: row.totalSum,
-                }
-              });
+              that.$message.warning("订单提交成功");
               /*
               that.$root.pushx({
                 title: "订单支付",