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/examine/examine.vue | 285 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 211 insertions(+), 74 deletions(-)
diff --git a/pages/tabBar/examine/examine.vue b/pages/tabBar/examine/examine.vue
index bf4a83c..a9c222f 100644
--- a/pages/tabBar/examine/examine.vue
+++ b/pages/tabBar/examine/examine.vue
@@ -5,71 +5,79 @@
<!-- 状态栏占位 -->
<view class="statusBar" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
<!-- 真正的导航栏内容 -->
- <view class="navBar" >
- <view class="barText">工作通知审核</view>
+ <view style="display: flex; flex-direction: column;" >
+ <view class="navBar">
+ <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>
+ <div v-if="loading" style='display: flex;justify-content: center;position: absolute;width:100%;top: 40%;left: 0'>
+ <u-loading-icon></u-loading-icon>
+ </div>
<!-- 页面内容 -->
- <view class="contentList">
+ <view class="controlBar">
<view class="buttonGroup">
- <view style="display: flex;">
- <view class="buttonAll all"
- :class="{ 'active': selectedSaleAnalysis === 'all'}"
- @click="handleButtonClick({label: 'all',name: '全部'})">
- 全部
- </view>
- <view v-for="(button, index) in buttons" :key="index" class="buttonItem"
- :class="{ 'active': selectedSaleAnalysis === button.label,
- 'all': button.label === 'all',
- 'red': button.label === 'red',
- 'orange':button.label === 'orange',
- 'yellow':button.label === 'yellow',
- 'blue': button.label === 'blue'}"
- @click="handleButtonClick(button)">
- {{ button.name }}
- </view>
+ <view class="buttonItem all"
+ :class="{ 'active': selectedSaleAnalysis === 'all'}"
+ @click="handleButtonClick({label: 'all',name: '全部'})">
+ 全部
</view>
- <view class="switchBtn">
- <text style="margin-right: 7px;">仅紧临</text>
- <u-switch v-model="checked" size="20" @change="clickSwitch"></u-switch>
+ <view v-for="(button, index) in buttons" :key="index" class="buttonItem"
+ :class="{ 'active': selectedSaleAnalysis === button.label,
+ 'all': button.label === 'all',
+ 'red': button.label === 'red',
+ 'orange':button.label === 'orange',
+ 'yellow':button.label === 'yellow',
+ 'blue': button.label === 'blue'}"
+ @click="handleButtonClick(button)">
+ {{ button.name }}
</view>
</view>
- <view class="examineList">
- <view class="listHead">
- <u-checkbox-group style="margin-left: 15px;">
- <u-checkbox v-model="isReadOnly" :checked="isReadOnly" @change="chooseRead"></u-checkbox>只显示待审核
+ <view class="listHead">
+ <view class="switchBtn">
+ <u-checkbox-group>
+ <u-checkbox v-model="isReadOnly" :checked="isReadOnly" @change="chooseRead"></u-checkbox>
</u-checkbox-group>
+ <text>只显示待审核</text>
</view>
- <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 class="switchBtn">
+ <u-switch v-model="checked" size="20" @change="clickSwitch" style="margin-right: 6px"></u-switch>
+ <text>仅紧临</text>
+ </view>
+ </view>
+ </view>
+ <view style="display: flex;flex-direction: column;margin-bottom: 55px;">
+ <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 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>
- </view>
+ </scroll-view>
<view v-else>
- <u-empty
- mode="data"
- icon="http://cdn.uviewui.com/uview/empty/data.png"
- margin-top="50%">
- </u-empty>
+ <u-empty margin-top="40%" text="数据为空" mode="data"></u-empty>
</view>
</view>
</view>
- <tabBar :currentPagePath="page"></tabBar>
+ <!-- <tabBar :currentPagePath="page"></tabBar> -->
</view>
</template>
@@ -78,10 +86,12 @@
import {getExamine} from '../../../api/examine.js'
export default {
components:{
- tabBar
+ // tabBar
},
data() {
return {
+ loading:false,
+ scrollTop: 0,
data: {
pageIndex: 1,
pageSize: 10,
@@ -123,20 +133,44 @@
uni.hideTabBar();
},
onShow() {
+ this.data.pageIndex = 1
this.getExanineList();
},
methods: {
+ loginOut() {
+ uni.clearStorageSync();
+ uni.clearStorage();
+ uni.navigateTo({
+ url: '/pages/index/index'
+ })
+ },
+ goBack() {
+ console.log("1111")
+ uni.switchTab({
+ url:'/pages/tabBar/firstPage/firstPage'
+ });
+ this.selectedSaleAnalysis = 'all';
+ this.checked = false;
+ this.isReadOnly = false;
+ },
getExanineList() {
+ this.loading = true
this.data.searchParams.reviewStatus = this.isReadOnly ? 1 : null;
this.data.searchParams.emergType = this.checked ? 1 : null;
this.data.searchParams.warningLevel = this.selectedSaleAnalysis == 'all' ? null : this.selectedSaleAnalysis =='red' ? 1 : this.selectedSaleAnalysis =='orange' ? 2: this.selectedSaleAnalysis =='yellow'? 3 : 4;
getExamine(this.data).then(res => {
if(res.code == 100) {
- this.examineList = res.data ? res.data : [];
- console.log("res111111",res);
+ let list = res.data?res.data: [];
+ if (res.pageIndex != 1) {
+ this.examineList = this.examineList.concat(list)
+ } else {
+ this.examineList = list;
+ }
+ this.total = res.total
+ // this.examineList = res.data ? res.data : [];
+ console.log("res111111",this.examineList);
this.examineCopy = this.examineList;
if(this.examineList.length > 0) {
-
this.examineList.forEach((item, index) => {
this.examineList[index].colorContent = item.warningLevel == 1 ? '红色预警': item.warningLevel == 2 ? '橙色预警': item.warningLevel == 3 ? '黄色预警':'蓝色预警';
this.examineList[index].buttonContent = item.reviewStatus == 1 ? '待审核': item.reviewStatus == 2 ? '已审核通过' : '已驳回';
@@ -144,14 +178,19 @@
this.examineList[index].warningLevel = item.warningLevel;
});
}
+ }else{
+ uni.$u.toast(res.msg)
}
+ this.loading = false
})
},
handleButtonClick(button) {
+ this.data.pageIndex = 1
this.selectedSaleAnalysis = button.label;
this.getExanineList();
},
chooseRead(e) {
+ this.data.pageIndex = 1
this.isReadOnly = e;
this.getExanineList();
},
@@ -171,13 +210,31 @@
},
clickSwitch(e) {
this.getExanineList();
- }
+ this.data.pageIndex = 1
+ },
+ upper: function(e) {
+ // console.log(e)
+ },
+ lower: function(e) {
+ console.log("111")
+ if (this.data.pageIndex * this.data.pageSize >= this.total){
+ // uni.$u.toast('已加载全部数据')
+ return
+ }
+ //并且让页码+1,调用获取数据的方法获取第二页数据
+ this.data.pageIndex++
+ //此处调用自己获取数据列表的方法
+ this.getExanineList()
+ },
+ scroll: function(e) {
+ // console.log(e)
+ },
}
}
</script>
-<style>
+<style lang="scss" scoped>
.box {
display: flex;
flex-direction: column;
@@ -193,12 +250,13 @@
z-index: 1;
}
.navBarBox .navBar {
- background-color:lightgrey;
- height: 25px;
+ background-color:#fff;
+ height: 50px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
+ box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
.barText{
text-align: center;
@@ -210,7 +268,7 @@
.statusBar{
background-color:lightgrey;
}
-.contentList{
+/* .contentList{
display: flex;
flex-direction: column;
}
@@ -232,65 +290,144 @@
border-radius: 5px;
font-size: 12px;
font-weight: 700;
+} */
+.controlBar{
+ margin: 12px 12px 0;
+ padding: 12px;
+ height: 90px;
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ width: calc(100% - 24px);
+ background: #fff;
+ border-radius: 5px;
+ box-shadow: 0 3px 12px rgba(0,0,0,0.05);
+
+ .buttonGroup{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 12px;
+ }
+
+ .listHead{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
}
.buttonItem{
- margin-left:5px;
+ width: calc(20% - 4px);
color: white;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
- width: 47px;
height: 30px;
border-radius: 5px;
+ &.active{
+ border: 1px solid rgba(0,0,0,.4);
+ box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+ }
+}
+.all {
+ background-color: rgb(17,204,33);
+ &.active{
+ background-image: linear-gradient(#22992d,#12da23);
+ }
}
.active {
border: 1.5px solid #8d8d8d;
}
-.all {
- background-color: rgb(17,204,33);
-}
.red {
- background-color: red;
+ background-color: #ff5555;
+ &.active{
+ background:linear-gradient(#dc2f2f, #ff5b5b);
+ }
}
.orange {
background-color: rgb(251, 158, 13);
+ &.active{
+ background: linear-gradient(#e28e0c,#ffa90e);
+ }
}
.yellow {
background-color: rgb(255, 223, 37);
+ &.active{
+ background: linear-gradient(#e6c921,#ffef28);
+ }
}
.blue {
- background-color: rgb(2, 167, 240);
+ background-color: #409EFF;
+ &.active{
+ background: linear-gradient(#3a8ee6,#44a9ff);
+ }
}
.switchBtn{
display: flex;
align-items: center;
}
-.listHead{
- display: flex;
- align-items: center;
- background-color:lightgrey;
- height: 35px;
-}
+// .listHead{
+// display: flex;
+// align-items: center;
+// background-color:lightgrey;
+// height: 35px;
+// }
.listContent{
- display: flex;
- flex-direction: column;
- padding: 10px 10px;
+ display: flex;
+ flex-direction: column;
+ width: calc(100% - 24px);
+ margin: 0 12px;
+ background: #fff;
+ border-radius: 5px;
+ box-shadow: 0 3px 12px rgba(0,0,0,0.05);
+ height: 100%;
}
.itemContent{
+ color: #333;
font-size: 16px;
- color: gray;
- margin-top: 10px;
- border-bottom: 1px solid lightgrey;
+ margin-top: 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;
margin-bottom: 10px;
}
+.examineList{
+ margin-top: 12px;
+ height: calc(100vh - 266px);
+ overflow: hidden;
+ overflow-y: scroll;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.2