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

Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js

@@ -21,10 +21,10 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-     "http://192.168.10.68:8002/"
-	// "http://123.57.209.16:31173/"
+     // "http://192.168.10.68:8002/"
+	"http://123.57.209.16:31173/"
   ],
-  "webHost":"http://192.168.10.68:8001/",
+  "webHost":"http://123.57.209.16:8081/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue

@@ -167,18 +167,6 @@ export default{
 				    	if(res) this.NAV_BACK()
 				    })
 				}
-				if (entity.IsCompleteInfo == "未完善") {
-					this.CONFIRM('数字化校园提示', '新生未完善个人信息，无法报到').then(res => {
-						if(res) this.NAV_BACK()
-					})
-				    return false;
-				}
-				if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") {
-					this.CONFIRM('新生未缴费，无法报到').then(res => {
-						if(res) this.NAV_BACK()
-					})
-				    return false;
-				}
 				
 			});
 		}

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/from.vue

@@ -172,7 +172,9 @@ export default {
 				this.HIDE_LOADING();
 				console.log(res);
 				if (res) {
-					this.TOAST('保存成功');
+					setTimeout(()=>{
+						this.TOAST('保存成功');
+					},100)
 					this.NAV_BACK()
 				}
 			});

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

@@ -98,7 +98,7 @@
 	        <view class="eSec1Box">
 	            <image src="~@/common/images/enter1-6.png" class="sSecDown" mode="widthFix"></image>
 	            <view class="eSec1Top">step<text>3</text></view>
-	            <view :class="three? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="RegisterStatus" @click="()=>{if(twoFour){tapList('../EducationalAdministration/StuInfoFresh/RegisterQRCode/list')}}">
+	            <view :class="three? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="RegisterStatus" @click="()=>{if(twoFour){tapList('../EducationalAdministration/StuInfoFresh/RegisterQRCode/list')}else{TOAST('请核验人脸后再报到注册')}}">
 					<image src="@/static/img-notice2/qrcode.png" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    报到注册
@@ -137,6 +137,12 @@ export default{
 			}
 		}
 	},
+	onShow() {
+		if(data.StuInfoFreshFamilyList.length>0)
+		{
+			this.init();
+		}
+	},
 	methods:{
 		init() {
 			let _this = this;
@@ -195,7 +201,7 @@ export default{
 
 <style lang="less" scoped>
 .enSecBox{
-	height: 100vh;
+	min-height: 100vh;
 	background-color: #fff;
 	// padding-bottom: 20px;
 	background-image: url("@/static/stu-bg.png");