diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/reportBg.png b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/reportBg.png
new file mode 100644
index 000000000..f03e24700
Binary files /dev/null and b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/images/reportBg.png differ
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css
index 1a369d668..829f85aed 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.css
@@ -1,137 +1,122 @@
-.welcome {
- padding: 1px 12px 20px;
- background: #fff;
-}
-
-.welT {
- font-size: 16px;
- margin-bottom: 10px;
- line-height: 26px;
-}
-
- .welT i {
- width: 26px;
- height: 26px;
- line-height: 24px;
- border: 1px solid #efefef;
- border-radius: 4px;
- float: right;
- text-align: center;
- color: #999;
- }
-
-.welLine {
- height: 1px;
- background: #efefef;
- margin: 10px -12px;
-}
-
-.welText {
- overflow: hidden;
- font-size: 14px;
- margin-top: 5px;
-}
-
- .welText span {
- float: right;
- width: 60%;
- text-align: right;
- }
-
-.welInput {
- overflow: hidden;
- font-size: 14px;
- margin-top: 10px;
-}
-
- .welInput span {
- float: left;
- width: 26%;
- text-align: right;
- line-height: 30px;
- }
-
- .welInput input {
- display: block;
- margin-left: 28%;
- width: 72%;
- border: 1px solid #efefef;
- border-radius: 4px;
- height: 30px;
- line-height: 28px;
- padding: 0 10px;
- margin-bottom: 0;
- }
-
-.welCon {
- padding: 10px;
- border: 1px solid #efefef;
- margin-top: 18px;
- border-radius: 4px;
- position: relative;
-}
-
-.welDel {
- position: absolute;
- top: -8px;
- left: -8px;
- background: #fff;
-}
-
- .welDel i {
- text-align: center;
- width: 26px;
- height: 26px;
- display: block;
- line-height: 24px;
- border: 1px solid #efefef;
- border-radius: 50%;
- }
-
-.welImgAdd {
- text-align: center;
- line-height: 0;
-}
-
-#files {
- opacity: 0;
- -webkit-opacity: 0;
- z-index: 9;
- display: none;
-}
-
-#welImgBtn {
- display: block;
- width: 110px;
- height: 30px;
- text-align: center;
- line-height: 26px;
- border: 2px solid #efefef;
- border-radius: 4px;
- font-size: 14px;
- color: #999;
- margin: 10px auto;
- cursor: pointer;
-}
-
-#Img {
- width: 200px;
- height: 200px;
- margin: 30px auto;
-}
-
- #Img img {
- width: 100%;
- height: 100%;
- }
-
-.btnBox {
- margin-top: 20px;
- text-align: center;
-}
-
-#saveBtn {
- margin: auto;
- margin-top: 25px;
- width: 92%;
+#sQrCode {
+ height: 100%;
+ background-color: #EEF2F3;
+ padding-bottom: 30px;
}
+
+.sTabBox {
+ line-height: 24px;
+ text-align: center;
+ margin-bottom: 18px;
+ color: #333;
+}
+
+.sTabBox div {
+ display: inline-block;
+ width: 80px;
+ background-color: rgba(255, 255, 255, .7);
+ margin: 0 5px;
+ font-size: 14px;
+ border-radius: 2px;
+}
+
+.sQrLogo {
+ background-image: url(images/reportBg.png);
+ background-size: 100% 100%;
+ text-align: center;
+ line-height: 0;
+ padding: 20px 0 70px;
+}
+
+.sQrLogoImg1 img {
+ width: 20%;
+}
+
+.sQrLogoImg1 {
+ margin-bottom: 10px;
+}
+
+.sQrLogoImg2 img {
+ width: 50%;
+}
+
+.sQrBox {
+ margin: -50px 20px 0;
+ background-color: #fff;
+ padding: 30px 38px;
+ border-radius: 10px;
+ -webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+ -moz-box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+ box-shadow: 0 4px 10px rgba(0, 0, 0, .1);
+}
+
+.sQrT {
+ font-weight: bold;
+ text-align: center;
+ font-size: 22px;
+ margin-bottom: 20px;
+ color: #000;
+}
+
+.sQrList {
+ background-color: #F8F8F8;
+ margin: 0 -15px;
+ padding: 10px 30px;
+ border-radius: 4px
+}
+
+.sQrList div {
+ padding: 7px 10px;
+ font-size: 14px;
+ color: #000;
+ border-top: 1px solid #D7D7D7;
+}
+
+.sQrList div:first-child {
+ border: 0;
+}
+
+.sQrList div span {
+ color: #AEAEAE;
+ margin-right: 10px;
+}
+
+.sQrImg {
+ width: 145px;
+ height: 145px;
+ line-height: 0;
+ margin: 20px auto;
+}
+
+.sQrImg img {
+ width: 100%;
+}
+
+.sQrTxt {
+ margin-bottom: 10px;
+ text-align: center;
+ font-size: 16px;
+ font-weight: bold;
+ color: #AEAEAE;
+}
+
+.sQrText {
+ font-size: 12px;
+ color: #AEAEAE;
+ overflow: hidden;
+ margin: 15px -15px 0;
+}
+.sQrText div{
+ float: left;
+ padding: 0 5px;
+}
+.sQrText div:first-child{
+ width: 45%;
+}
+.sQrText div:last-child{
+ width: 55%;
+}
+.sQrText span{
+ color: #000;
+ margin-left: 5px;
+}
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html
index e84887552..b46fee571 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html
@@ -1,74 +1,34 @@
-<div class="welcome">
- <div class="welT">报到二维码</div>
- <div class="welBox">
- <div class="welImgAdd">
- <div id="Img"></div>
+<div class="lr-form-container" id="sQrCode">
+ <div class="sQrCode">
+ <div class="sQrLogo">
+ <!-- <div class="sTabBox">
+ <div id="aa">正常</div>
+ <div id="bb">异常微弱</div>
+ <div id="cc">异常严重</div>
+ </div> -->
+ <div class="sQrLogoImg1"><img src="images/logoXc.png" alt=""></div>
+ <div class="sQrLogoImg2"><img src="images/logoXcTxt.png" alt=""></div>
+ </div>
+ <div class="sQrBox">
+ <div class="sQrT">新生报到二维码</div>
+ <div class="sQrList">
+ <div><span>姓名</span><strong></strong></div>
+ <div><span>系别</span><strong></strong></div>
+ <div><span>专业</span><strong></strong></div>
+ <div><span>班级</span><strong></strong></div>
+ <div><span>教室</span><strong></strong></div>
+ </div>
+ <div class="sQrText">
+ <div>班主任姓名 <span></span></div>
+ <div>班主任电话 <span></span></div>
+ </div>
+ <div class="sQrText">
+ <div>辅导员姓名 <span></span></div>
+ <div>辅导员电话 <span></span></div>
+ </div>
+ <div id="lr_mycode_qrcode" class="sQrImg"></div>
+ <div class="sQrTxt">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</div>
+ <!-- <div class="sQrText">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</div> -->
</div>
</div>
- <div class="welLine"></div>
- <div class="welT">报到信息</div>
- <div class="welBox">
- <input type="hidden" name="ID" value="" id="ID" />
- <div class="welText">
- 学号
- <span id="StuNo"></span>
- </div>
- <div class="welText">
- 准考证号
- <span id="zkzh"></span>
- </div>
- <div class="welText">
- 考生号
- <span id="ksh"></span>
- </div>
- <div class="welText">
- 姓名 <span id="StuName"></span>
- </div>
- <div class="welText">
- 性别
- <span id="GenderNo"></span>
- </div>
- <div class="welText">
- 系别
- <span id="DeptNo"></span>
- </div>
- <div class="welText">
- 专业
- <span id="MajorNo"></span>
- </div>
- <div class="welText">
- 班级
- <span id="ClassNo"></span>
- </div>
- <div class="welText">
- 默认教室
- <span id="DefaultClassRoomName"></span>
- </div>
- <div class="welText">
- 班主任编号
- <span id="ClassDiredctorNo"></span>
- </div>
- <div class="welText">
- 班主任姓名
- <span id="ClassDiredctorName"></span>
- </div>
- <div class="welText">
- 班主任电话
- <span id="ClassDiredctorMobile"></span>
- </div>
- <div class="welText">
- 辅导员编号
- <span id="ClassTutorNo"></span>
- </div>
- <div class="welText">
- 辅导员姓名
- <span id="ClassTutorName"></span>
- </div>
- <div class="welText">
- 辅导员电话
- <span id="ClassTutorMobile"></span>
- </div>
- </div>
- <div class="welLine"></div>
-
-</div>
+</div>
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
index 143c62d77..ad02f4cf6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
@@ -3,15 +3,17 @@
var colDataItemCode = ['usersex'];
var page = {
- isScroll: false,
+ isScroll: true,
init: function ($page) {
// 获取登录者信息
var userinfo = learun.storage.get('userinfo');
//数据绑定
learun.layer.loading(true, '获取数据中');
- learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
+ // learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => {
+ learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", '2019010102', (data) => {
if (data) {
+ console.log(data);
//判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一；
var entity = data["StuInfoFreshEntity"];
if (entity.RegisterStatus == "1") {
@@ -36,32 +38,23 @@
return false;
}
- //报到信息
- for (var id in entity) {
- var dom = $('#' + id)[0];
- if (dom) {
- if (dom.tagName.toLowerCase() == "span") {
- $('#' + id).html(entity['' + id + '']);
- //数据字典
- if ($.inArray(id, colDataItemArr) >= 0) {
- learun.clientdata.get('dataItem', {
- code: colDataItemCode[$.inArray(id, colDataItemArr)],
- key: entity['' + id + ''],
- callback: function (data, op) {
- $('#' + id).html(data.text);
- }
- });
- }
-
- } else if (dom.tagName.toLowerCase() == "input") {
- $('#' + id).val(entity['' + id + '']);
- }
- }
- }
+ //学生
+ $('.sQrList strong').eq(0).html(data.StuInfoFreshEntity.StuName);
+ $('.sQrList strong').eq(1).html(data.StuInfoFreshEntity.DeptNo);
+ $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo);
+ $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo);
+ //班主任
+ $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName);
+ $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile);
+ //辅导员
+ $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName);
+ $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile);
+ // $('#sQrList strong').eq(0).html(data.StuInfoFreshEntity.StuName);
//二维码
- learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account });
+ // learun.code.encode({ id: 'Img', text: userinfo.baseinfo.account });
+ learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo });
- page.bind($page);
+
learun.layer.loading(false);
}