Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

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

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="密码">

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;

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";
         }
     }
 }

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";
         }
     }
 }

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" />