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

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

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;

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">{{ year }}</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 {
@@ -134,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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue

@@ -219,10 +219,13 @@ 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)){
+				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)&&(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||

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