From dc0e700130e1a978588101035a0b839635e0d656 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Thu, 26 Aug 2021 17:28:15 +0800
Subject: [PATCH] =?UTF-8?q?H5=E7=AB=AF=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StuInfoFresh/RegisterQRCode/RegisterQRCode.js   | 13 ++++++++-----
 .../StuInfoFresh/StudentLoan/StudentLoan.js         |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
index 482532ff9..e3f6fd188 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js	
@@ -29,11 +29,14 @@
                         return false;
                     }
                     if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
-                        learun.layer.loading(false);
-                        learun.layer.confirm('新生未缴费，无法报到！', function (_index) {
-                            learun.nav.closeCurrent();
-                        }, '智慧校园提示', ['确定']);
-                        return false;
+						if(!entity.StudentLoanBLStatus)
+						{
+							learun.layer.loading(false);
+							learun.layer.confirm('新生未缴费且未设置贷款状态，无法报到！', function (_index) {
+							    learun.nav.closeCurrent();
+							}, '智慧校园提示', ['确定']);
+							return false;
+						}
                     }
 
                     //学生
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js
index f5690ea47..1e4ad60e8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js	
@@ -45,6 +45,7 @@
                         learun.layer.toast('保存成功');
                         setTimeout(function () {
                             learun.nav.closeCurrent();
+							learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' });
                         }, 2000);
                     }
                 });
@@ -53,7 +54,6 @@
 
         },
         bind: function ($page) {
-			console.log($page.find('#StudentLoanBLStatus'));
 			$page.find('#StudentLoanBLStatus').lrpickerex({
 			    code: 'StudentLoanBLStatus', 
 			    type:'dataItem'