苹果new Date()兼容

pages-approve/activity/checkRole.js

@@ -29,8 +29,8 @@ export const editInfoBack = ({ ActivityType,RoadshowType,RoadshowPlatform,City,P
 			// 选择的研究员
 			{
 				researcherId: type === 2 ? ResearcherId.split(',').map(item => Number(item)) : Number(ResearcherId),
-				startTime: new Date(`${StartDate} ${StartTime}`).getTime(),
-				endTime: new Date(`${EndDate} ${EndTime}`).getTime(),
+				startTime: new Date(`${StartDate.replace(/-/g,'/')} ${StartTime}`).getTime(),
+				endTime: new Date(`${EndDate.replace(/-/g,'/')} ${EndTime}`).getTime(),
 			},
 		],
 	};

pages-approve/activity/detail.vue

@@ -307,9 +307,21 @@
 				let edit_id = RsCalendarId,edit_rs_id = RsCalendarResearcherId;
 
 				CompanyId && uni.setStorageSync('roadshow_compantyId',CompanyId);
+				// uni.navigateTo({
+				// 	url:`/pages-roadshow/addActivity/index?form=${JSON.stringify(form)}&edit_id=${edit_id}&edit_rs_id=${edit_rs_id}`
+				// })
+				
 				uni.navigateTo({
-					url:`/pages-roadshow/addActivity/index?form=${JSON.stringify(form)}&edit_id=${edit_id}&edit_rs_id=${edit_rs_id}`
-				})
+					url:`/pages-roadshow/addActivity/index`,
+					success: function(res) {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('emitBackData', {
+							form: JSON.stringify(form),
+							edit_id,
+							edit_rs_id
+						})
+					}
+				});	
 			},
 			
 			/* 删除 需删除理由 */

pages-approve/activity/list.vue

@@ -252,9 +252,21 @@
 							edit_id = RsCalendarId,
 							edit_rs_id = RsCalendarResearcherId;
 							
+					// uni.navigateTo({
+					// 	url:`/pages-roadshow/addActivity/index?form=${JSON.stringify(form)}&edit_id=${edit_id}&edit_rs_id=${edit_rs_id}`
+					// });
+					
 					uni.navigateTo({
-						url:`/pages-roadshow/addActivity/index?form=${JSON.stringify(form)}&edit_id=${edit_id}&edit_rs_id=${edit_rs_id}`
-					});	
+						url:`/pages-roadshow/addActivity/index`,
+						success: function(res) {
+							// 通过eventChannel向被打开页面传送数据
+							res.eventChannel.emit('emitBackData', {
+								form: JSON.stringify(form),
+								edit_id,
+								edit_rs_id
+							})
+						}
+					});
 				} else {
 					//编辑事项
 					this.editMatter({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent });
@@ -264,15 +276,26 @@
 			/* 编辑事项 */
 			editMatter({ RsMattersId,StartDate,StartTime,EndDate,EndTime,MatterContent }) {
 				let matter_form = {
-							startTime: new Date(`${StartDate} ${StartTime}`).getTime(),
-							endTime: new Date(`${EndDate} ${EndTime}`).getTime(),
+							startTime: new Date(`${StartDate.replace(/-/g,'/')} ${StartTime}`).getTime(),
+							endTime: new Date(`${EndDate.replace(/-/g,'/')} ${EndTime}`).getTime(),
 							matterContent: MatterContent,
 						},
 						edit_matter_id = RsMattersId;
 				
+				// uni.navigateTo({
+				// 	url:`/pages-roadshow/addMatter/index?form=${JSON.stringify(matter_form)}&edit_matter_id=${edit_matter_id}`
+				// });	
+				
 				uni.navigateTo({
-					url:`/pages-roadshow/addMatter/index?form=${JSON.stringify(matter_form)}&edit_matter_id=${edit_matter_id}`
-				});	
+					url:`/pages-roadshow/addMatter/index`,
+					success: function(res) {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('emitBackData', {
+							form: JSON.stringify(matter_form),
+							edit_matter_id
+						})
+					}
+				});
 			},
 			
 			/* 活动是否已开始 */

pages-roadshow/addActivity/index.vue

@@ -316,6 +316,10 @@
 
 		onLoad(options) {
 			this.initSetState(options);
+			
+			this.getOpenerEventChannel().on('emitBackData', (data)=> {
+				this.initSetState(data);
+			})
 		},
 
 		onShow() {

pages-roadshow/addMatter/index.vue

@@ -217,6 +217,10 @@
 
 		onLoad(options) {
 			this.initSetState(options);
+			
+			this.getOpenerEventChannel().on('emitBackData', (data)=> {
+				this.initSetState(data);
+			})
 		},
 
 		onShow() {