diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/calendar.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/calendar.js index 3af9b8415..02d509116 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/calendar.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/phone/js/calendar.js @@ -222,13 +222,11 @@ function get_first(a, b, c, d, e) { var num = 1; for (var i = a; i > 0; i--) { - console.log("123333") var bday = ldays - i + 1; var ly = LunarDate.GetLunarDayDetail(lb, lm, bday); //修改 var jqs = getjqs(lb, lm, bday); - console.log(jqs) var ss = ''; if (jqs) { //ly加状态 @@ -254,7 +252,6 @@ function get_first(a, b, c, d, e) { } // 动态写入日期 for (var i = 1; i <= dd; i++) { - console.log("123333") var bday = ldays - i + 1; var ly = LunarDate.GetLunarDayDetail(b, c, i); var numI = i @@ -490,7 +487,6 @@ $(".tc").on("click", function () { //判断时间 function getjqs(yyyy, mm, dd) { var solarTerms = ""; - console.log("111222"); $.each(dataK, function (i, n) { if (yyyy == n.y && mm == n.m && dd == n.d) { solarTerms = n; @@ -672,7 +668,6 @@ function calenderInit(LunarDate) { var nowweak = new Date(ny, nm - 1, 1).getDay(); var lastweak = new Date(lasty, sev_m - 1, 1).getDay(); get_first(nowweak, ny, nm, 0, "d" + fors); - console.log(lasty, lastm) get_first(lastweak, lasty, sev_m, 0, "d4"); $("#ymym").html(sev_y + "年" + sev_m + "月"); active = 1; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html index ed5e1ed97..f0df7dbab 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/PhonePage/survey.html @@ -529,7 +529,8 @@ async: true, cache: false, success: function (data) { - $('#BriefIntroduction').html(data); + + $('#BriefIntroduction').html(data.info); }, error: function (XMLHttpRequest, textStatus, errorThrown) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs index 1b4fec7f4..dec1e172c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Arrangelesson.cs @@ -367,7 +367,7 @@ namespace Learun.Application.WebApi.Modules return Success("");//Fail("找不到数据!"); else { - return Success(result.F_BriefIntroduction); + return Success(WebHelper.HtmlDecode(result.F_BriefIntroduction)); } } @@ -416,7 +416,7 @@ namespace Learun.Application.WebApi.Modules if (result != null) { title = result.F_FullHead; - time = result.F_ReleaseTime.HasValue? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd"):""; + time = result.F_ReleaseTime.HasValue ? result.F_ReleaseTime.Value.ToString("yyyy-MM-dd") : ""; desc = result.F_NewsContent; } break; @@ -473,6 +473,6 @@ namespace Learun.Application.WebApi.Modules var result = schoolCalendarIBLL.GetSchoolCalendarEntity(keyValue); return Success(result); } - + } } \ No newline at end of file