Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Duty/VisitorReserveModule.cs

@@ -316,12 +316,11 @@ namespace Edu.Module.Duty
 
                         queryNotifyManager.ForEach(x =>
                         {
-                            var path = $"pages/classRollCall/TrialClass?Id={model.Id}";//这个地址是欠费的通知地址，后续有H5需要改
+                            var path = $"/h5page/TrialClass?Id={model.Id}";//这个地址是欠费的通知地址，后续有H5需要改
                             path = HttpUtility.UrlEncode(path);
-                            string markdownContent = $@"`试听课通知` 学员试听课通知\n>**概要信息** \n>学员名称：{guestModel.StuName}({guestModel.StuRealMobile})\n>
-                                                    预约时间：<font color='warning'>{model.ReservationDate.ToString("yyyy-MM-dd")}\n>
-                                                    试听需求：<font color='warning'>{model.Demand}\n>
-                                                    请点击：[查看详情]({Config.ErpUrl}/autologin?loginId={x.Id}&target={path})";
+                            string newUrl = $"{Config.ErpUrl}/login?loginId={x.Id}&target={path}";
+                            Common.Plugin.LogHelper.WriteInfo("试听推送::" + newUrl);
+                            string markdownContent = $"<font color='info'>学员试听课通知</font>\n>**概要信息** \n>学员名称：<font color='warning'>{guestModel.StuName}({guestModel.StuRealMobile})</font>\n>预约时间：<font color='warning'>{Common.ConvertHelper.FormatDate(model.ReservationDate)}</font>\n>试听需求：<font color='warning'>{Common.Plugin.StringHelper.FilterHtml(model.Demand)}次课)</font>\n>请 点 击：[查看详情]({newUrl})";
                             Common.Message.PushMessageModel modelWork = new Common.Message.PushMessageModel()
                             {
                                 CategoryId = PushMessageCategoryEnum.ReserveClass,

Edu.WebApi/Controllers/Course/ScheduleCourseController.cs

@@ -83,7 +83,6 @@ namespace Edu.WebApi.Controllers.Course
                     jobj.Add("TotalTimes", item.TotalTimes);
                     list.Add(jobj);
                 }
-           
             }
             return ApiResult.Success(data: list);
         }