123

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

@@ -35,7 +35,7 @@
                                     accept="image/png, image/jpeg, image/gif, image/jpg" @change="uploadImg($event, 1)">
                                     accept="image/png, image/jpeg, image/gif, image/jpg" @change="uploadImg($event, 1)">
                             </div>
                             </div>
                             <el-button class="leibie-btn"
                             <el-button class="leibie-btn"
-                                style="background: #fff;border:1px solid #0989c5;border-radius: 0;" slot="append"
+                                style="background: #fff;border:1px solid #0989c5;border-radius: 0;height: 41px;" slot="append"
                                 @click="checkClick">全部类别
                                 @click="checkClick">全部类别
                                 <i class="el-icon-arrow-down
                                 <i class="el-icon-arrow-down
                                 ">
                                 ">

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

@@ -2373,7 +2373,7 @@
             var obj = this.$root.copyParams(obj, "getCompanyInfoNoUser", "/action/tmQuery/springBoard");
             var obj = this.$root.copyParams(obj, "getCompanyInfoNoUser", "/action/tmQuery/springBoard");
             that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
             that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
                 loading.close();
                 loading.close();
-                console.log(d,"ccccccccccccccccccccccccccccccc");
+                console.log(d, "ccccccccccccccccccccccccccccccc");
                 if (d.status == 0) {
                 if (d.status == 0) {
                     if (d.data) {
                     if (d.data) {
                         that.companyInfo = d.data;
                         that.companyInfo = d.data;
@@ -2593,7 +2593,7 @@
                     if (d) {
                     if (d) {
                         that.imageUrl = d;
                         that.imageUrl = d;
                         that.tag.name = that.picName;
                         that.tag.name = that.picName;
-                        console.log("dddddddddddddgetCropperPic",imageUrl,"mmmmmmmmmmmmmmmmmmmmmmmm");
+                        console.log("dddddddddddddgetCropperPic", imageUrl, "mmmmmmmmmmmmmmmmmmmmmmmm");
 
 
                         that.imagequery();
                         that.imagequery();
                     }
                     }
@@ -2695,14 +2695,20 @@
             $("#wave-container").removeClass("animate-wave-container-hover");
             $("#wave-container").removeClass("animate-wave-container-hover");
         });
         });
         var that = this;
         var that = this;
-        this.$root.getReq("/web/trademark/tmqueryCtl/getOssConfig", "").then(function (d) {
-            that.imagedata["key"] = "key";
-            that.imagedata["Bucket"] = d.Bucket;
-            that.imagedata["OSSAccessKeyId"] = d.OSSAccessKeyId;
-            that.imagedata["Signature"] = d.Signature;
-            that.imagedata["policy"] = d.policy;
-            that.imagedata["success_action_status"] = d.success_action_status;
-            that.action = d.url;
+        var obj = that.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
+        console.log(obj,'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
+        that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
+            console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
+            if (d.status == 0) {
+                that.d["key"] = "key";
+                that.d["Bucket"] = d.data.Bucket;
+                that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
+                that.d["Signature"] = d.data.Signature;
+                that.d["policy"] = d.data.policy;
+                that.d["success_action_status"] = d.data.success_action_status;
+                that.action = d.data.url;
+                console.log(that.action, `oooooooooooooooooooooooooooo`);
+            }
         });
         });
         this.headers = [];
         this.headers = [];
         this.headers["商标名称"] = "sbmc";
         this.headers["商标名称"] = "sbmc";

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

@@ -381,25 +381,33 @@
 
 
       },
       },
       deep: true
       deep: true
+    },
+    step(oldVal, newVal){
+      console.log(oldVal, newVal, "mmmmmmmmmmmmmmmmmmmmmnnnnnnnnnnnnnnnn");
+      if (Number(oldVal) != Number(newVal)) {
+        window.scrollTo(0, 0);
+      }
     }
     }
-
   },
   },
   mounted: function() {
   mounted: function() {
     this.$root.getChannelPath();
     this.$root.getChannelPath();
     var that = this;
     var that = this;
     that.toTop();
     that.toTop();
     console.log(this.tm_form_type);
     console.log(this.tm_form_type);
-    var obj = this.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
-    this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
+    var obj = that.$root.copyParams("", "getOssConfig", "/action/tmTools/springBoard");
+    console.log(obj, 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
+    that.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(function (d) {
       console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
       console.log(d, `mmmmmmmmmmmmmmmmmmmmmmm`);
-      that.d["key"] = "key";
-      that.d["Bucket"] = d.data.Bucket;
-      that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
-      that.d["Signature"] = d.data.Signature;
-      that.d["policy"] = d.data.policy;
-      that.d["success_action_status"] = d.data.success_action_status;
-      that.action = d.data.url;
-      console.log(that.action, `oooooooooooooooooooooooooooo`);
+      if (d.status == 0) {
+        that.d["key"] = "key";
+        that.d["Bucket"] = d.data.Bucket;
+        that.d["OSSAccessKeyId"] = d.data.OSSAccessKeyId;
+        that.d["Signature"] = d.data.Signature;
+        that.d["policy"] = d.data.policy;
+        that.d["success_action_status"] = d.data.success_action_status;
+        that.action = d.data.url;
+        console.log(that.action, `oooooooooooooooooooooooooooo`);
+      }
     });
     });
     if (this.$route.query.channelOrder) {
     if (this.$route.query.channelOrder) {
       this.channelOrder = JSON.parse(this.$route.query.channelOrder);
       this.channelOrder = JSON.parse(this.$route.query.channelOrder);
@@ -1263,7 +1271,7 @@
       var entobj = {
       var entobj = {
         regLocation: this.apply.applyAddr, entName: this.apply.name, domainEntName: this.apply.name, creditCode: this.apply.code,
         regLocation: this.apply.applyAddr, entName: this.apply.name, domainEntName: this.apply.name, creditCode: this.apply.code,
         businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo,
         businessLicensePic: this.apply.businessLicensePic, customerType: this.apply.customerType, identityCardNo: this.apply.identityCardNo,
-        identityCardPic: this.apply.identityCardPic,businessLicensePdf: this.apply.businessLicensePdf,
+        identityCardPic: this.apply.identityCardPic, businessLicensePdf: this.apply.businessLicensePdf,
       };
       };
       if (this.apply.customerType == "ent") {
       if (this.apply.customerType == "ent") {
         var entData = localStorage.getItem("historyentlist");
         var entData = localStorage.getItem("historyentlist");