From e97cbd81486e8737d66855faa8be109bd114c022 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 24 七月 2024 17:30:46 +0800
Subject: [PATCH] 提交
---
pages/tabBar/examine/examine.vue | 135 +++++++++++++++++++++++++++++++++++---------
1 files changed, 106 insertions(+), 29 deletions(-)
diff --git a/pages/tabBar/examine/examine.vue b/pages/tabBar/examine/examine.vue
index 90c1acd..840758d 100644
--- a/pages/tabBar/examine/examine.vue
+++ b/pages/tabBar/examine/examine.vue
@@ -7,11 +7,17 @@
<!-- 真正的导航栏内容 -->
<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: #1890ff;margin-right: 5px;width: 65px;">退出</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="controlBar">
<view class="buttonGroup">
@@ -46,26 +52,26 @@
</view>
<view style="display: flex;flex-direction: column;margin-bottom: 55px;">
<view class="examineList">
- <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">
+ <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 margin-top="40%" text="数据为空" mode="data"></u-empty>
</view>
@@ -84,9 +90,11 @@
},
data() {
return {
+ loading:false,
+ scrollTop: 0,
data: {
pageIndex: 1,
- pageSize: 999999999,
+ pageSize: 10,
searchParams: {
emergType: null,//1-紧急；2-常规
warningLevel: null,//1-红色预警；2-橙色预警；3-黄色预警；4-蓝色预警
@@ -125,26 +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 ? '已审核通过' : '已驳回';
@@ -152,19 +178,26 @@
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();
},
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))
})
@@ -175,11 +208,29 @@
setTimeout(() => {
uni.stopPullDownRefresh();
this.getExanineList();
- }, 1000);
+ }, 2000);
},
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)
+ },
}
}
@@ -210,6 +261,7 @@
box-shadow: 0 3px 12px rgba(0,0,0,0.05);
}
.barText{
+ margin-left: 20px;
text-align: center;
width: 85%;
font-size: 16px;
@@ -326,25 +378,50 @@
// height: 35px;
// }
.listContent{
- display: flex;
- flex-direction: column;
- margin: 0 12px;
- background: #fff;
- border-radius: 5px;
- box-shadow: 0 3px 12px rgba(0,0,0,0.05);
+ 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{
- 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