From 06e6e230fc97fe5fd7675dc4245b6fa54febecc3 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 8 Sep 2022 11:28:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?app2.0=E6=89=AB=E7=A0=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue
index 376b5e74a..1f233ad13 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue	
@@ -209,7 +209,7 @@
 				var postqueryData = {};
 				postqueryData.ArriveDate = todayTime.fmtDate().ymdhMins;
 				postqueryData.RegisterStatus = '1';
-				postqueryData.RegisterStatus =this.StuInfoFreshEntity.IsPoor;
+				postqueryData.IsPoor =this.StuInfoFreshEntity.IsPoor;
 				postqueryData.GetKeyStatus =this.StuInfoFreshEntity.GetKeyStatus;
 				postqueryData.GetCardStatus =this.StuInfoFreshEntity.GetCardStatus;
 				postqueryData.OtherPayFeeStatus =this.StuInfoFreshEntity.OtherPayFeeStatus;

From ee833e3b46c74730e68f9b6b23224526d8d6b873 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 8 Sep 2022 11:58:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=85=A5=E6=A0=A1?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E6=97=B6=E9=97=B4=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4,=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8E=BB=E6=8E=89=E8=B7=B3=E8=BD=AC=E9=A1=B5?=
 =?UTF-8?q?,=E6=96=B0=E7=94=9F=E4=BF=A1=E6=81=AF+=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/common/js/todayTime.js                   | 5 +++++
 .../LearunApp-2.2.0/pages/notice2/list.vue                   | 3 ++-
 .../LearunApp-2.2.0/pages/welcome/list.vue                   | 4 ++--
 .../LearunApp-2.2.0/pages/wxLogin.vue                        | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js
index 916052f92..d3d379634 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/todayTime.js	
@@ -12,6 +12,11 @@ export default {
 			ymdhMins:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length) + ' ' + h.substring(h.length-2,h.length) + ':' + min.substring(min.length-2,min.length) + ':' + second.substring(second.length-2,second.length),
 			ymd:y+"-"+m.substring(m.length-2,m.length)+"-"+d.substring(d.length-2,d.length)
 		};
+	},
+	doHandleYear(obj) {
+		var myDate = obj? new Date(obj) : new Date();
+		var tYear = myDate.getFullYear();
+		return tYear;
 	}
 }
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
index bae827061..c6a85f471 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue	
@@ -4,7 +4,7 @@
 	    <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
 	    <!-- 可以点击类名  sSec1Tap -->
 	    <view class="ensHeader">
-	        <view class="ensTime">2020</view>
+	        <view class="ensTime">{{ todayTime.doHandleYear() }}</view>
 	        <view class="ensHeadT">新生入校流程</view>
 	    </view>
 	    <view class="ensSec1">
@@ -120,6 +120,7 @@
 </template>
 
 <script>
+	import todayTime from '@/common/js/todayTime.js';
 export default{
 	data() {
 		return {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
index 8fcb4821d..84b366d30 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
@@ -219,10 +219,10 @@ export default {
 			if(!this.photo.length)array.push("[采集照片信息]：不能为空")
 			// if(!this.queryData.RegionNo)array.push("[籍贯]：不能为空")
 			// if(!this.queryData.FamilyAddress)array.push("[家庭住址]：不能为空")
-			if(!this.queryData.telephone)array.push("[联系电话]：不能为空")
+			if(!this.queryData.telephone||!/^(\+\d{2,3}\-)?\d{11}$/.test(this.queryData.telephone))array.push("[联系电话]：" + !this.queryData.telephone?"不能为空":"格式错误"))
 			if(!this.queryData.StuInfoFreshFamilyEntities.length||
 				!this.queryData.StuInfoFreshFamilyEntities.every((item)=>{
-					return item.Name&&(item.Relation||item.Relation===0)&&(item.Sex||item.Sex===0)&&(item.Age||item.Age===0)&&(item.Politicy||item.Politicy===0)
+					return item.Name&&(item.Relation||item.Relation===0)&&(item.Sex||item.Sex===0)&&/^[1-9]\d*$/.test(item.Age)&&(item.Politicy||item.Politicy===0)
 				})
 			)array.push("[家庭成员]：未完善")
 			// if(!this.queryData.StuInfoFreshEmergePeopleEntities.length||
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue
index 6d89c92ac..b2192b11f 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue	
@@ -158,7 +158,7 @@ export default {
 				if(!success){
 					return
 				}
-				window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + success.appid + "&redirect_uri=" + encodeURIComponent('http://' + window.location.host + '/#/pages/weixinLogin') + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+				window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + success.appid + "&redirect_uri=" + encodeURIComponent('http://' + window.location.host + '/#/pages/wxLogin') + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
 			})
 		}
 	},

From f2731cf29005c0701e2eaa4418a9545a7f6094b3 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 8 Sep 2022 15:20:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LearunApp-2.2.0/pages/notice2/list.vue        | 15 ++++++++++++---
 .../LearunApp-2.2.0/pages/welcome/list.vue        |  5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue
index c6a85f471..41d07fd4c 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/notice2/list.vue	
@@ -4,7 +4,7 @@
 	    <!-- 未完成 类名 sSec1Type2 图片   enter2-1 enter2-2 enter2-3 enter2-4 enter2-5-->
 	    <!-- 可以点击类名  sSec1Tap -->
 	    <view class="ensHeader">
-	        <view class="ensTime">{{ todayTime.doHandleYear() }}</view>
+	        <view class="ensTime">{{ year }}</view>
 	        <view class="ensHeadT">新生入校流程</view>
 	    </view>
 	    <view class="ensSec1">
@@ -135,20 +135,29 @@ export default{
 				StuInfoFreshEntity:{},
 				StuInfoFreshFamilyList: [],
 				StuInfoFreshEmergePeopleList: []
-			}
+			},
+			year:'',
+			ready:false,
 		}
 	},
 	onShow() {
-		this.init();
+		if(this.ready){
+			this.init();
+		}
 	},
 	methods:{
 		init() {
 			let _this = this;
 			_this.userinfo = _this.GET_GLOBAL('loginUser'); //获取登录信息
+			this.year = todayTime.doHandleYear()
 			_this.LOADING('加载数据中…');
 			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.userinfo.account, '加载数据时出错').then(res => {
+				this.ready = true
 				_this.HIDE_LOADING();
 				console.log(res);
+				if(res.StuInfoFreshEntity == null){
+					res.StuInfoFreshEntity = {}
+				}
 				_this.data = _this.COPY(res);
 				if (this.data["StuInfoFreshFamilyList"].length && this.data["StuInfoFreshFamilyList"].length > 0) {
 					_this.one =  true
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
index 84b366d30..ed4ac64a3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
@@ -219,7 +219,10 @@ export default {
 			if(!this.photo.length)array.push("[采集照片信息]：不能为空")
 			// if(!this.queryData.RegionNo)array.push("[籍贯]：不能为空")
 			// if(!this.queryData.FamilyAddress)array.push("[家庭住址]：不能为空")
-			if(!this.queryData.telephone||!/^(\+\d{2,3}\-)?\d{11}$/.test(this.queryData.telephone))array.push("[联系电话]：" + !this.queryData.telephone?"不能为空":"格式错误"))
+			if(!this.queryData.telephone||!/^(\+\d{2,3}\-)?\d{11}$/.test(this.queryData.telephone)){
+				let str = this.queryData.telephone?"格式错误":"不能为空"
+				array.push("[联系电话]：" + str)
+			}
 			if(!this.queryData.StuInfoFreshFamilyEntities.length||
 				!this.queryData.StuInfoFreshFamilyEntities.every((item)=>{
 					return item.Name&&(item.Relation||item.Relation===0)&&(item.Sex||item.Sex===0)&&/^[1-9]\d*$/.test(item.Age)&&(item.Politicy||item.Politicy===0)