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

src/views/mallManagement/activityOrder/detail.vue

@@ -284,6 +284,9 @@
 						})
 					})
 					this.activeItems = res.data.items
+					getActiveDetail({id:res.data.promotionQuestionnaireId}).then(res => {
+						this.formData.activeDate = [res.data.startTime,res.data.endTime]
+					})
 					// this.getActiveDetail(res.data.promotionQuestionnaireId,res.data.items)
 				})
 			},