Merge branch 'f-dev' into 'main'

fix:修改个人资料用户账号不能编辑，fix:修改通知分页停留在滚动位置

See merge request huang/thingskit-app!50

@@ -16,7 +16,7 @@
 					<u--input placeholder="请输入手机号码" v-model="myInfoModel.userInfo.phoneNumber" border="none"></u--input>
 					<u--input placeholder="请输入手机号码" v-model="myInfoModel.userInfo.phoneNumber" border="none"></u--input>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item labelWidth="80px" label="用户账号 " prop="userInfo.username" borderBottom ref="item1">
 				<u-form-item labelWidth="80px" label="用户账号 " prop="userInfo.username" borderBottom ref="item1">
-					<u--input placeholder="请输入用户账号 " v-model="myInfoModel.userInfo.username" border="none"></u--input>
+					<u--input disabled placeholder="请输入用户账号 " v-model="myInfoModel.userInfo.username" border="none"></u--input>
 				</u-form-item>
 				</u-form-item>
 				<u-form-item labelWidth="80px" label="邮箱地址" prop="userInfo.email" borderBottom ref="item1">
 				<u-form-item labelWidth="80px" label="邮箱地址" prop="userInfo.email" borderBottom ref="item1">
 					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.userInfo.email" border="none"></u--input>
 					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.userInfo.email" border="none"></u--input>
@@ -282,4 +282,10 @@ export default {
 /deep/ .u-form-item {
 /deep/ .u-form-item {
 	height: 100rpx !important;
 	height: 100rpx !important;
 }
 }
+/deep/ .u-form-item:nth-child(3) {
+	.u-form-item__body {
+		background: #f5f7fa !important;
+		width: 663rpx !important ;
+	}
+}
 </style>
 </style>

@@ -79,7 +79,8 @@ export default {
 			list: [],
 			list: [],
 			pre: false,
 			pre: false,
 			isJudgeNextPage: '',
 			isJudgeNextPage: '',
-			distance: 0
+			distance: 0,
+			scrollDistance: 0
 		};
 		};
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
@@ -91,20 +92,12 @@ export default {
 	onShow() {
 	onShow() {
 		this.pre = uni.getStorageSync('storagePre');
 		this.pre = uni.getStorageSync('storagePre');
 		if (this.pre) {
 		if (this.pre) {
-			// this.page.num = 1;
-			// this.loadData(this.page.num);
 		}
 		}
 	},
 	},
 	onHide() {
 	onHide() {
 		uni.removeStorageSync('storagePre');
 		uni.removeStorageSync('storagePre');
 	},
 	},
 	methods: {
 	methods: {
-		// topBack(num) {
-		// 	uni.pageScrollTo({
-		// 		scrollTop: 0, // 滚动到页面的目标位置  这个是滚动到顶部, 0
-		// 		duration: 10 // 滚动动画的时长
-		// 	});
-		// },
 		formatType(e) {
 		formatType(e) {
 			return e?.type == 'OTHER' ? '其他' : e?.type == 'MEETING' ? '会议' : '公告';
 			return e?.type == 'OTHER' ? '其他' : e?.type == 'MEETING' ? '会议' : '公告';
 		},
 		},
@@ -117,6 +110,17 @@ export default {
 			this.page.num = 1;
 			this.page.num = 1;
 			this.model1.userInfo.type = e.name;
 			this.model1.userInfo.type = e.name;
 			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
 			this.loadData(1, this.isJudgeNextPage == '' ? null : this.isJudgeNextPage);
+			uni.pageScrollTo({
+				scrollTop: this.scrollDistance + 20,
+				duration: 50
+			});
+			uni.pageScrollTo({
+				scrollTop: this.scrollDistance - 20,
+				duration: 50
+			});
+		},
+		onPageScroll(e) {
+			this.scrollDistance = e.scrollTop;
 		},
 		},
 		/*下拉刷新的回调 */
 		/*下拉刷新的回调 */
 		downCallback() {
 		downCallback() {
@@ -158,7 +162,6 @@ export default {
 					}
 					}
 				})
 				})
 				.catch(e => {
 				.catch(e => {
-					// uni.$u.toast(e.data?.message);
 					this.mescroll.endErr();
 					this.mescroll.endErr();
 				});
 				});
 		},
 		},