From 81da6753d1294a9c808c8c1ceae0aa391bc02f40 Mon Sep 17 00:00:00 2001 From: liangkun Date: Fri, 26 Aug 2022 17:24:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 2 +- .../Learun.Application.Web/Views/UserCenter/Index.cshtml | 1 + .../Learun.Application.WebApi/Modules/WeixinApi.cs | 9 ++++++++- .../StuInfoBasic_PayFee/StuInfoBasic_PayFeeEntity.cs | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 4 ++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js index 66a16e64b..a9d23e2bc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js @@ -108,7 +108,7 @@ var bootstrap = function ($, learun) { { label: "性别", name: "GenderNo", width: 80, align: "left", formatter: function (cellvalue) { - return cellvalue == true ? "男" : "女"; + return cellvalue === true ? "男" : "女"; } }, { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, 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 650777d0a..e072cc0d8 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 @@ -190,6 +190,7 @@ }, filters: { sex: function (value) { + console.log(value); return value ? "男生" : "女生"; }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs index 50306a2bc..36e9881ad 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/WeixinApi.cs @@ -102,6 +102,13 @@ namespace Learun.Application.WebApi.Modules return Success(new { appid, secret }); } + public class wxinfo + { + public string errcode { get; set; } + public string errmsg { get; set; } + public string openid { get; set; } + } + public Response GetWeixinAccess_token(dynamic _) { var entity = weChatConfigIbll.GetEnableEntity(); @@ -112,7 +119,7 @@ namespace Learun.Application.WebApi.Modules var responsejson = HttpGet("https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appid + "&secret=" + secret + "&code=" + code + "&grant_type=authorization_code"); if (!string.IsNullOrEmpty(responsejson)) { - var weixintokenobj = JsonConvert.DeserializeObject(responsejson); + var weixintokenobj = JsonConvert.DeserializeObject(responsejson); if (string.IsNullOrEmpty(weixintokenobj.errcode)) { string openid = weixintokenobj.openid; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_PayFee/StuInfoBasic_PayFeeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_PayFee/StuInfoBasic_PayFeeEntity.cs index 1714c2271..a2fc7c44e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_PayFee/StuInfoBasic_PayFeeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_PayFee/StuInfoBasic_PayFeeEntity.cs @@ -62,7 +62,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public string StuCode { get; set; } [NotMapped] public string StuName { get; set; } - [NotMapped] public string GenderNo { get; set; } + [NotMapped] public bool? GenderNo { get; set; } [NotMapped] public string IdentityCardNo { get; set; } [NotMapped] public string DeptNo { get; set; } [NotMapped] public string MajorNo { get; set; } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 5f5dd6da0..74af92b42 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,8 +21,8 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - // "http://localhost:31173/" - "http://123.57.209.16:31173/" + "http://localhost:31173/" + // "http://123.57.209.16:31173/" ], "webHost":"http://demo.bjquanjiang.com:8081/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示