diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index bc5568d8a..9958de8c0 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/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 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue index bc4a2a8c7..e8a2916c7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/list.vue +++ b/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; - } }); } 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 5e4395eac..4565505e8 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 @@ -172,7 +172,9 @@ export default { this.HIDE_LOADING(); console.log(res); if (res) { - this.TOAST('保存成功'); + setTimeout(()=>{ + this.TOAST('保存成功'); + },100) this.NAV_BACK() } }); 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 cb9f080f9..ac58db522 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 @@ -98,7 +98,7 @@ step3 - + 报到注册 @@ -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{