123

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

@@ -383,15 +383,20 @@
     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) {
-      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) {
+        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`);
+      } else {
+        console.log(d.msg);
+      }
+
     });
     if (this.$route.query.channelOrder) {
       this.channelOrder = JSON.parse(this.$route.query.channelOrder);
@@ -399,8 +404,6 @@
       this.channelUser = JSON.parse(this.$route.query.channelUser);
       console.log(this.$route.query, this.channelInfo, `xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`);
     }
-
-
   },
   methods: {
 
@@ -1160,15 +1163,17 @@
           }
         });
       }
-      if (this.form.tmFormType == "4") {
-        if (!this.form.colorizedPicUrl) {
-          this.$message.warning("请完善信息");
-          return;
-        }
-      } else {
-        if (!this.form.tmName || !this.form.colorizedPicUrl) {
-          this.$message.warning("请完善信息");
-          return;
+      if (!agree) {
+        if (this.form.tmFormType == "4") {
+          if (!this.form.colorizedPicUrl) {
+            this.$message.warning("请完善信息");
+            return;
+          }
+        } else {
+          if (!this.form.tmName || !this.form.colorizedPicUrl) {
+            this.$message.warning("请完善信息");
+            return;
+          }
         }
       }
       if (formName == "form" || formName == "apply") {
@@ -1360,7 +1365,7 @@
       this.$refs[flag].d.key = key;
     },
     tobefore(){
-      this.toTop();      
+      this.toTop();
       this.step = Number(this.step) - 1;
       this.step = this.step.toString();
     },