调整迎新

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html

@@ -1,12 +1,10 @@
 <div class="welcome">
     
-    <div class="welBox">
+    <div class="welBox2">
         <div class="welInput">
             <span>贷款回执码</span>
             <input id="ID" type="hidden"/>
             <input id="StudentLoan" type="text" placeholder="请填写贷款回执码" value=""/>
-			<span>办理贷款状态</span>
-			<div id="StudentLoanBLStatus"></div>
         </div>
 		<div class="welInput">
 			<span>办理贷款状态</span>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js

@@ -5,6 +5,7 @@
             //数据绑定 
             learun.layer.loading(true, '获取数据中');
             learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => {
+				console.log(data);
                 if (data) {
                     for (var id in data) {
                         if (id == "StuInfoFreshEntity") {
@@ -30,7 +31,7 @@
                     ID: $('#ID').val(),
                     StudentLoan: $('#StudentLoan').val(),
                     StudentLoanStatus: "0",
-					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet();
+					StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet()
                 };
                 if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) {
                     postdata.StudentLoanStatus = "1";
@@ -51,9 +52,10 @@
 
         },
         bind: function ($page) {
-			$page.find('#StudentLoanBLStatus').lrselect({
-			    type: 'StudentLoanBLStatus', 
-			    needPre:false
+			console.log($page.find('#StudentLoanBLStatus'));
+			$page.find('#StudentLoanBLStatus').lrpickerex({
+			    code: 'StudentLoanBLStatus', 
+			    type:'dataItem'
 			}); 
 			
         }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypassword/modifypassword.html

@@ -1,4 +1,4 @@
-<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
     <div class="lr-form-row">
         <label>原密码</label>
         <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/my/modifypasswordandnotice/modifypasswordandnotice.html

@@ -1,4 +1,4 @@
-<<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
+<div style="margin-top:10px;" class="lr-form-container" id="modifypasswordform">
     <div class="lr-form-row">
         <label>原密码</label>
         <input id="oldpassword" type="password" isvalid="yes" checkexpession="NotNull" errormsg="原密码">

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css

@@ -1,3 +1,9 @@
+
+
+ .red{
+            color: red;
+        }
+
 .welcome {
 	height: 100%;
 	overflow: auto;
@@ -47,8 +53,10 @@
 	/* padding: 0px 12px 20px; */
 }
 .welbox2{
-	padding: 0px 12px 0px;
+	padding: 0px 20px 0px;
 	background-color: #fff;
+        position: relative;
+
 }
 .welBox.active {
 	display: block;
@@ -60,14 +68,19 @@
 	font-size: 16px;
 	line-height: 26px;
 }
-
+.welT span{
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 26px;
+}
 .welT2 {
 	height: 46px;
 	line-height: 46px;
 	font-size: 16px;
 	margin: 0 -12px;
 	padding: 0 12px;
-	background-color: #EFF2F3;
+        font-weight: 800;
+	
 }
 
 .welT i {
@@ -92,6 +105,8 @@
 	font-size: 14px;
 	margin-top: 8px;
 	line-height: 0;
+        border-bottom: 1px solid #EFF2F3;
+        padding-bottom: 5px;
 }
 
 .welText div {
@@ -162,18 +177,22 @@
 .welInput .lr-picker {
     line-height: 30px;
 }
+.welUrgent{
+   position: relative;
+}
 .welCon {
 	margin-top: 18px;
-	position: relative;
+	 
 	margin: 0 -12px;
 }
 
 .welDel {
-	background: #EFF2F3;
+        text-align: right;
 	padding: 5px 12px 10px;
-	text-align: right;
+	
 }
 
+
 .welDel i,.welAdd i {
 	text-align: center;
 	width: 26px;
@@ -183,12 +202,13 @@
 	border-radius: 3px;
 	background: #ffff;
 	color: #0C86D8;
+        margin-right:10px;
 }
 
 .welAdd{
-	background: #EFF2F3;
-	margin: 0 -12px;
-	padding: 5px 12px;
+	
+	 position: absolute;
+         bottom: 12px;
 	font-size: 14px;
 	color: #0C86D8;
 }
@@ -215,7 +235,8 @@
 }
 
 .welImgAdd {
-	width: 225px;
+	
+        height:300px;
 	margin: 60px auto;
 	border: 1px solid #0C86D8;
 	border-radius: 6px;
@@ -225,6 +246,7 @@
 
 .welImgAdd img {
 	width: 100%;
+        height: 100%;
 }
 
 /* #PhotoImg {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html

@@ -10,8 +10,8 @@
 	<div class="welCard">
 		<div class="welBox active">
 			<div class="welbox2" style="padding-bottom: 20px;">
-				<div class="welT">基本信息</div>
-				<div style="color: red;">下次请使用学号和密码登录</div>
+				<div class="welT">基本信息<span style="color: red;">（下次请使用学号和密码登录）</span></div>
+
 				<input type="hidden" name="ID" value="" id="ID" />
 				<div class="welText">
 					<div>学号</div>
@@ -102,7 +102,8 @@
 					</div>
 					<div class="welInput">
 						<span>联系电话</span>
-						<input class="welInputs" id="telephone" type="text"  onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')" placeholder="请填写联系电话(重要)" />
+						<input class="welInputs" id="telephone" type="text" onkeyup="value=value.replace(/[^\d\.]/g,'')"
+							onblur="value=value.replace(/[^\d\.]/g,'')" placeholder="请填写联系电话(重要)" />
 					</div>
 				</div>
 				<div class="welT2">紧急联系人</div>
@@ -118,7 +119,9 @@
 						</div>
 						<div class="welInput">
 							<span>手机号码</span>
-							<input class="welInputs" type="text" name="Telephone" placeholder="请填写手机号码" />
+							<input class="welInputs" type="text" name="Telephone"
+								onkeyup="value=value.replace(/[^\d\.]/g,'')" onblur="value=value.replace(/[^\d\.]/g,'')"
+								placeholder="请填写手机号码" />
 						</div>
 						<div class="welInput">
 							<span>座机号码</span>
@@ -128,10 +131,20 @@
 							<span>联系地址</span>
 							<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" />
 						</div>
-						<div class="welDel"> <i class="iconfont icon-move"></i> </div>
+						<div class="welInput">
+							<span>联系地址</span>
+							<!-- <i class="iconfont icon-move"></i> -->
+						</div>
+						<!-- <div class="welDel">
+
+							<i class="iconfont icon-move"></i>
+						</div> -->
+
+						<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i> 添加紧急联系人</div> -->
 					</div>
+
 				</div>
-				<div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i> 添加紧急联系人</div>
+				<!-- <div class="welAdd"><i title="紧急联系人" class="iconfont icon-add"></i>添加紧急联系人</div> -->
 			</div>
 			<!-- <div class="btnBox">
 				<button id="saveBtn" type="button" class="lr-btn-primary lr-btn-block saveBtn">保存</button>
@@ -143,14 +156,14 @@
 				<div class="welInputBox">
 					<div class="welInput">
 						<span>开户银行</span>
-						<div name="DepositBank" id="DepositBank"  placeholder="请选择开户银行" value=""></div>
+						<div name="DepositBank" id="DepositBank" placeholder="请选择开户银行" value=""></div>
 					</div>
 					<div class="welInput">
 						<span>银行卡号</span>
 						<input class="welInputs" id="BankCard" type="text" placeholder="银行卡号" />
 					</div>
 					<div class="welInput">
-						<span>开  户  行</span>
+						<span>开 户 行</span>
 						<input class="welInputs" id="BankLocation" type="text" placeholder="开户行" />
 					</div>
 				</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.js

@@ -14,7 +14,7 @@
 				$('.welBox').css('display', 'none').eq(ind).fadeIn()
 			})
             //增加联系人
-            $page.find('.welAdd i').on('tap', function () {
+            $page.find('.welAdd').on('tap', function () {
                 var FamilyHtml = '<div class="welCon"><form class="welConForm">' +
                     '<div class="welInput">' +
                     '<span>姓名</span>' +
@@ -218,24 +218,57 @@
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>手机号码</span>' +
-							'<input class="welInputs" type="text" name="Telephone" placeholder="请填写手机号码" value="' +
+							'<input class="welInputs Telephone" type="text" name="Telephone"   placeholder="请填写手机号码" value="' +
 							item.Telephone + '"/>' +
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>座机号码</span>' +
-							'<input class="welInputs" type="text" name="Mobile" placeholder="请填写座机号码" value="' +
+							'<input class="welInputs Telephone2" type="text" name="Mobile"   placeholder="请填写座机号码" value="' +
 							item.Mobile + '"/>' +
 							'</div>' +
 							'<div class="welInput">' +
 							'<span>联系地址</span>' +
 							'<input class="welInputs" type="text" name="Address" placeholder="请填写联系地址" value="' +item.Address + '"/>' +
 							'</div>' +
-							'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
+							//'<div class="welDel"> <i class="iconfont icon-move"></i> </div>' +
 							'</form></div > ';
+                                                    
 						$('#StuInfoFreshEmergePeople').append(html);
 
-					});
-}
+					       });
+                                          }
+$('.Telephone').on('blur',function(item){
+var reg = new RegExp("^[0-9]*$")
+	if(!reg.test($(".Telephone").val())){
+
+           $(".Telephone").val("")
+           $('.Telephone').attr('placeholder',"手机号只能为数字");
+         learun.layer.loading(true, '手机号只能为数字');
+           setTimeout(function(){
+			           	learun.layer.loading(false);
+			},1000)
+	
+      
+		
+	}
+
+		
+})
+
+         $('.Telephone2').on('blur',function(item){
+        var reg = new RegExp(/^\d{3}-\d{7,8}|\d{4}-\d{7,8}$/)
+	if(!reg.test($(".Telephone2").val())){
+
+           $(".Telephone2").val("")
+           $('.Telephone2').attr('placeholder',"座机号只能为数字");
+           learun.layer.loading(true, '座机号只能为数字');
+           setTimeout(function(){
+		learun.layer.loading(false);
+            },1000)
+		
+	}
+		
+})
 
 					page.bind($page);
 					learun.layer.loading(false);
@@ -245,8 +278,11 @@
 			});
 
 			
+			
+	
             //保存
             $page.find('.saveBtn').on('tap', function () {
+
 				var postdata = {
 					ID: $('#ID').val(),
 					RegionNo: $('#RegionNo').val(),