app2.0 学生二维码报到 入校流程

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuInfoFresh/PayFee/single.vue

@@ -264,8 +264,16 @@ export default{
 		getpayfeetotal(){
 			let value = 0
 			this.FinaChargesStandardList.map(item=>{
+				let strValue = item.SJAmount.toString()
+				// if(strValue.split(".")[1]&&strValue.split(".")[1].length>2){
+				// 	item.SJAmount = strValue.match(/^\d+(?:\.\d{0,2})?/)
+				// }
 				if(/^-?\d+(,\d{3})*(\.\d{1,2})?$/.test(item.SJAmount)){
-					value += Number(item.SJAmount)
+					if(strValue.indexOf(".") == -1&&Number(item.SJAmount)%1 === 0){
+						item.SJAmount = Number(item.SJAmount)
+					}
+					value = this.numSub(value,Number(item.SJAmount))
+					// value += Number(item.SJAmount)
 				}
 			})
 			this.payfeetotal = value
@@ -280,6 +288,24 @@ export default{
 			})
 			this.item = item
 		},
+		
+		numSub(num1, num2) { 
+			var baseNum, baseNum1, baseNum2; 
+			var precision;// 精度 
+			try { 
+			baseNum1 = num1.toString().split(".")[1].length; 
+			} catch (e) { 
+			baseNum1 = 0; 
+			} 
+			try { 
+			baseNum2 = num2.toString().split(".")[1].length; 
+			} catch (e) { 
+			baseNum2 = 0; 
+			} 
+			baseNum = Math.pow(10, Math.max(baseNum1, baseNum2)); 
+			precision = (baseNum1 >= baseNum2) ? baseNum1 : baseNum2; 
+			return ((num1 * baseNum + num2 * baseNum) / baseNum).toFixed(precision); 
+		}
 	},
 	created() {
 		this.init()

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

@@ -2,15 +2,93 @@
 	<view id="sQrCode">
 		<view class="sQrCode">
 			<view class="sQrLogo">
-				<image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
+				<image mode="widthFix" class="xc-logo" src="@/static/xc-logo.png"></image>
+				<!-- <image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
 				<view class="sQrLogoImg1">
 					<image mode="widthFix" src="@/common/images/logoXc.png"></image>
 				</view>
 				<view class="sQrLogoImg2">
 					<image mode="widthFix" src="@/common/images/logoXcTxt.png"></image>
+				</view> -->
+			</view>
+		</view>
+		<view class="sQrBox">
+			<view class="sQrT">新生报到二维码</view>
+			<view id="lr_mycode_qrcode" class="sQrImg">
+				<tki-qrcode
+				ref="qrcode"
+				:val="data.StuInfoFreshEntity.StuNo"
+				:size="size"
+				:onval="true"
+				:loadMake="true"
+				/>
+			</view>
+			<view class="sQrTxt">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</view>
+		</view>
+		<view class="sQrBox" style="margin-top: 10px;">
+			<view class="sQrList">
+				<text class="sQrList_title">学生信息</text>
+				<view>
+					<text>姓名</text>
+					<text class="sQrListTxt">{{ data.StuInfoFreshEntity.StuName }}</text>
+				</view>
+				<view>
+					<text>系别</text>
+					<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DeptNo }}</text>
+				</view>
+				<view>
+					<text>专业</text>
+					<text class="sQrListTxt">{{ data.StuInfoFreshEntity.MajorNo }}</text>
+				</view>
+				<view>
+					<text>班级</text>
+					<text class="sQrListTxt">{{ data.StuInfoFreshEntity.ClassNo }}</text>
+				</view>
+				<view>
+					<text>教室</text>
+					<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DefaultClassRoomName }}</text>
+				</view>
+			</view>
+			<view class="TeacherInfo">
+				<text class="sQrList_title">班主任信息</text>
+				
+				<view class="tInfolist">
+					<view class="tInfo_item">
+						<view class="tInfo_item_tag">
+							<text>班主任</text>
+						</view>
+						<view class="tName">
+							<text>{{ data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "" }}</text>
+						</view>
+						<view class="tPhone">
+							<text>{{ data.StuInfoFreshEntity.ClassDiredctorMobile }}</text>
+						</view>
+						<!-- <view>班主任
+							<text>{{ data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "" }}</text>
+						</view>
+						<view><text>{{ data.StuInfoFreshEntity.ClassDiredctorMobile }}</text></view> -->
+					</view>
+					<view class="tInfo_item">
+						<view class="tInfo_item_tag1">
+							<text>辅导员</text>
+						</view>
+						<view class="tName">
+							<text>{{ data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "" }}</text>
+						</view>
+						<view class="tPhone">
+							<text>{{ data.StuInfoFreshEntity.ClassTutorMobile }}</text>
+						</view>
+						<!-- <view>辅导员
+							<text>{{ data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "" }}</text>
+						</view>
+						<view><text>{{ data.StuInfoFreshEntity.ClassTutorMobile }}</text></view> -->
+					</view>
 				</view>
+				
 			</view>
-			<view class="sQrBox">
+			
+		</view>
+			<!-- <view class="sQrBox">
 				<view class="sQrT">健康通行登记</view>
 				<view class="sQrList">
 					<view>
@@ -56,10 +134,7 @@
 					/>
 				</view>
 				<view class="sQrTxt">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</view>
-				<!-- <view class="sQrText">
-					请持报到二维码到对应教室找班主任、辅导员扫描完成报到。
-				</view> -->
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -70,7 +145,9 @@ export default{
 	components: {tkiQrcode},
 	data() {
 		return {
-			data: {},
+			data: {
+				StuInfoFreshEntity:{}
+			},
 			size: 300,
 		}
 	},
@@ -117,6 +194,15 @@ export default{
 	height: 100%;
 	background-color: #eef2f3;
 	padding-bottom: 30px;
+	
+	// height: 100vh;
+	background-color: #fff;
+	// padding-bottom: 20px;
+	background-image: url("@/static/stu-bg.png");
+	background-repeat: no-repeat;
+	background-size: 100%;
+	background-color: #0c86d8;
+	
 }
 
 .sTabBox {
@@ -145,7 +231,7 @@ export default{
 	background-size: 100% 100%;
 	text-align: center;
 	line-height: 0;
-	padding: 20px 0 70px;
+	padding: 10px 0 70px;
 	position: relative;
 }
 .sQrLogo view{
@@ -169,7 +255,7 @@ export default{
 	z-index: 3;
 	margin: -50px 20px 0;
 	background-color: #fff;
-	padding: 30px 10px;
+	padding: 20px 10px;
 	border-radius: 10px;
 	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
 	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
@@ -179,27 +265,34 @@ export default{
 .sQrT {
 	font-weight: bold;
 	text-align: center;
-	font-size: 22px;
-	margin-bottom: 20px;
+	font-size: 20px;
+	margin-bottom: 16px;
 	color: #000;
 }
 
+.sQrList_title{
+	font-size: 13px;
+	font-weight: 700;
+	line-height: 26px;
+}
+
 .sQrList {
-	background-color: #f8f8f8;
-	margin: 0 10px;
+	background-color: #F0F7FF;
+	margin: 0 8px;
 	padding: 10px 15px;
-	border-radius: 4px;
+	border-radius: 8px;
 }
 
 .sQrList view {
 	padding: 7px 10px;
-	font-size: 14px;
+	font-size: 12px;
 	color: #000;
-	border-top: 1px solid #d7d7d7;
+	border-bottom: 1px solid #e5e5e5;
 }
 
-.sQrList view:first-child {
-	border: 0;
+.sQrList view:last-child {
+	border-bottom: 0;
+	color: red;
 }
 
 .sQrList view text:first-child {
@@ -208,10 +301,14 @@ export default{
 }
 
 .sQrImg {
-	width: 145px;
-	height: 145px;
+	width: 156px;
+	box-sizing: content-box;
+	// height: 145px;
 	line-height: 0;
 	margin: 20px auto;
+	border: 4px solid #f1ae5e;
+	border-radius: 6px;
+	padding: 8px;
 }
 
 .sQrImg image {
@@ -219,16 +316,19 @@ export default{
 }
 
 .sQrTxt {
-	margin:0 10px 10px;
+	margin:20px 0 0;
 	text-align: center;
-	font-size: 16px;
+	font-size: 11px;
 	font-weight: bold;
 	color: #aeaeae;
 }
 
 .sQrListTxt{
+	display: inline-block;
+	width: calc(100% - 38px);
+	text-align: right;
 	color: #000;
-	font-weight: bold;
+	// font-weight: bold;
 }
 .sQrText {
 	font-size: 12px;
@@ -250,4 +350,60 @@ export default{
 	color: #000;
 	margin-left: 5px;
 }
+
+.xc-logo{
+	width: 74%;
+}
+
+.TeacherInfo{
+	background-color: #fff5f4;
+	margin: 0 8px;
+	margin-top: 6px;
+	padding: 10px 15px;
+	padding-bottom: 0;
+	border-radius: 8px;
+}
+
+.tInfolist{
+	// width: 94%;
+	// padding: 0 18px;
+	margin: 0 auto;
+	margin-top: 8px;
+	display: flex;
+	justify-content: space-between;
+}
+
+.tInfo_item{
+	// height: 60px;
+	width: 48%;
+	background-color: #ffe8e5;
+	border-radius: 8px;
+	padding: 12px;
+	font-size: 12px;
+}
+.tInfo_item_tag{
+	line-height: 24px;
+	background-color: #da6457;
+	border-radius: 12px;
+	width: 65px;
+	text-align: center;
+	color: #fff;
+}
+.tInfo_item_tag1{
+	background-color: #f49b91;
+	line-height: 24px;
+	border-radius: 12px;
+	width: 65px;
+	text-align: center;
+	color: #fff;
+}
+.tName{
+	padding-left: 4px;
+	line-height: 30px;
+	margin-top: 4px;
+}
+.tPhone{
+	padding-left: 4px;
+	line-height: 18px;
+}
 </style>

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

@@ -0,0 +1,253 @@
+<template>
+	<view id="sQrCode">
+		<view class="sQrCode">
+			<view class="sQrLogo">
+				<image mode="widthFix" class="sQrLogoBg" src="@/common/images/xcBg.jpg"></image>
+				<view class="sQrLogoImg1">
+					<image mode="widthFix" src="@/common/images/logoXc.png"></image>
+				</view>
+				<view class="sQrLogoImg2">
+					<image mode="widthFix" src="@/common/images/logoXcTxt.png"></image>
+				</view>
+			</view>
+			<view class="sQrBox">
+				<view class="sQrT">健康通行登记</view>
+				<view class="sQrList">
+					<view>
+						<text>姓名</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.StuName }}</text>
+					</view>
+					<view>
+						<text>系别</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DeptNo }}</text>
+					</view>
+					<view>
+						<text>专业</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.MajorNo }}</text>
+					</view>
+					<view>
+						<text>班级</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.ClassNo }}</text>
+					</view>
+					<view>
+						<text>教室</text>
+						<text class="sQrListTxt">{{ data.StuInfoFreshEntity.DefaultClassRoomName }}</text>
+					</view>
+				</view>
+				<view class="sQrText">
+					<view>班主任姓名 
+						<text>{{ data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : "" }}</text>
+					</view>
+					<view>班主任电话 <text>{{ data.StuInfoFreshEntity.ClassDiredctorMobile }}</text></view>
+				</view>
+				<view class="sQrText">
+					<view>辅导员姓名 
+						<text>{{ data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : "" }}</text>
+					</view>
+					<view>辅导员电话 <text>{{ data.StuInfoFreshEntity.ClassTutorMobile }}</text></view>
+				</view>
+				<view id="lr_mycode_qrcode" class="sQrImg">
+					<tki-qrcode
+					ref="qrcode"
+					:val="data.StuInfoFreshEntity.StuNo"
+					:size="size"
+					:onval="true"
+					:loadMake="true"
+					/>
+				</view>
+				<view class="sQrTxt">请持报到二维码到对应教室找班主任、辅导员扫描完成报到。</view>
+				<!-- <view class="sQrText">
+					请持报到二维码到对应教室找班主任、辅导员扫描完成报到。
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import tkiQrcode from "@/components/tki-qrcode/tki-qrcode.vue"
+export default{
+	components: {tkiQrcode},
+	data() {
+		return {
+			data: {},
+			size: 300,
+		}
+	},
+	methods:{
+		init() {
+			let _this = this;
+			_this.LOADING('加载数据中…');
+			let userInfo = _this.GET_GLOBAL('loginUser'); //获取登录信息
+			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', userInfo.account, '加载数据时出错').then(res => {
+				this.HIDE_LOADING();
+				console.log(res);
+				_this.data = res;
+				let entity = _this.data["StuInfoFreshEntity"];
+				
+				if (entity.RegisterStatus == "1") {
+				    this.CONFIRM('数字化校园提示', '新生已确认报到').then(res => {
+				    	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;
+				}
+				
+			});
+		}
+	},
+	created() {
+		this.init()
+	}
+}
+</script>
+
+<style lang="less" scoped>
+#sQrCode {
+	height: 100%;
+	background-color: #eef2f3;
+	padding-bottom: 30px;
+}
+
+.sTabBox {
+	line-height: 24px;
+	text-align: center;
+	margin-bottom: 18px;
+	color: #333;
+}
+
+.sTabBox view {
+	display: inline-block;
+	width: 80px;
+	background-color: rgba(255, 255, 255, 0.7);
+	margin: 0 5px;
+	font-size: 14px;
+	border-radius: 2px;
+}
+.sQrLogoBg{
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	width: 100%;
+}
+.sQrLogo {
+	background-size: 100% 100%;
+	text-align: center;
+	line-height: 0;
+	padding: 20px 0 70px;
+	position: relative;
+}
+.sQrLogo view{
+	position: relative;
+	z-index: 2;
+}
+.sQrLogoImg1 image {
+	width: 20%;
+}
+
+.sQrLogoImg1 {
+	margin-bottom: 10px;
+}
+
+.sQrLogoImg2 image {
+	width: 50%;
+}
+
+.sQrBox {
+	position: relative;
+	z-index: 3;
+	margin: -50px 20px 0;
+	background-color: #fff;
+	padding: 30px 10px;
+	border-radius: 10px;
+	-webkit-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	-moz-box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
+	box-shadow: 0 4px 10px rgba(0, 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 10px;
+	padding: 10px 15px;
+	border-radius: 4px;
+}
+
+.sQrList view {
+	padding: 7px 10px;
+	font-size: 14px;
+	color: #000;
+	border-top: 1px solid #d7d7d7;
+}
+
+.sQrList view:first-child {
+	border: 0;
+}
+
+.sQrList view text:first-child {
+	color: #aeaeae;
+	margin-right: 10px;
+}
+
+.sQrImg {
+	width: 145px;
+	height: 145px;
+	line-height: 0;
+	margin: 20px auto;
+}
+
+.sQrImg image {
+	width: 100%;
+}
+
+.sQrTxt {
+	margin:0 10px 10px;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+	color: #aeaeae;
+}
+
+.sQrListTxt{
+	color: #000;
+	font-weight: bold;
+}
+.sQrText {
+	font-size: 12px;
+	color: #AEAEAE;
+	overflow: hidden;
+	margin: 15px 4px 0;
+}
+.sQrText view{
+	float: left;
+	padding: 0 5px;
+}
+.sQrText view:first-child{
+	width: 45%;
+}
+.sQrText view:last-child{
+	width: 55%;
+}
+.sQrText text{
+	color: #000;
+	margin-left: 5px;
+}
+</style>

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

@@ -10,62 +10,109 @@
 	    <view class="ensSec1">
 	        <view class="eSec1Box">
 	            <view class="eSec1Top">step<text>1</text></view>
-	            <view :class="one? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="IsCompleteInfo" @click="tapList('../welcome/list')">
-					<image src="~@/common/images/enter1-1.png" mode="widthFix" v-if="one"></image>
-					<image src="~@/common/images/enter2-1.png" mode="widthFix" v-else></image>
+	            <view :class="one? 'sSec1Type1' : 'sSec1Type2'" style="padding-top: 21px;padding-bottom:21px" class="sSec1Con" id="IsCompleteInfo" @click="tapList('../welcome/list')">
+					<image src="@/static/img-notice2/stu-info.jpg" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    完善学生信息
 	                </view>
-	                <view class="sSec1State" v-if="one">完成</view>
-	                <view class="sSec1State" v-else>未完成</view>
+					<view class="checkBoxRight">
+						<view class="check-border-box">
+							<view v-if="one" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="one">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
+	                
 	            </view>
 	        </view>
 	        <view class="eSec1Box">
 				<image src="~@/common/images/enter1-6.png" class="sSecDown" mode="widthFix"></image>
 	            <view class="eSec1Top">step<text>2</text></view>
-	            <view :class="twoOne? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="PayFeeStatus">
-					<image src="~@/common/images/enter1-2.png" mode="widthFix" v-if="twoOne"></image>
-					<image src="~@/common/images/enter2-2.png" mode="widthFix" v-else></image>
+	            <view :class="twoOne? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="PayFeeStatus" @click="tapList('/pages/EducationalAdministration/StuInfoFresh/PayFee/list')">
+					<image src="@/static/img-notice2/stu-pay.png" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    线上缴费
-	                    <text>( 已缴费、未缴费 )</text>
+	                    <text>扫描二维码缴费</text>
 	                </view>
-	                <view class="sSec1State" v-if="twoOne">完成</view>
-	                <view class="sSec1State" v-else>未完成</view>
+					<view class="checkBoxRight">
+						<view class="check-border-box" >
+							<view v-if="twoOne" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="twoOne">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
 	            </view>
 	            <view :class="twoTwo? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="StudentLoan" @click="tapList('../EducationalAdministration/StuInfoFresh/StudentLoan/list')">
-					<image src="~@/common/images/enter1-3.png" mode="widthFix" v-if="twoTwo"></image>
-					<image src="~@/common/images/enter2-3.png" mode="widthFix" v-else></image>
+					<image src="@/static/img-notice2/stu-daikuan.png" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    助学贷款
-	                    <text>( 填写贷款回执码 )</text>
+	                    <text>填写贷款回执码</text>
 	                </view>
-	                <view class="sSec1State" v-if="twoTwo">完成</view>
-	                <view class="sSec1State" v-else>未完成</view>
+					<view class="checkBoxRight">
+						<view class="check-border-box" >
+							<view v-if="twoTwo" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="twoTwo">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
 	            </view>
 	            <view :class="twoThree? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="OnsitePayFeeStatus">
-					<image src="~@/common/images/enter1-4.png" mode="widthFix" v-if="twoThree"></image>
-					<image src="~@/common/images/enter2-4.png" mode="widthFix" v-else></image>
+					<image src="@/static/img-notice2/stu-jiaofei.png" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    现场缴费
-	                    <text>( 已缴费、缓交、部分缴费、未缴费 )</text>
+	                    <text>学校现场缴费</text>
 	                </view>
-	                <view class="sSec1State" v-if="twoThree">完成</view>
-	                <view class="sSec1State" v-else>未完成</view>
+					<view class="checkBoxRight">
+						<view class="check-border-box" >
+							<view v-if="twoThree" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="twoThree">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
 	            </view>
+				<view :class="twoFour? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="OnsitePayFeeStatus">
+					<image src="@/static/img-notice2/stu-facecheck.png" mode="widthFix"></image>
+				    <view class="sSec1Txt">
+				        人脸核验
+				        <text>进行人脸识别身份验证</text>
+				    </view>
+					<view class="checkBoxRight">
+						<view class="check-border-box" >
+							<view v-if="twoFour" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="twoFour">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
+				</view>
 	        </view>
 	        <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="tapList('../EducationalAdministration/StuInfoFresh/RegisterQRCode/list')">
-					<image src="~@/common/images/enter1-5.png" mode="widthFix" v-if="three"></image>
-					<image src="~@/common/images/enter2-5.png" mode="widthFix" v-else></image>
+	            <view :class="three? 'sSec1Type1' : 'sSec1Type2'" class="sSec1Con" id="RegisterStatus" @click="()=>{if(twoFour){tapList('../EducationalAdministration/StuInfoFresh/RegisterQRCode/list')}}">
+					<image src="@/static/img-notice2/qrcode.png" mode="widthFix"></image>
 	                <view class="sSec1Txt">
 	                    报到注册
-	                    <text>( 生成报到二维码，并显示报到教室 )</text>
+	                    <text>生成报到二维码，并显示报到教室</text>
 	                </view>
-	                <view class="sSec1State" v-if="three">完成</view>
-	                <view class="sSec1State" v-else>未完成</view>
+					<view class="checkBoxRight">
+						<view class="check-border-box" >
+							<view v-if="twoThree" style="margin-left:2px;width: 32px;">
+								<image src="@/static/img-notice2/right.png" mode="widthFix"></image>
+							</view>
+						</view>
+						<view class="sSec1State" v-if="twoThree">完成</view>
+						<view class="sSec1State" v-else>未完成</view>
+					</view>
 	            </view>
 	        </view>
 	    </view>
@@ -80,6 +127,7 @@ export default{
 			twoOne: '',
 			twoTwo: '',
 			twoThree: '',
+			twoFour:'',
 			three: '',
 			userinfo: {},
 			data: {
@@ -127,6 +175,12 @@ export default{
 				} else {
 					_this.three = false
 				}
+				
+				if (_this.data["StuInfoFreshEntity"].PhotoCheckStatus == "1") {
+					_this.twoFour =  true
+				} else {
+					_this.twoFour = false
+				}
 			});
 		},
 		tapList(str) {
@@ -141,22 +195,26 @@ export default{
 
 <style lang="less" scoped>
 .enSecBox{
-	min-height: 100%;
+	height: 100vh;
 	background-color: #fff;
-	padding-bottom: 20px;
+	// padding-bottom: 20px;
+	background-image: url("@/static/stu-bg.png");
+	background-repeat: no-repeat;
+	background-size: 100%;
+	background-color: #0c86d8;
 }
 .ensTime{
 	position: relative;
 	text-align: center;
 	line-height: 24px;
 	font-size: 14px;
-	color: #B8E2FF;
+	color: #fff;
 }
 .ensTime:after,.ensTime::before{
 	content: '';
 	width: 6px;
 	height: 6px;
-	background-color: #B8E2FF;
+	background-color: #fff;
 	border-radius: 50%;
 	position: absolute;
 	top: 0;
@@ -164,32 +222,48 @@ export default{
 	margin: auto;
 }
 .ensTime:after{
-	right: 20%;
+	right: 32%;
 }
 .ensTime::before{
-	left: 20%;
+	left: 32%;
 }
 .ensHeader{
-	background-color: #0C86D8;
-	padding: 20px 0;
+	// background-color: #0C86D8;
+	// padding: 20px 0;
+	padding-top: 8px;
 }
 .ensHeadT{
-	font-size: 18px;
+	font-size: 20px;
 	color: #fff;
 	text-align: center;
 	margin-top: 15px;
+	font-weight: 700;
 }
 .ensSec1{
 	padding: 0 15px;
+	padding-left: 25px;
 }
 .eSec1Box{
 	position: relative;
-	margin-top: 20px;
+	margin-top: 14px;
+}
+.eSec1Box:before{
+	content: '';
+	position: absolute;
+	left: -10px;
+	bottom: -26px;
+	height: calc(100% + 10px);
+	border-left: #abddff 2px dashed;
 }
 .eSec1Box:first-child{
 	margin-top: 10px;
 }
+.eSec1Box:last-child:before{
+	content: '';
+	display: none;
+}
 .sSecDown{
+	display: none;
 	position: absolute;
 	width: 25px;
 	left: 0;
@@ -200,52 +274,85 @@ export default{
 .eSec1Top{
 	font-size: 14px;
 	font-weight: bold;
-	color: #ABDDFF;
+	color: #abddff;
 	font-style: italic;
-	padding-left: 18px;
+	padding-left: 8px;
+}
+.eSec1Top:before{
+	content: '';
+	background-color: #abddff;
+	position: absolute;
+	height: 8px;width: 8px;
+	border-radius: 50%;
+	left: -13px;
+	top: 10px;
 }
 .eSec1Top text {
-	color: #0C86D8;
+	color: #abddff;
 	font-size: 20px;
-	margin-left: 5px;
+	// margin-left: 5px;
 }
 .sSec1Con{
-	padding: 5px 15px 5px 25px;
+	padding: 14px 15px 14px 25px;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	margin-top: 10px;
+	background-color: #fff;
+	border-radius: 16px;
+	position: relative;
 }
 .sSec1Type1{
 	border: 2px solid #AEE8CF;
-	border-radius: 30px;
+	// border-radius: 30px;
 }
 .sSec1Type1 .sSec1State{
-	color: #12B215;
+	color: #9A9A9A;
 }
 .sSec1Type2{
 	border: 2px solid #B8E2FF;
-	border-radius: 32px;
+	// border-radius: 32px;
 }
 .sSec1Type2 .sSec1State{
-	color: #17AAEE;
+	color: #9A9A9A;
 }
 .sSec1Con > image{
 	width: 30px;
 }
 .sSec1State{
-	font-size: 14px;
+	font-size: 12px;
+	margin-top: 4px;
 } 
 .sSec1Txt{
+	flex: 1;
+	padding-left: 16px;
 	font-size: 16px;
-	text-align: center;
+	text-align: left;
 	color: #1A1A1A;
 	margin: 5px 0;
 }
 .sSec1Txt text{
 	display: block;
 	color: #9A9A9A;
-	margin-top: 2px;
+	margin-top: 4px;
 	font-size: 12px;
 }
+.checkBoxRight{
+	position: absolute;
+	right: 0;
+	height: 100%;
+	border-radius: 0 16px 16px 0;
+	border-left: 1px dashed #ABDDFF;
+	width: 78px;
+	background-color: #e5f4ff;
+	text-align: center;
+}
+.check-border-box{
+	border: #0C86D8 2px solid;
+	width: 28px;height: 28px;
+	border-radius: 2px;
+	background: #fff;
+	margin: 0 auto;
+	margin-top: 18px;
+}
 </style>

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

@@ -170,7 +170,7 @@ export default {
 				_this.queryData.Photo = res.StuInfoFreshEntity.Photo;
 				let resFile = await this.FETCH_FILEINFO(res.StuInfoFreshEntity.Photo)
 				let url = ""
-				if(resFile.F_FolderId){
+				if(resFile&&resFile.F_FolderId){
 					url = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(resFile.F_FolderId, true)
 				}
 				// id:res.StuInfoFreshEntity.Photo