From 9861820a711c14187e647f19b3e10e91e5314d61 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Thu, 1 Sep 2022 18:27:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F1970=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/Views/Login/Default.cshtml |  2 +-
 .../Views/UserCenter/Index.cshtml                     | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

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 @@
                 <div class="lr-login-bypsw noreg">
                     <div class="error_info">*&nbsp;<span>密码不正确</span></div>
                     <div class="lr-login-input">
-                        <img class="inp_icon" src="~/Content/images/Login/default_account0.png" alt=""> <input id="lr_username" type="text" placeholder="手机号/帐号">
+                        <img class="inp_icon" src="~/Content/images/Login/default_account0.png" alt=""> <input id="lr_username" type="text" placeholder="学号/工号">
                     </div>
                     <div class="lr-login-input">
                         <img class="inp_icon" src="~/Content/images/Login/default_psw0.png" alt=""><input id="lr_password" type="password" placeholder="密码">
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;

From bb126699e270f630ab6365f779c58d39a6dcfe69 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Fri, 2 Sep 2022 17:28:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=BC=BA=E5=88=B6=E5=AE=8C=E5=96=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=90=8E=E6=89=8D=E8=83=BD=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoFresh/PayFeeForm.js                   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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);

From 7578f033179ea0fa21cc5f24cca56efbcff35326 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Fri, 2 Sep 2022 18:13:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BE=93=E5=87=BAimgurl?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=B0data=E5=86=85=EF=BC=8Ccontent=20qrco?=
 =?UTF-8?q?de=E7=9A=84config=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.WebApi/Modules/StuFreshPayFeeApi.cs   | 5 +++--
 .../Learun.Application.WebApi/Modules/StuPayFeeApi.cs        | 5 +++--
 .../Learun.Application.WebApi/XmlConfig/system.config        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

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 @@
   <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
   <!-- ==================注意附件上传地址  修改到主网站部署目录下的Resource要不然飞星会报错================== -->
   <add key="AnnexesFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Resource" />
-  <add key="QRCodeFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\Content" />
+  <add key="QRCodeFile" value="D:\leiprojects\西昌单校区\Learun.Application.Web\" />
   <add key="ReportFile" value="~/Reports" />
   <!-- ================== 工作流服务地址 ================== -->
   <add key="workflowapi" value="http://localhost:8013" />