Merge branch 'product_v1.1.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into product_v1.1.0

src/pages/exchangepage/edittemplate/main.js

@@ -560,15 +560,11 @@ getLandingdata(val){
 					   count += 2;
 					   report(count);
 					   setTimeout(update, 500);
-					   console.log("上传中")
 					 } 
 					 else{
-						 
-						   reject();
+						reject();
 					 }
 				 }
-				  
-		       
 		      };
 		      setTimeout(update, 500);
 		    });