From f5d67b69142c78be1ee996f53b6bb8e4c954761c Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 15 十一月 2023 10:06:38 +0800
Subject: [PATCH] 页面跳转修改

---
 pages/tabBar/examine/examine.vue |   67 +++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/pages/tabBar/examine/examine.vue b/pages/tabBar/examine/examine.vue
index 93a632d..18f7f79 100644
--- a/pages/tabBar/examine/examine.vue
+++ b/pages/tabBar/examine/examine.vue
@@ -7,8 +7,11 @@
 			<!-- 真正的导航栏内容 -->
 			<view style="display: flex; flex-direction: column;" >
 				<view class="navBar">
-					<u-icon style=" margin-left: -25px;" name="arrow-left" color="black" size="17" @click="goBack" />
+					<u-icon style=" margin-left: 13px;" name="arrow-left" color="black" size="17" @click="goBack" />
 					<view class="barText">工作通知审核</view>
+					<view >
+						<u-button type="text" @click="loginOut" style="color: blue;margin-right: 5px;">退出</u-button>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -51,26 +54,24 @@
 			<view class="examineList">
 				<scroll-view :scroll-top="scrollTop" scroll-y="true" class="listContent" @scrolltoupper="upper" v-if="examineList.length > 0"
 				             @scrolltolower="lower" @scroll="scroll" lower-threshold="50">
-				<!-- <view class="listContent" v-if="examineList.length > 0"> -->
-					<view v-for="(item, index) in examineList" :key="index" class="itemContent">
-						<view class="content" @click="toDetail(item)">
-							<text>[{{item.colorContent}}]</text>
-							<text>{{item.title}},{{item.content}}</text>
-							<view  style="float: right; width: 80px;margin-top: -5px;">
-								<u-button v-if="item.buttonContent == '已审核通过'" size="mini" class="buttonCo" style="background-color:rgb(17, 204, 33);color: white">
+					<view v-for="(item, index) in examineList" :key="index" class="itemContent" @click="toDetail(item)">
+						<view class="content">
+							<text class="tit">[{{item.colorContent}}]{{item.title}}</text>
+							<view class="btnGroup">
+								<text class="cont">{{item.content}}</text>
+								<u-button v-if="item.buttonContent == '已审核通过'" size="mini"  style="background-color:rgb(17, 204, 33);color: white;width: 100px;">
 									{{item.buttonContent}}
 								</u-button>
-								<u-button v-else-if="item.buttonContent == '已驳回'" size="mini" class="buttonCo" style="background-color:rgb(153, 148, 143);color: white">
+								<u-button v-else-if="item.buttonContent == '已驳回'" size="mini"  style="background-color:rgb(153, 148, 143);color: white;width: 100px;">
 									{{item.buttonContent}}
 								</u-button>
-								<u-button v-else type="error" size="mini" class="buttonCo">
+								<u-button v-else type="error" size="mini" style="width: 100px;">
 									{{item.buttonContent}}
 								</u-button>
 							</view>
 						</view>
 					</view>
 				</scroll-view>
-				<!-- </view> -->
 				<view v-else>
 					<u-empty margin-top="40%" text="数据为空" mode="data"></u-empty>
 				</view>
@@ -136,6 +137,13 @@
 			this.getExanineList();
 		},
 		methods: {
+			loginOut() {
+				uni.clearStorageSync();
+				uni.clearStorage();
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
 			goBack() {
 				console.log("1111")
 				uni.switchTab({
@@ -188,6 +196,8 @@
 			},
 			toDetail(item) {
 				console.log("item",item)
+				uni.setStorageSync('backFlag','examine');
+				console.log("uunget",uni.getStorageSync('backFlag'))
 				uni.navigateTo({
 				  url: `/pages/tabBar/notice/detail?data=` + encodeURIComponent(JSON.stringify(item))
 				})
@@ -210,7 +220,7 @@
 			lower: function(e) {
 				console.log("111")
 			  if (this.data.pageIndex * this.data.pageSize >= this.total){
-			    uni.$u.toast('已加载全部数据')
+			    // uni.$u.toast('已加载全部数据')
 			    return
 			  }
 			  //并且让页码+1,调用获取数据的方法获取第二页数据
@@ -377,17 +387,40 @@
   height: 100%;
 }
 .itemContent{
-	font-size: 16px;
 	color: #333;
+	font-size: 16px;
 	margin-top: 15px;
-    padding: 0 12px 15px;
+    padding: 0 12px 10px;
 	border-bottom: 1px solid #ebebeb;
 	
 }
 .content{
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: nowrap;
+	display: flex;
+	flex-direction: column;
+	// align-items: flex-end;
+  .tit{
+    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
+  .btnGroup{
+    // float: right;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	.cont{
+	  width: 100%;
+	  font-size: 14px;
+	  color: #666;
+	  display: block;
+	  text-overflow: ellipsis;
+	  overflow: hidden;
+	  white-space: nowrap;
+	  margin-bottom: 6px;
+	}
+  }
 }
 .buttonCo{
 	margin-top: 5px;

--
Gitblit v1.9.2