Merge branch 'ft-dev' into 'main'

fix：修改通知分页前端判断状态

See merge request huang/thingskit-app!48

@@ -138,21 +138,20 @@ export default {
 				}
 				}
 			});
 			});
 		},
 		},
-		showToastWip(){
-			uni.$u.toast('拼命开发中 ...')
+		showToastWip() {
+			uni.$u.toast('拼命开发中 ...');
 		},
 		},
 		openCamera() {
 		openCamera() {
-			// uni.navigateTo({
-			// 	url: 'camera/camera'
-			// });
-			this.showToastWip()
+			uni.navigateTo({
+				url: 'camera/camera'
+			});
+			// this.showToastWip()
 		},
 		},
 		openOrgStatus() {
 		openOrgStatus() {
 			// uni.navigateTo({
 			// uni.navigateTo({
 			// 	url: 'configuration/configuration'
 			// 	url: 'configuration/configuration'
 			// });
 			// });
-			this.showToastWip()
-
+			this.showToastWip();
 		},
 		},
 		//告警状态查询
 		//告警状态查询
 		navigatorAlarmStatus(e) {
 		navigatorAlarmStatus(e) {

@@ -249,7 +249,8 @@ export default {
 							let userInfo = {
 							let userInfo = {
 								...resObj,
 								...resObj,
 								token: true, //token用于判断是否登录
 								token: true, //token用于判断是否登录
-								isThirdLogin: false
+								isThirdLogin: false,
+								isThirdLoginAndNoDind: true
 							};
 							};
 							if (userInfo.token) {
 							if (userInfo.token) {
 								this.setUserInfo(userInfo);
 								this.setUserInfo(userInfo);
@@ -311,7 +312,8 @@ export default {
 						let userInfo = {
 						let userInfo = {
 							...resObj,
 							...resObj,
 							token: true, //token用于判断是否登录
 							token: true, //token用于判断是否登录
-							isThirdLogin: false
+							isThirdLogin: false,
+							isThirdLoginAndNoDind: true
 						};
 						};
 						if (userInfo.token) {
 						if (userInfo.token) {
 							this.setUserInfo(userInfo);
 							this.setUserInfo(userInfo);

@@ -46,13 +46,16 @@
 			</u--form>
 			</u--form>
 		</view>
 		</view>
 		<view class="basic-bottom u-flex">
 		<view class="basic-bottom u-flex">
-			<view class="item" v-if="info.data.isThirdLoginAndNoDind">
+			<view class="item" v-if="info.data.isThirdLoginAndNoDind && isJudgeBindBtn">
 				<button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }"><text class="un-bind-text">解绑</text></button>
 				<button class="submit" size="default" @click="clearAccountFunc" :style="{ background: InfoColor }"><text class="un-bind-text">解绑</text></button>
 			</view>
 			</view>
 			<view
 			<view
 				class="item"
 				class="item"
 				style="margin-right: 60rpx;"
 				style="margin-right: 60rpx;"
-				:style="[{ position: info.data.isThirdLoginAndNoDind ? '' : 'relative' }, { right: info.data.isThirdLoginAndNoDind ? '' : '-190rpx' }]"
+				:style="[
+					{ position: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : 'relative' },
+					{ right: info.data.isThirdLoginAndNoDind && isJudgeBindBtn ? '' : '-190rpx' }
+				]"
 			>
 			>
 				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
 				<button class="submit" size="default" @click="onSubmitFunc" :style="{ background: PrimaryColor }"><text class="un-bind-text">确认</text></button>
 			</view>
 			</view>
@@ -100,7 +103,8 @@ export default {
 			id: '',
 			id: '',
 			info: {},
 			info: {},
 			openIds: '',
 			openIds: '',
-			isUpdatePersonOrLoginInfo: false
+			isUpdatePersonOrLoginInfo: false,
+			isJudgeBindBtn: true
 		};
 		};
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
@@ -141,6 +145,7 @@ export default {
 							title: '解绑成功'
 							title: '解绑成功'
 						});
 						});
 						this.showBind = false;
 						this.showBind = false;
+						this.isJudgeBindBtn = false;
 					} else {
 					} else {
 						uni.showToast({
 						uni.showToast({
 							title: '解绑失败'
 							title: '解绑失败'

@@ -10,9 +10,15 @@
 		</view>
 		</view>
 		<view style="height: 76rpx;"></view>
 		<view style="height: 76rpx;"></view>
 		<view class="notify-main">
 		<view class="notify-main">
+			<!-- 无数据图片 -->
+			<view v-if="list.length == 0" style="position: relative;top: 100rpx;flex-direction: column;" class="u-flex">
+				<view><image style="width: 280rpx;height: 250rpx;" src="../../static/empty.png"></image></view>
+				<view style="text-align: center;"><text style="font-size: 12px;color: gray;">~ 空空如也 ~</text></view>
+			</view>
+			<!-- 无数据图片 -->
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 				<view class="u-flex main">
 				<view class="u-flex main">
-					<view @click="clickNotifyDetail(item.sysNotice)" class="u-flex main-item" v-for="(item, index) in list" :key="index">
+					<view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list" :key="index">
 						<view class="u-flex item">
 						<view class="u-flex item">
 							<view class="item-avatar"><u-avatar class="avatar" shape="circle" size="40" :src="item.sysNotice.avatar"></u-avatar></view>
 							<view class="item-avatar"><u-avatar class="avatar" shape="circle" size="40" :src="item.sysNotice.avatar"></u-avatar></view>
 							<view class="u-flex item-content">
 							<view class="u-flex item-content">
@@ -72,7 +78,8 @@ export default {
 			},
 			},
 			list: [],
 			list: [],
 			pre: false,
 			pre: false,
-			isJudgeNextPage: ''
+			isJudgeNextPage: '',
+			distance: 0
 		};
 		};
 	},
 	},
 	onLoad(e) {
 	onLoad(e) {
@@ -84,14 +91,20 @@ 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);
+			// 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' ? '会议' : '公告';
 		},
 		},
@@ -145,19 +158,18 @@ export default {
 					}
 					}
 				})
 				})
 				.catch(e => {
 				.catch(e => {
-					uni.$u.toast(e.data?.message);
+					// uni.$u.toast(e.data?.message);
 					this.mescroll.endErr();
 					this.mescroll.endErr();
 				});
 				});
 		},
 		},
-		clickNotifyDetail(e) {
+		clickNotifyDetail(e, i) {
+			this.list[i].readStatus = 1;
 			uni.$u.http
 			uni.$u.http
-				.get(`/yt/noticeUser/${e.id}`)
+				.get(`/yt/noticeUser/${e.sysNotice.id}`)
 				.then(res => {})
 				.then(res => {})
-				.catch(e => {
-					uni.$u.toast(e.data?.message);
-				});
+				.catch(e => {});
 			uni.navigateTo({
 			uni.navigateTo({
-				url: './notifyDetail?data=' + encodeURIComponent(JSON.stringify(e))
+				url: './notifyDetail?data=' + encodeURIComponent(JSON.stringify(e.sysNotice))
 			});
 			});
 		}
 		}
 	}
 	}