213

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

@@ -1476,7 +1476,6 @@
            
         },
         closeConfrim(){
-            this.agree = false;
             this.showConfrim = false;
         },
 

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

@@ -1109,30 +1109,29 @@
       this.nclOne = [];
     },
     closeConfrim(){
-      this.agree = false;
       this.showConfrim = false;
     },
     submitForm(formName, agree) {
       var that = this;
-      if (agree) {
-        this.agree = agree;
-        this.showConfrim = false;
-        if (!this.form.name || !this.form.colorizedPicUrl) {
-          this.$message("请完善信息");
-          this.agree = false;
-          return;
-        }
-      }
-      console.log(formName, ";;;;;;;;;;;;;", this.agree);
-      if (this.agree == false) {
-        if (this.nclOne.length > 0) {
-          if (this.nclOne[0].nclThree.length < 10) {
-            this.nclSelected = this.nclOne[0].nclThree.length;
-            this.showConfrim = true;
+    
+      if (this.nclOne.length > 0) {
+        if (this.nclOne[0].nclThree.length < 10) {
+          this.showConfrim = true;
+          this.nclSelected = this.nclOne[0].nclThree.length;
+          if (agree) {
+            if (!this.form.name || !this.form.colorizedPicUrl) {
+              this.$message.warning("请完善信息");
+              console.log('ppppppppppppppppppppp');
+              return;
+            }else{
+              this.showConfrim = false;
+            }
+          } else {
             return;
           }
         }
-      };
+      }
+
       if (!this.form.name || !this.form.colorizedPicUrl) {
         this.$message.warning("请完善信息");
         return false;
@@ -1140,11 +1139,13 @@
       if (formName == "form" || formName == "apply") {
         if (formName == "apply") {
           console.log(this.apply);
+          /* 
           if (this.apply.customerType != 'person' && this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
             return that.$message.warning(`请按要求上传资料`);
           } else if (this.apply.customerType == 'person' && this.apply.identityCardPic == '' || this.apply.sealAuthorizeStuff == '' || this.apply.businessLicensePic == '') {
             return that.$message.warning(`请按要求上传资料`);
           }
+          */
         };
         this.$refs[formName].validate((valid) => {
           console.log(valid);
@@ -1215,13 +1216,13 @@
               this.$router.push({
                 path: "/1688/jdindentdetail",
                 query: {
-                    deliveryOrderNo: row.deliveryOrderNo,
-                    channelUserId: this.$root.channelUserId,
-                    itemName: this.currentOrderType,
-                    deliveryStatus: this.deliveryStatus,
-                    totalSum: row.totalSum,
+                  deliveryOrderNo: row.deliveryOrderNo,
+                  channelUserId: this.$root.channelUserId,
+                  itemName: this.currentOrderType,
+                  deliveryStatus: this.deliveryStatus,
+                  totalSum: row.totalSum,
                 }
-            });
+              });
               /*
               that.$root.pushx({
                 title: "订单支付",