From 8aa5754e68324c00469e14710e7670568e0c0f1b Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Wed, 7 Sep 2022 18:23:40 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=E6=89=AB=E7=A0=81=E6=8A=A5=E5=88=B0?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XmlConfig/system.config                   |   2 +-
 .../Modules/UserApi.cs                        |   2 +-
 .../components/tki-qrcode/tki-qrcode.vue      |   2 +-
 .../LearunApp-2.2.0/config.js                 |   2 +-
 .../LearunApp-2.2.0/manifest.json             |   2 +-
 .../ConfirmStudentsCheckIn/from.vue           | 624 ++++++++++--------
 .../ConfirmStudentsCheckIn/list.vue           |   3 +
 .../LearunApp-2.2.0/pages/my/newpassword.vue  | 146 ++--
 .../LearunApp-2.2.0/pages/notice2/list.vue    |   5 +-
 .../LearunApp-2.2.0/pages/welcome/list.vue    |   2 -
 .../LearunApp-2.2.0/pages/wxLogin.vue         |   3 +-
 11 files changed, 433 insertions(+), 360 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
index 26ba167ed..38e965f34 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config	
@@ -135,7 +135,7 @@
 	<!--考试系统学生端-->
 	<add key="kaoshisystemurl" value="http://ks.bjquanjiang.com/RereClientConnector" />
 	<!--批量生成学生帐号时默认的角色Id-->
-	<add key="GenerateStudentsRoleId" value="0cfc388c-80e6-4cf0-b53b-02201827490a" />
+	<add key="GenerateStudentsRoleId" value="69cc2b48-fb23-45f9-9634-d374d1c59fc4" />
 	<!--批量生成教师帐号时默认的角色Id-->
 	<add key="GenerateTeachersRoleId" value="e1702746-185a-4480-8f19-3892066555cf" />
 	<add key="QingJuurl" value="http://xy.bjquanjiang.com/Student/LoginForSSOHandler.ashx" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs
index a21a0f8b1..603960d21 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs	
@@ -248,7 +248,7 @@ namespace Learun.Application.WebApi
                 }
             }
         }
-        private Response ModifyPasswordiden(dynamic _)
+        public Response ModifyPasswordiden(dynamic _)
         {
             ModifyModel modifyModel = this.GetReqData<ModifyModel>();
             if (userInfo.isSystem)
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tki-qrcode/tki-qrcode.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tki-qrcode/tki-qrcode.vue
index c2438ecbd..904ad6b32 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tki-qrcode/tki-qrcode.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/tki-qrcode/tki-qrcode.vue	
@@ -1,5 +1,5 @@
 <template>
-  <view class="tki-qrcode">
+  <view class="tki-qrcode" style="text-align: center;">
     <canvas
       class="tki-qrcode-canvas"
       :canvas-id="cid"
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 9958de8c0..25a822b49 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -21,7 +21,7 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-     // "http://192.168.10.68:8002/"
+     // "http://localhost:31173/"
 	"http://123.57.209.16:31173/"
   ],
   "webHost":"http://123.57.209.16:8081/",
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
index e201f3b01..57761fac5 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json	
@@ -1,6 +1,6 @@
 {
     "name" : "智慧校园",
-    "appid" : "__UNI__0CE0195",
+    "appid" : "__UNI__E4958C9",
     "description" : "智慧校园移动端",
     "versionName" : "2.1.0",
     "versionCode" : 20100,
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 4565505e8..376b5e74a 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	
@@ -7,31 +7,31 @@
 			<l-input title="准考证号" placeholder="请填写" :value="StuInfoFreshEntity.zkzh" disabled right />
 			<l-input title="考生号" placeholder="请填写" :value="StuInfoFreshEntity.ksh" disabled right />
 			<l-input title="姓名" placeholder="请填写" :value="StuInfoFreshEntity.StuName" disabled right />
-			<l-input title="性别" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'GenderNo')" disabled right />
+			<l-input title="性别" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'GenderNo')" disabled
+				right />
 			<l-input title="系别" placeholder="请填写" :value="StuInfoFreshEntity.DeptNo" disabled right />
 			<l-input title="专业" placeholder="请填写" :value="StuInfoFreshEntity.MajorNo" disabled right />
 			<l-input title="班级" placeholder="请填写" :value="StuInfoFreshEntity.ClassNo" disabled right />
 			<l-input title="身份证号" placeholder="请填写" :value="StuInfoFreshEntity.IdentityCardNo" disabled right />
 			<l-input title="出生日期" placeholder="请填写" :value="StuInfoFreshEntity.Birthday" disabled right />
 			<l-input title="户口类别" placeholder="请填写" :value="StuInfoFreshEntity.ResidenceNo" disabled right />
-			<l-input title="政治面貌" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'PartyFaceNo')" disabled right />
+			<l-input title="政治面貌" placeholder="请填写" :value="displayListItem(StuInfoFreshEntity, 'PartyFaceNo')" disabled
+				right />
 		</view>
 		<!-- {{ StuInfoFreshEntity.GenderNo }} -->
 		<!-- <view class="welLine"></view> -->
 		<view class="welT" style="padding-top: 10px;">采集照片信息</view>
-		<view class="welBox">
-			<input type="hidden" id="Photo" value="" />
-			<input id="files" type="file" accept="image/*" />
-			<view class="welImgAdd">
-				<!--<view id="welImgBtn">上传照片</view>-->
-				<img id="PhotoImg" :src="imgSrc" alt="" />
-			</view>
-			<!--<view class="welText">说明：近期两寸免冠正面彩色照小于100K</view>-->
+		<l-upload v-if="uploadVisiable" ref="upload" :number="1" :size="100" type="image/jpeg,image/jpg"
+			:value.sync="photo" />
+		<view class="passwordDes">
+			<text>照片要求：1 . 单色背景，正面，免冠近期证件照 2 . 文件格式JPG 3 . 文件大小165320KB以下</text>
 		</view>
 		<view class="welLine"></view>
 		<view class="welT" style="padding-top: 10px;">自然信息</view>
 		<view class="welLine"></view>
-		<view class="welBox"><l-input v-model="queryData.RegionNo" title="籍贯" placeholder="请填写" right /></view>
+		<view class="welBox">
+			<l-input v-model="queryData.RegionNo" title="籍贯" placeholder="请填写" right />
+		</view>
 		<view class="welT" style="padding-top: 10px;">通讯信息</view>
 		<view class="welLine"></view>
 		<view class="welBox">
@@ -51,321 +51,385 @@
 				<l-input v-model="item.Age" title="年龄" placeholder="请填写" right />
 				<!-- <l-input v-model="item.Politicy" title="政治面貌" placeholder="请填写" right /> -->
 				<l-select v-model="item.Politicy" :range="dataSource.PartyFaceNo" title="政治面貌" placeholder="请选择" />
-				<view class="welDel" @click="del('StuInfoFreshFamilyEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+				<view class="welDel" @click="del('StuInfoFreshFamilyEntities', i)"><text
+						class="text-xxl cuIcon cuIcon-move"></text></view>
 			</view>
 		</view>
 		<view class="welT" style="padding-top: 10px;">
 			紧急联系人
 			<text class="text-xxl cuIcon cuIcon-add" @click="add('StuInfoFreshEmergePeopleEntities')"></text>
 		</view>
-		<view class="welBox" id="StuInfoFreshEmergePeople" v-show="queryData.StuInfoFreshEmergePeopleEntities.length != 0">
+		<view class="welBox" id="StuInfoFreshEmergePeople"
+			v-show="queryData.StuInfoFreshEmergePeopleEntities.length != 0">
 			<view class="welCon" v-for="(item, i) in queryData.StuInfoFreshEmergePeopleEntities" :key='i'>
 				<l-input v-model="item.Name" title="姓名" placeholder="请填写" right />
 				<l-input v-model="item.Relation" title="与本人关系" placeholder="请填写" right />
 				<l-input v-model="item.Telephone" title="手机号码" placeholder="请填写" right />
 				<l-input v-model="item.Mobile" title="座机号码" placeholder="请填写" right />
 				<l-input v-model="item.Address" title="联系地址" placeholder="请填写" right />
-				<view class="welDel" @click="del('StuInfoFreshEmergePeopleEntities', i)"><text class="text-xxl cuIcon cuIcon-move"></text></view>
+				<view class="welDel" @click="del('StuInfoFreshEmergePeopleEntities', i)"><text
+						class="text-xxl cuIcon cuIcon-move"></text></view>
 			</view>
 		</view>
+		<view class="welLine"></view>
+		<view class="welBox">
+			<l-select v-model="StuInfoFreshEntity.IsPoor" :range="dataSource.YesOrNoInt" title="是否精准贫困户" placeholder="请选择" />
+			<l-select v-model="StuInfoFreshEntity.GetKeyStatus" :range="dataSource.YesOrNoInt" title="钥匙发放" placeholder="请选择" />
+			<l-select v-model="StuInfoFreshEntity.GetCardStatus" :range="dataSource.YesOrNoInt" title="校园卡发放" placeholder="请选择" />
+			<l-select v-model="StuInfoFreshEntity.OtherPayFeeStatus" :range="dataSource.YesOrNoInt" title="其他费用收取" placeholder="请选择" />
+			<l-select v-model="StuInfoFreshEntity.CollectFileStatus" :range="dataSource.YesOrNoInt" title="档案收取" placeholder="请选择" />
+		</view>
 		<view class="btn" @click="tapBtn">报到</view>
 	</view>
 </template>
 
 <script>
-import moment from 'moment';
-import get from 'lodash/get';
-import set from 'lodash/set';
-import todayTime from '@/common/js/todayTime.js';
-export default {
-	data() {
-		return {
-			pageInfo: '',
-			imgSrc: '',
-			scheme: {
-				PartyFaceNo: {
-					type: 'sourceData',
-					dataSource: '1',
-					dataSourceId: 'BCdPartyFace,partyface,partyfaceno'
+	import moment from 'moment';
+	import get from 'lodash/get';
+	import set from 'lodash/set';
+	import todayTime from '@/common/js/todayTime.js';
+	import uploadFile from '@/components/upload-file.vue'
+	export default {
+		components: {
+			uploadFile,
+		},
+		data() {
+			return {
+				photo: [],
+				uploadVisiable: false,
+				pageInfo: '',
+				imgSrc: '',
+				scheme: {
+					PartyFaceNo: {
+						type: 'sourceData',
+						dataSource: '1',
+						dataSourceId: 'BCdPartyFace,partyface,partyfaceno'
+					},
+					GenderNo: {
+						type: 'dataItem',
+						dataType: 'dataDictionary'
+					}
+				},
+				userInfo: {},
+				dataSource: {
+					GenderNo: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({
+						value: t.value,
+						text: t.text
+					})),
+					YesOrNoInt: Object.values(this.GET_GLOBAL('dataDictionary').YesOrNoInt).map(t => ({
+						value: t.value,
+						text: t.text
+					})),
+					FamilyRelation: Object.values(this.GET_GLOBAL('dataDictionary').FamilyRelation).map(t => ({
+						value: t.value,
+						text: t.text
+					})),
+					PartyFaceNo: []
+				},
+				StuInfoFreshFamilyEntities: {
+					Name: '',
+					Age: '',
+					Sex: '1',
+					Politicy: '01',
+					Relation: '01'
+				},
+				StuInfoFreshEmergePeopleEntities: {
+					Name: '',
+					Relation: '',
+					Telephone: '',
+					Mobile: '',
+					Address: ''
 				},
-				GenderNo:{
-					type: 'dataItem',
-					dataType: 'dataDictionary'
+				ID: '',
+				queryData: {
+					RegisterStatus: '1',
+					ArriveDate: '',
+					RegionNo: '',
+					FamilyAddress: '',
+					telephone: '',
+					Photo: '',
+					StuInfoFreshFamilyEntities: [],
+					StuInfoFreshEmergePeopleEntities: []
+				},
+				StuInfoFreshEntity: {
+
 				}
+			};
+		},
+		methods: {
+			async init() {
+				// console.log(this.API)
+				let _this = this;
+				Promise.all([
+					this.FETCH_DATASOURCE('BCdPartyFace').then(data => {
+						// console.log(data)
+						this.dataSource.PartyFaceNo = data.data.map(t => ({
+							text: t.partyface,
+							value: t.partyfaceno
+						}));
+					}),
+
+					() => {}
+				]);
+				_this.LOADING('加载数据…');
+				_this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
+				_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.pageInfo.StuNo, '加载数据时出错').then(async res => {
+					this.HIDE_LOADING();
+					if (res.StuInfoFreshEntity.RegisterStatus&&res.StuInfoFreshEntity.RegisterStatus==1) {
+						this.TOAST('该学生已经报过到了。');
+						// setTimeout(() => {
+						// 	this.NAV_BACK()
+						// }, 1000)
+						// return;
+					}
+					_this.StuInfoFreshEntity = _this.COPY(res.StuInfoFreshEntity);
+					_this.queryData.StuInfoFreshFamilyEntities = _this.COPY(res.StuInfoFreshFamilyList);
+					_this.queryData.StuInfoFreshEmergePeopleEntities = _this.COPY(res
+						.StuInfoFreshEmergePeopleList);
+					_this.ID = res.StuInfoFreshEntity.ID;
+
+					_this.queryData.Photo = res.StuInfoFreshEntity.Photo;
+					let resFile = await this.FETCH_FILEINFO(res.StuInfoFreshEntity.Photo)
+					let url = ""
+					if (resFile && resFile.F_FolderId) {
+						url = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(resFile
+							.F_FolderId, true)
+					}
+					_this.photo = (res.StuInfoFreshEntity.Photo && url) ? [{
+						url,
+						id: res.StuInfoFreshEntity.Photo
+					}] : [];
+					_this.refreshComponent()
+					_this.queryData.telephone = res.StuInfoFreshEntity.telephone;
+					_this.queryData.FamilyAddress = res.StuInfoFreshEntity.FamilyAddress;
+					_this.queryData.RegionNo = res.StuInfoFreshEntity.RegionNo;
+				});
 			},
-			userInfo: {},
-			dataSource:{
-				GenderNo: Object.values(this.GET_GLOBAL('dataDictionary').usersex).map(t => ({ value: t.value, text: t.text })),
-				FamilyRelation: Object.values(this.GET_GLOBAL('dataDictionary').FamilyRelation).map(t => ({ value: t.value, text: t.text })),
-				PartyFaceNo:[]
+			async tapBtn() {
+				var postqueryData = {};
+				postqueryData.ArriveDate = todayTime.fmtDate().ymdhMins;
+				postqueryData.RegisterStatus = '1';
+				postqueryData.RegisterStatus =this.StuInfoFreshEntity.IsPoor;
+				postqueryData.GetKeyStatus =this.StuInfoFreshEntity.GetKeyStatus;
+				postqueryData.GetCardStatus =this.StuInfoFreshEntity.GetCardStatus;
+				postqueryData.OtherPayFeeStatus =this.StuInfoFreshEntity.OtherPayFeeStatus;
+				postqueryData.CollectFileStatus =this.StuInfoFreshEntity.CollectFileStatus;
+				let _postData = {
+					keyValue: this.ID,
+					strEntity: JSON.stringify(postqueryData)
+				}
+				this.LOADING('正在提交数据…');
+				this.HTTP_POST('StuInfoFresh/save', _postData, '加载数据时出错').then(res => {
+					this.HIDE_LOADING();
+					if (res) {
+						this.TOAST('报到成功');
+						setTimeout(() => {
+							this.NAV_BACK()
+						}, 1000)
+					}
+				});
 			},
-			StuInfoFreshFamilyEntities:{
-				Name: '',
-				Age: '',
-				Sex: '1',
-				Politicy: '01',
-				Relation: '01'
+			add(str) {
+				let jsons = this.COPY(this[str]);
+				this.queryData[str].push(jsons)
+				// console.log(this.queryData[str])
 			},
-			StuInfoFreshEmergePeopleEntities:{
-				Name: '',
-				Relation: '',
-				Telephone: '',
-				Mobile: '',
-				Address: ''
+			del(str, num) {
+				this.queryData[str].splice(num, 1)
 			},
-			ID: '',
-			queryData:{
-				RegisterStatus: '1',
-				ArriveDate: '',
-				RegionNo: '',
-				FamilyAddress: '',
-				telephone: '',
-				Photo: '',
-				StuInfoFreshFamilyEntities:[],
-				StuInfoFreshEmergePeopleEntities: []
+			refreshComponent() {
+				// this.uploadVisiable = false
+				this.$nextTick(() => {
+					this.uploadVisiable = true
+				})
 			},
-			StuInfoFreshEntity:{
-				
-			}
-		};
-	},
-	methods: {
-		init() {
-			// console.log(this.API)
-			let _this = this;
-			Promise.all([
-				this.FETCH_DATASOURCE('BCdPartyFace').then(data => {
-					// console.log(data)
-					this.dataSource.PartyFaceNo = data.data.map(t => ({
-						text: t.partyface,
-						value: t.partyfaceno
-					}));
-				}),
-			
-				() => {}
-			]);
-			_this.LOADING('加载数据…');
-			_this.pageInfo = _this.GET_PARAM(); //获取页面传递参数
-			_this.HTTP_GET('StuInfoFresh/stuInfoFreshEntity', _this.pageInfo.StuNo, '加载数据时出错').then(res => {
-				this.HIDE_LOADING();
-				// console.log(res);
-				_this.StuInfoFreshEntity = _this.COPY(res.StuInfoFreshEntity);
-				_this.queryData.StuInfoFreshFamilyEntities = _this.COPY(res.StuInfoFreshFamilyList);
-				_this.queryData.StuInfoFreshEmergePeopleEntities = _this.COPY(res.StuInfoFreshEmergePeopleList);
-				_this.ID = res.StuInfoFreshEntity.ID;
-				_this.queryData.Photo = res.StuInfoFreshEntity.Photo;
-				_this.queryData.telephone = res.StuInfoFreshEntity.telephone;
-				_this.queryData.FamilyAddress = res.StuInfoFreshEntity.FamilyAddress;
-				_this.queryData.RegionNo = res.StuInfoFreshEntity.RegionNo;
-				_this.imgSrc = this.API.slice(0,-1) + res.Url;
-			});
-		},
-		tapBtn() {
-			console.log(this.queryData)
-			this.queryData.ArriveDate = todayTime.fmtDate().ymdhMins;
-			let _postData = {
-				keyValue: this.ID,
-				strEntity: JSON.stringify(this.queryData)
-			}
-			this.LOADING('正在提交数据…');
-			this.HTTP_POST('StuInfoFresh/save', _postData, '加载数据时出错').then(res => {
-				this.HIDE_LOADING();
-				console.log(res);
-				if (res) {
-					setTimeout(()=>{
-						this.TOAST('保存成功');
-					},100)
-					this.NAV_BACK()
-				}
-			});
-		},
-		add(str) {
-			let jsons = this.COPY(this[str]);
-			this.queryData[str].push(jsons)
-			// console.log(this.queryData[str])
-		},
-		del(str, num) {
-			this.queryData[str].splice(num, 1) 
-		},
 
-		// 显示列表中的标题项
-		displayListItem(item, field) {
-			const fieldItem = this.scheme[field];
-			const value = item[field];
-			// console.log(Object.values(this.GET_GLOBAL('dataDictionary').usersex));
-			
-			switch (fieldItem.type) {
-				case 'currentInfo':
-				case 'organize':
-					return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '');
-					
-				case 'dataItem':
-					const sex = this.dataSource[field].find(t => t.value === String(value));
-					return get(sex, 'text', '');
-				
-				case 'sourceData':
-					const BCdPartyFace = this.dataSource[field].find(t => t.value === String(value));
-					return get(BCdPartyFace, 'text', '');
-				
-				case 'radio':
-				case 'select':
-					const selectItem = this.dataSource[field].find(t => t.value === String(value));
-					return get(selectItem, 'text', '');
+			// 显示列表中的标题项
+			displayListItem(item, field) {
+				const fieldItem = this.scheme[field];
+				const value = item[field];
+				// console.log(Object.values(this.GET_GLOBAL('dataDictionary').usersex));
 
-				case 'checkbox':
-					if (!value || value.split(',').length <= 0) {
-						return '';
-					}
-					const checkboxItems = value.split(',');
-					return this.dataSource[field]
-						.filter(t => checkboxItems.includes(t.value))
-						.map(t => t.text)
-						.join('，');
+				switch (fieldItem.type) {
+					case 'currentInfo':
+					case 'organize':
+						return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType),
+							`${value}.name`, '');
 
-				case 'datetime':
-					if (!value) {
-						return '';
-					}
-					return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm');
+					case 'dataItem':
+						const sex = this.dataSource[field].find(t => t.value === String(value));
+						return get(sex, 'text', '');
+
+					case 'sourceData':
+						const BCdPartyFace = this.dataSource[field].find(t => t.value === String(value));
+						return get(BCdPartyFace, 'text', '');
 
-				default:
-					return value === null || value === undefined ? '' : value;
+					case 'radio':
+					case 'select':
+						const selectItem = this.dataSource[field].find(t => t.value === String(value));
+						return get(selectItem, 'text', '');
+
+					case 'checkbox':
+						if (!value || value.split(',').length <= 0) {
+							return '';
+						}
+						const checkboxItems = value.split(',');
+						return this.dataSource[field]
+							.filter(t => checkboxItems.includes(t.value))
+							.map(t => t.text)
+							.join('，');
+
+					case 'datetime':
+						if (!value) {
+							return '';
+						}
+						return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' :
+							'YYYY-MM-DD HH:mm');
+
+					default:
+						return value === null || value === undefined ? '' : value;
+				}
 			}
+		},
+		created() {
+			this.userInfo = this.GET_GLOBAL('loginUser'); //获取登录信息
+			this.init();
 		}
-	},
-	created() {
-		this.userInfo = this.GET_GLOBAL('loginUser'); //获取登录信息
-		this.init();
-	}
-};
+	};
 </script>
 
 <style lang="less" scoped>
-/deep/ .cu-form-group {
-	min-height: 40px;
-}
-.welcome {
-	padding: 1px 0px 20px;
-	background: #fff;
-}
+	/deep/ .cu-form-group {
+		min-height: 40px;
+	}
+
+	.welcome {
+		padding: 1px 0px 20px;
+		background: #fff;
+	}
+
+	.welT {
+		font-size: 16px;
+		margin-bottom: 10px;
+		line-height: 26px;
+		padding: 0 12px;
+	}
+
+	.welT text {
+		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;
+	}
 
-.welT {
-	font-size: 16px;
-	margin-bottom: 10px;
-	line-height: 26px;
-	padding: 0 12px;
-}
+	.welInput {
+		overflow: hidden;
+		font-size: 14px;
+		margin-top: 10px;
+	}
 
-.welT text {
-	width: 26px;
-	height: 26px;
-	line-height: 24px;
-	border: 1px solid #efefef;
-	border-radius: 4px;
-	float: right;
-	text-align: center;
-	color: #999;
-}
+	.welInput span {
+		float: left;
+		width: 26%;
+		text-align: right;
+		line-height: 30px;
+	}
 
-.welLine {
-	height: 1px;
-	background: #efefef;
-	// margin: 10px -12px;
-}
+	.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;
+	}
 
-.welInput {
-	overflow: hidden;
-	font-size: 14px;
-	margin-top: 10px;
-}
+	.welCon {
+		padding: 10px;
+		border: 1px solid #efefef;
+		margin-top: 18px;
+		border-radius: 4px;
+		position: relative;
+	}
 
-.welInput span {
-	float: left;
-	width: 26%;
-	text-align: right;
-	line-height: 30px;
-}
+	.welDel {
+		position: absolute;
+		top: -8px;
+		left: -8px;
+		background: #fff;
+	}
 
-.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;
-}
+	.welDel text {
+		text-align: center;
+		width: 26px;
+		height: 26px;
+		display: block;
+		line-height: 24px;
+		border: 1px solid #efefef;
+		border-radius: 50%;
+	}
 
-.welCon {
-	padding: 10px;
-	border: 1px solid #efefef;
-	margin-top: 18px;
-	border-radius: 4px;
-	position: relative;
-}
+	.welImgAdd {
+		text-align: center;
+		line-height: 0;
+	}
 
-.welDel {
-	position: absolute;
-	top: -8px;
-	left: -8px;
-	background: #fff;
-}
+	#files {
+		opacity: 0;
+		-webkit-opacity: 0;
+		z-index: 9;
+		display: none;
+	}
 
-.welDel text {
-	text-align: center;
-	width: 26px;
-	height: 26px;
-	display: block;
-	line-height: 24px;
-	border: 1px solid #efefef;
-	border-radius: 50%;
-}
+	#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;
+	}
 
-.welImgAdd {
-	text-align: center;
-	line-height: 0;
-}
+	.welImgAdd {
+		min-height: 110px;
+	}
 
-#files {
-	opacity: 0;
-	-webkit-opacity: 0;
-	z-index: 9;
-	display: none;
-}
+	#PhotoImg {
+		width: 110px;
+		height: 110px;
+	}
 
-#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;
-}
-.welImgAdd {
-	min-height: 110px;
-}
-#PhotoImg {
-	width: 110px;
-	height: 110px;
-}
+	.btnBox {
+		margin-top: 20px;
+		text-align: center;
+	}
 
-.btnBox {
-	margin-top: 20px;
-	text-align: center;
-}
-#saveBtn {
-	margin: auto;
-	margin-top: 25px;
-	width: 92%;
-}
-#StuInfoFreshFamily,#StuInfoFreshEmergePeople{
-	padding: 0 15px;
-}
+	#saveBtn {
+		margin: auto;
+		margin-top: 25px;
+		width: 92%;
+	}
+
+	#StuInfoFreshFamily,
+	#StuInfoFreshEmergePeople {
+		padding: 0 15px;
+	}
 </style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue
index 74f0e473b..c55fb0ec2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue	
@@ -38,6 +38,9 @@ export default {
 	  })
     },
   },
+  created() {
+  	 this.NAV_TO('./from', { StuNo: res.result }, true);
+  }
 };
 </script>
 
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue
index 4bb8deece..4275a76c8 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue	
@@ -1,75 +1,87 @@
 <template>
-  <view class="page">
-    <l-title>设置密码</l-title>
-    <l-input v-model="oldPwd" title="旧密码" placeholder="请输入身份证后八位" password></l-input>
-    <l-input v-model="newPwd" title="新密码" placeholder="请输入新密码" password></l-input>
-    <l-input v-model="confirmPwd" title="确认输入" placeholder="请再次输入新密码" password></l-input>
-	<view class="passwordDes">
-		<text>新密码必须8-20位同时包含1.[大小写字母]、2.[数字]、3.[特殊符号!@#$%^&*]</text>
+	<view class="page">
+		<l-title>设置密码</l-title>
+		<l-input v-model="oldPwd" title="旧密码" placeholder="请输入身份证后八位" password></l-input>
+		<l-input v-model="newPwd" title="新密码" placeholder="请输入新密码" password></l-input>
+		<l-input v-model="confirmPwd" title="确认输入" placeholder="请再次输入新密码" password></l-input>
+		<view class="passwordDes">
+			<text>新密码必须8-20位同时包含1.[大小写字母]、2.[数字]、3.[特殊符号!@#$%^&*]</text>
+		</view>
+		<view class="padding">
+			<l-button @click="submit" size="lg" color="blue" class="block" block>确认修改</l-button>
+		</view>
 	</view>
-    <view class="padding">
-      <l-button @click="submit" size="lg" color="blue" class="block" block>确认修改</l-button>
-    </view>
-  </view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      oldPwd: '',
-      newPwd: '',
-      confirmPwd: ''
-    }
-  },
-
-  methods: {
-    // 提交修改
-    async submit() {
-      const { auth, oldPwd, newPwd, confirmPwd } = this
-      if (oldPwd.length < 6) {
-        this.CONFIRM('操作失败', '旧密码输入不正确，请重新确认')
-        return
-      }
-      // if (newPwd.length < 6 || newPwd.length > 16) {
-      //   this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
-      //   return
-      // }
-	  var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
-	  if( !reg.test(newPwd) ){
-	  	this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
-	  	return 
-	  }
-      if (newPwd !== confirmPwd) {
-        this.CONFIRM('操作失败', '新密码和确认密码输入不一致，请修改')
-        return
-      }
-
-      const success = await this.HTTP_POST(
-        'learun/adms/user/modifypwiden',
-        {
-          newpassword: this.MD5(newPwd),
-          oldpassword: oldPwd
-        },
-        '未能成功修改密码'
-      )
-      if (!success) {
-        return
-      }
-
-      this.NAV_BACK()
-	  setTimeout(()=>{
-		this.TOAST('密码修改成功')
-	  },100)
-    }
-  }
-}
+	import moment from 'moment';
+	import get from 'lodash/get';
+	import set from 'lodash/set';
+	export default {
+		data() {
+			return {
+				userInfo: {},
+				oldPwd: '',
+				newPwd: '',
+				confirmPwd: ''
+			}
+		},
+		methods: {
+			init() {
+				this.SET_GLOBAL('token', this.GET_STORAGE('token'));
+			},
+			// 提交修改
+			submit() {
+				// const {
+				// 	auth,
+				// 	oldPwd,
+				// 	newPwd,
+				// 	confirmPwd
+				// } = this
+				if (this.oldPwd.length < 6) {
+					this.CONFIRM('操作失败', '旧密码输入不正确，请重新确认')
+					return
+				}
+				// if (newPwd.length < 6 || newPwd.length > 16) {
+				//   this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+				//   return
+				// }
+				var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+				if (!reg.test(this.newPwd)) {
+					this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+					return
+				}
+				if (this.newPwd !== this.confirmPwd) {
+					this.CONFIRM('操作失败', '新密码和确认密码输入不一致，请修改')
+					return
+				}
+				let obj={
+					newpassword: this.MD5(this.newPwd),
+					oldpassword: this.oldPwd
+				}
+				this.HTTP_POST('learun/adms/user/modifypwiden', obj, '未能成功修改密码').then(res => {
+					this.HIDE_LOADING();
+					if (res) {
+						this.TOAST('密码修改成功')
+						setTimeout(() => {
+							this.CLEAR_GLOBAL()
+							this.RELAUNCH_TO('/pages/login')
+						}, 100)
+					}
+				});
+			}
+		},
+		created() {
+			this.userInfo = this.GET_GLOBAL('loginUser'); //获取登录信息
+			this.init();
+		}
+	}
 </script>
 <style lang="scss">
-.passwordDes{
-	color: #606266;
-	font-size: 14px;
-	padding: 8px;
-	text-indent:2em;
-}
+	.passwordDes {
+		color: #606266;
+		font-size: 14px;
+		padding: 8px;
+		text-indent: 2em;
+	}
 </style>
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 ac58db522..bae827061 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	
@@ -138,10 +138,7 @@ export default{
 		}
 	},
 	onShow() {
-		if(data.StuInfoFreshFamilyList.length>0)
-		{
-			this.init();
-		}
+		this.init();
 	},
 	methods:{
 		init() {
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue
index 1efe55b36..8fcb4821d 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/welcome/list.vue	
@@ -173,9 +173,7 @@ export default {
 				if(resFile&&resFile.F_FolderId){
 					url = this.API + '/learun/adms/annexes/wxdown?' + this.URL_QUERY(resFile.F_FolderId, true)
 				}
-				// id:res.StuInfoFreshEntity.Photo
 				_this.photo = (res.StuInfoFreshEntity.Photo&&url)?[{url,id:res.StuInfoFreshEntity.Photo}]:[];
-				// _this.fileList = res.StuInfoFreshEntity.FilesList||[]
 				_this.refreshComponent()
 				_this.queryData.telephone = res.StuInfoFreshEntity.telephone;
 				_this.queryData.FamilyAddress = res.StuInfoFreshEntity.FamilyAddress;
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue
index 6904f9c85..6d89c92ac 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/wxLogin.vue	
@@ -273,8 +273,7 @@ export default {
       this.SET_STORAGE('token', token)
 
       this.HIDE_LOADING()
-      // this.TAB_TO('/pages/home')
-	  this.NAV_TO('/pages/my/newpassword')
+      this.TAB_TO('/pages/home')
     },
 
     // 验证用户输入