diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js index 94fcac8ec..d396a2f12 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js @@ -63,11 +63,11 @@ var bootstrap = function ($, learun) { initData: function () { if (!!keyValue) { $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/GetPayFeeDetail?keyValue=' + keyValue, function (data) { - if (data['StuInfoFreshFamilyList'].length == 0) { - learun.alert.warning("检测到还未完善新生信息!请先完善新生信息。"); - learun.layerClose(window.name); - return; - } + //if (data['StuInfoFreshFamilyList'].length == 0) { + // learun.alert.warning("检测到还未完善新生信息!请先完善新生信息。"); + // learun.layerClose(window.name); + // return; + //} if (data['FinaChargesStandardList'].length == 0) { learun.alert.warning("未查询到该学生收费标准!请先维护收费标准。"); learun.layerClose(window.name); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml index b48ab2198..dde42766e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml @@ -107,7 +107,7 @@
密码不正确
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 067e4e9a1..5e7b5a3eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -219,8 +219,15 @@ return result; }, date: function (value) { - var date = new Date(value); - return date.toLocaleDateString(); + if (!!value) { + var date = new Date(value); + if (date instanceof Date && !isNaN(date.getTime())) { + return date.toLocaleDateString(); + } else { + return ''; + } + } else + return ''; }, nationalityNo: function (value) { var result; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuFreshPayFeeApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuFreshPayFeeApi.cs index 961802cc4..17df4cad1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuFreshPayFeeApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuFreshPayFeeApi.cs @@ -162,7 +162,8 @@ namespace Learun.Application.WebApi.Modules stuInfoFreshIBLL.SaveFeeData(keyValue, model, list); } - return Success(imgUrl); + var backimgUrl = new { imgUrl }; + return Success(backimgUrl); } public class JsonBean @@ -213,7 +214,7 @@ namespace Learun.Application.WebApi.Modules } //图片控件要显示的二维码图片路径 - return QRCodeFile + "/Content/images/QRCode/" + filename + ".jpg"; + return "/Content/images/QRCode/" + filename + ".jpg"; } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuPayFeeApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuPayFeeApi.cs index 52cc62442..b20e0f408 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuPayFeeApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuPayFeeApi.cs @@ -158,7 +158,8 @@ namespace Learun.Application.WebApi.Modules stuInfoFreshIBLL.SaveFeeData(keyValue, model, list); } - return Success(imgUrl); + var backimgUrl = new{ imgUrl }; + return Success(backimgUrl); } public class JsonBean @@ -209,7 +210,7 @@ namespace Learun.Application.WebApi.Modules } //图片控件要显示的二维码图片路径 - return QRCodeFile + "/Content/images/QRCode/" + filename + ".jpg"; + return "/Content/images/QRCode/" + filename + ".jpg"; } } } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 39f36d613..a0013c63b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -66,7 +66,7 @@ - +