From 0b2357a173a2bc52f3532bfcf93ff31daf226231 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 06 九月 2023 14:44:23 +0800
Subject: [PATCH] 导航栏退出登录

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

diff --git a/pages/tabBar/notice/notice.vue b/pages/tabBar/notice/notice.vue
index e2111ae..3c0d15a 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: blue;margin-right: 5px;">退出</u-button>
+				</view>
 				<!-- <view class="barText">{{registerID}}</view> -->
 				<!-- <view style="flex: 1;" @click="loginOut">退出</view> -->
 			</view>
@@ -50,11 +53,14 @@
 <!--				<view class="listContent" v-if="noticeList.length > 0" >-->
         <scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="noticeList.length > 0"
                      @scrolltolower="lower" @scroll="scroll" lower-threshold="50">
-					<view v-for="(item, index) in noticeList" :key="index" class="itemContent" >
+					<view v-for="(item, index) in noticeList" :key="index" class="itemContent" @click="toDetail(item)">
 						<view class="content" v-if="item.isResponse" >
-								<text style="color:rgb(17, 204, 33);" @click="toDetail(item)">[已叫应]</text>
-								<text @click="toDetail(item)">[{{item.colorContent}}]</text>
-								<text @click="toDetail(item)">{{item.title}},{{item.content}}</text>
+								<text style="color:rgb(17, 204, 33);" >[已叫应]</text>
+								<text>[{{item.colorContent}}]</text>
+								<text>{{item.title}}</text>
+              <view>
+                {{item.content}}
+              </view>
 								<!-- <view v-if="item.isResponse" style="float: right; width: 80px;margin-top: 3px;"> -->
 									<!-- <u-button @click="toDetail(item)"v-if="item.buttonContent == '已叫应'" size="mini" style="margin-bottom: 10px;background-color:rgb(17, 204, 33);color: white;">
 										{{item.buttonContent}}
@@ -171,6 +177,13 @@
 			// uni.startPullDownRefresh();
 		},
 		methods: {
+			loginOut() {
+				uni.clearStorageSync();
+				uni.clearStorage();
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
 			getNoticeList() {
 				this.loading = true
 				this.noSpeak = 0;
@@ -242,14 +255,14 @@
 				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');
@@ -264,7 +277,7 @@
       },
       lower: function(e) {
         if (this.data.pageIndex * this.data.pageSize >= this.total){
-          uni.$u.toast('已加载全部数据')
+          // uni.$u.toast('已加载全部数据')
           return
         }
         //并且让页码+1,调用获取数据的方法获取第二页数据
@@ -309,7 +322,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;
@@ -419,7 +432,7 @@
 
 .noticeList{
   margin-top: 12px;
-  height: calc(100vh - 266px);
+  height: calc(100vh - 286px);
   overflow: hidden;
   overflow-y: scroll;
 }
@@ -433,6 +446,7 @@
   border-radius: 5px;
   box-shadow: 0 3px 12px rgba(0,0,0,0.05);
   height: 100%;
+  // margin-bottom: 30px;
 }
 .itemContent{
 	font-size: 16px;
@@ -441,15 +455,22 @@
   padding: 0 12px 15px;
 	border-bottom: 1px solid #ebebeb;
 
-  &:last-of-type{
-    border-bottom: none;
-  }
+  //&:last-of-type{
+  //  border-bottom: none;
+  //}
 }
 .content{
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: nowrap;
 
+  view{
+    font-size: 14px;
+    color: #666;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
 }
 .contentNoRead{
 	font-size: 14px;

--
Gitblit v1.9.2