Merge branch 'feature/活动单创建增加网点' into develop

src/views/mallManagement/activityOrder/detail.vue

@@ -248,7 +248,9 @@
 			if(this.activeId){
 				this.formData.active = {id: this.activeId}
 				this.formData.promotionActivityId = this.activeId
-				this.getActiveDetail(this.activeId)
+				if(this.formType == 0){
+					this.getActiveDetail(this.activeId)
+				}
 			}
 			this.getActiveList()
 		},