From 117da08d652db513d8889924ea12b13aed68fba2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 16 七月 2024 14:59:09 +0800
Subject: [PATCH] 提交

---
 pages/tabBar/notice/notice.vue |   39 ++++++++++++++++++++++++++-------------
 1 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/pages/tabBar/notice/notice.vue b/pages/tabBar/notice/notice.vue
index bf78dc1..effb756 100644
--- a/pages/tabBar/notice/notice.vue
+++ b/pages/tabBar/notice/notice.vue
@@ -7,6 +7,9 @@
 			<!-- 真正的导航栏内容 -->
 			<view class="navBar" >
 				<view class="barText">{{user.name}}收到的工作通知</view>
+				<view >
+					<u-button type="text" @click="loginOut" style="color: #1890ff;margin-right: 5px;width: 65px;">退出</u-button>
+				</view>
 				<!-- <view class="barText">{{registerID}}</view> -->
 				<!-- <view style="flex: 1;" @click="loginOut">退出</view> -->
 			</view>
@@ -156,7 +159,7 @@
 					name: ''
 				},
 				page: 'pages/tabBar/notice/notice',
-				registerID: ''
+				registerID: '',
 			}
 		},
 		onShow () {
@@ -174,6 +177,13 @@
 			// uni.startPullDownRefresh();
 		},
 		methods: {
+			loginOut() {
+				uni.clearStorageSync();
+				uni.clearStorage();
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
 			getNoticeList() {
 				this.loading = true
 				this.noSpeak = 0;
@@ -229,6 +239,8 @@
 				if (item.responseStatus === 1) {
 					this.updateResponseStatus(item);
 				}
+				uni.setStorageSync('fdetailData', item);
+				uni.setStorageSync('backFlag','notice');
 				uni.navigateTo({
 				  url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
 				})
@@ -245,21 +257,21 @@
 				console.log("触发close")
 				this.getNoticeList();
 			},
-			loginOut() {
-				uni.removeStorageSync('tk');
-				uni.removeStorageSync('uid');
-				uni.removeStorageSync('user');
-				uni.navigateTo({
-				  url: `/pages/index/index` 
-				})
-			},
+			// loginOut() {
+			// 	uni.removeStorageSync('tk');
+			// 	uni.removeStorageSync('uid');
+			// 	uni.removeStorageSync('user');
+			// 	uni.navigateTo({
+			// 	  url: `/pages/index/index`
+			// 	})
+			// },
 			//下拉刷新
 			onPullDownRefresh() {
 				console.log('refresh');
 				setTimeout(() => {
 					uni.stopPullDownRefresh();
 					this.getNoticeList();
-				}, 1000);
+				}, 2000);
 			},
 
       upper: function(e) {
@@ -267,7 +279,7 @@
       },
       lower: function(e) {
         if (this.data.pageIndex * this.data.pageSize >= this.total){
-          uni.$u.toast('已加载全部数据')
+          // uni.$u.toast('已加载全部数据')
           return
         }
         //并且让页码+1,调用获取数据的方法获取第二页数据
@@ -312,7 +324,7 @@
   box-shadow: 0 3px 12px rgba(0,0,0,0.05);
 }
 .barText{
-	/* margin-left: 20px; */
+	 margin-left: 35px; 
 	text-align: center;
 	width: 85%;
 	font-size: 16px;
@@ -422,7 +434,7 @@
 
 .noticeList{
   margin-top: 12px;
-  height: calc(100vh - 266px);
+  height: calc(100vh - 286px);
   overflow: hidden;
   overflow-y: scroll;
 }
@@ -436,6 +448,7 @@
   border-radius: 5px;
   box-shadow: 0 3px 12px rgba(0,0,0,0.05);
   height: 100%;
+  // margin-bottom: 30px;
 }
 .itemContent{
 	font-size: 16px;

--
Gitblit v1.9.2