bugflx

components/LieBIaoList/LieBIaoList.vue

@@ -4,14 +4,11 @@
 			:autoBack="true" :placeholder="true" leftIconColor="#ffffff">
 		</u-navbar> -->
 		
-		<view class="LieBIaoListindexcontent-box">
 		<view class="LieBIaoListindexcontent-bottom">
 			<view class="LieBIaoListindexcontentbttom-item" v-for="item in contentList" @click="gotoXiangqing(item)">
 				<view class="LieBIaoListindexcontentbttom-item-top">
-						<view class="LieBIaoListindexcontentbttom-item-text">
 					{{item.caseTitle}}
 				</view>
-					</view>
 				<!-- <view class="LieBIaoListindexcontentbttom-item-bottom">
 					<view class="LieBIaoListindexcontentbttom-item-bottom-left">
 						<u-icon name="file-text" size="18" color="#595F66" class="icon"></u-icon>
@@ -55,12 +52,8 @@
 						</view>
 					</view>
 				</view>
-
 			</view>
 		</view>
-
-		</view>
-
 	</view>
 </template>
 
@@ -144,7 +137,7 @@ import {
 							caseSerialShow
 						};
 					});
-					console.log("到组件中",this.contentList);
+					// console.log("到组件中",this.contentList);
 
 				})
 			},
@@ -160,10 +153,9 @@ import {
 <style lang="scss" scoped>
 	.LieBIaoListindexcontent {
 		width: 100%;
-		height: 100%;
-			padding-bottom: 50rpx;
-		.LieBIaoListindexcontent-box {
-			padding-bottom: 50rpx;
+		margin: 25rpx 0;
+		height: calc(100% - 50rpx);
+		overflow-y: scroll;
 		.LieBIaoListindexcontent-bottom {
 			width: 100%;
 			padding: 20rpx;
@@ -177,20 +169,12 @@ import {
 				margin: 20rpx 0;
 
 				.LieBIaoListindexcontentbttom-item-top {
-						display: grid;
-						grid-template-columns: 70% 20%;
-
-						.LieBIaoListindexcontentbttom-item-text {
 					text-align: left;
 					font-weight: 500;
 					font-size: 30rpx;
 					font-weight: bold;
 					color: #35393D;
 					overflow: hidden;
-
-						}
-
-
 				}
 
 
@@ -271,8 +255,6 @@ import {
 
 			}
 		}
-		}
-
 		.dibuaBtn {
 			position: sticky;
 			bottom: 0;

main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import App from './App'
 import store from './store' // store
 import plugins from './plugins' // plugins
-import './permission' // permission
+// import './permission' // permission
 Vue.use(plugins)
 // main.js
 import uView from '@/uni_modules/uview-ui'

pages/index.vue

@@ -10,10 +10,20 @@
 			<u-tabs :list="list1" :scrollable="false" lineWidth="30" @change="utabschange"
 				:current='tabscurrent'></u-tabs>
 		</view>
-		<scroll-view class="indexcontent-box" @scrolltolower="lowerBottom" scroll-y="true">
 		<view class="indexcontent-bottom">
-				<u-search placeholder="请输入搜索内容" v-model="massEventsObj.title" @search="searchSou" @clear="qingkong"
-					showAction animation @custom="searchSou"></u-search>
+			
+		</view>
+		<scroll-view class="indexcontent-box" @scrolltolower="lowerBottom" scroll-y="true" :scroll-top="scrollTop">
+			<view class="indexcontent-bottom">
+				<u-search 
+					placeholder="请输入搜索内容" 
+					v-model="massEventsObj.title" 
+					@search="searchSou" 
+					@clear="qingkong"
+					showAction 
+					animation 
+					@custom="searchSou"
+				></u-search>
 				<template class="" v-if="contentList.length !=0">
 					<view class="indexcontentbttom-item" v-for="item in contentList">
 						<view class="indexcontentbttom-item-left">
@@ -51,7 +61,7 @@
 				</u-empty>
 			</view>
 
-
+		</scroll-view>
 		<u-tabbar :value="tabValue" @change="change1" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
 			<u-tabbar-item text="群体事件" name="群体事件-1" :badge="msgTypecount[0].count">
 				<image class="u-page__item__slot-icon" slot="active-icon" src="@/static/images/contimg/icon-0.png">
@@ -84,9 +94,7 @@
 				<image class="u-page__item__slot-icon" slot="inactive-icon"
 					src="@/static/images/contimg/icon-0-2.png"></image>
 			</u-tabbar-item>
-
 		</u-tabbar>
-		</scroll-view>
 	</view>
 </template>
 
@@ -102,6 +110,7 @@
 				tabscurrent: 0,
 				navbarValue: "群体事件",
 				tabValue: "群体事件-1",
+				scrollTop: 0,
 				list1: [{
 					name: '待审核',
 					badge: {
@@ -129,7 +138,7 @@
 				},
 				pagesLogin: "",
 				contentList: [],
-				msgTypecount: [{count:0},{count:0},{count:0},{count:0},{count:0},]
+				msgTypecount: [{count:0},{count:0},{count:0},{count:0},{count:0},],
 			}
 		},
 
@@ -141,7 +150,7 @@
 				this.massEventsObj.current = 1
 				this.massEventsObj.title = ""
 				this.getList()
-				console.log(e);
+				// console.log(e);
 			},
 			//搜索
 			searchSou() {
@@ -155,7 +164,7 @@
 			},
 			// 跳转
 			nextblack(item) {
-				console.log(item);
+				// console.log(item);
 				//navbarValue 头部标题
 				//tabscurrent 区分待审核0, 已上报1 重训练2
 				// item
@@ -164,7 +173,7 @@
 				})
 			},
 			//切换
-			change1(e) {
+			async change1(e) {
 				this.navbarValue = e.split("-")[0]
 				// 标题
 				this.massEventsObj.title = ""
@@ -179,18 +188,21 @@
 				// 头部归位
 				this.tabscurrent = 0
 				this.geteventPageCount()
-				this.getList()
+				await this.getList();
+				this.$nextTick(function() {
+					this.scrollTop = 0
+				});
 			},
 			// 触底刷新
 			//触底加载
 			lowerBottom() {
-				console.log("触底加载")
+				// console.log("触底加载")
 
 				if (this.massEventsObj.current < this.pagesLogin) {
 					++this.massEventsObj.current
 					this.getList("触底")
 				} else {
-					console.log("到底了");
+					// console.log("到底了");
 					uni.showToast({
 						title: '暂无更多',
 						icon: 'none',
@@ -202,7 +214,7 @@
 			getList(type) {
 
 				if (this.tabscurrent == 0) {
-					this.massEventsObj.isReport = null
+					this.massEventsObj.isReport = 4
 					this.massEventsObj.toBeReviewed = 0
 				} else {
 					this.massEventsObj.toBeReviewed = null
@@ -225,7 +237,7 @@
 				eventPageCount({
 					msgType: this.massEventsObj.msgType
 				}).then(res => {
-					console.log(res);
+					// console.log(res);
 					this.list1[0].badge.value = res.data
 				})
 				fiveEventCount().then(res => {
@@ -264,11 +276,20 @@
 			position: sticky;
 			top: 0;
 			left: 0;
+			::v-deep .u-tabs__wrapper__nav__item {
+				position: relative;
+				
+				.u-badge {
+					position: absolute;
+					right: 15rpx;
+					top: 30rpx;
+				}
+			}
 		}
 
 		.indexcontent-box {
 			padding: 20rpx 20rpx 0 20rpx;
-			max-height: 85vh;
+			height: 85vh;
 			overflow: auto;
 
 			.indexcontent-bottom {

views/Xiangqing/Xiangqing.vue

@@ -133,6 +133,7 @@
 		
 
 		.indexcontent-box {
+			width: 100%;
 			.indexcontent-bottom {
 				width: 100%;
 				border-radius: 10rpx;
@@ -148,7 +149,7 @@
 					.indexcontentbttom-item-bottom {
 						margin: 20rpx 0;
 						display: grid;
-						grid-template-columns: 25% auto;
+						grid-template-columns: 25% 73%;
 
 						view {
 							font-size: 35rpx;
@@ -164,6 +165,7 @@
 						}
 
 						.indexcontentbttom-item-bottom-rigth {
+							width: 100%;
 						}
 
 						.leibie {

views/jiashicangshenhe/jiashicangshenhe.vue

@@ -11,10 +11,10 @@
 						<view class="indexcontentbttom-item-text">
 							{{Objitem.title}}
 						</view>
-						<view class="indexcontentbttom-item-top-icon" @click="biaotishow">
+						<view class="indexcontentbttom-item-top-icon" v-if="tabscurrentShow || (!tabscurrentShow && Objitem.titleBefore)" @click="biaotishow">
 							<u-icon name="edit-pen" size="18" color="#4379D6" class="icon"></u-icon>
 							<view class="">
-								{{tabscurrentShow?'修改标题':'查看标题'}}
+								{{tabscurrentShow ? '修改标题' : '查看原标题' }}
 							</view>
 						</view>
 					</view>
@@ -104,7 +104,7 @@
 			</view>
 
 		</view>
-		<view class="LieBIaoList">
+		<view class="LieBIaoList" :class="!tabscurrentShow ? 'lieBiaoListTwo':''">
 			<LieBIaoList ref="LieBIaoListis" ></LieBIaoList>
 		</view>
 		<view class="dibuaBtn" v-show="tabscurrentShow">
@@ -128,13 +128,13 @@
 						当前标题：
 					</view>
 					<view class="lishi-box-jiacu">
-						{{this.Objitem.title}}
+						{{Objitem.title}}
 					</view>
-					<view class="" v-show="this.Objitem.titleBefore">
+					<view class="" v-show="Objitem.titleBefore">
 						历史标题：
 					</view>
-					<view class="lishi-box-jiacu" v-show="this.Objitem.titleBefore">
-						{{this.Objitem.titleBefore}}
+					<view class="lishi-box-jiacu" v-show="Objitem.titleBefore">
+						{{Objitem.titleBefore}}
 					</view>
 				</view>
 			</view>
@@ -168,17 +168,13 @@
 			}
 		},
 		computed: {
-
 			tabscurrentShow() {
-				console.log("进来");
-				console.log(this.tabscurrent);
 				return this.tabscurrent == 0
 			},
 		},
 		methods: {
 			// 跳转
 			nextblack(item) {
-				console.log(item);
 				uni.navigateTo({
 					url: `/views/yemianxianqging/yemianxianqging?innerEventId=${this.innerEventId}&tabscurrent=${this.tabscurrent}&navbarValue=${this.navbarValue}`
 				})
@@ -191,7 +187,6 @@
 			// 弹出层确定
 			confirm() {
 				if (this.tabscurrentShow) {
-					console.log("这里");
 					if (this.textareavalue2 != "" && this.textareavalue2 != this.Objitem.title) {
 						this.Objitem.title = this.textareavalue2
 						massEventsedit(this.Objitem).then(res => {
@@ -245,7 +240,7 @@
 						innerEventId:this.innerEventId
 					}
 					this.$refs.LieBIaoListis.open(obj)
-					console.log(this.$refs.LieBIaoListis);
+					// console.log(this.$refs.LieBIaoListis);
 				})
 				
 			},
@@ -343,9 +338,9 @@
 					margin: 20rpx 0;
 
 					.indexcontentbttom-item-top {
-						display: grid;
-						grid-template-columns: 70% 20%;
-
+						// display: grid;
+						// grid-template-columns: 75% 25%;
+						display: flex;
 						.indexcontentbttom-item-text {
 							text-align: left;
 							font-weight: 500;
@@ -353,7 +348,7 @@
 							font-weight: bold;
 							color: #35393D;
 							overflow: hidden;
-
+							flex: 1;
 						}
 
 						.indexcontentbttom-item-top-icon {
@@ -410,7 +405,7 @@
 		}
 
 		.dibuaBtn {
-			position: absolute;
+			position: fixed;
 			bottom: 0;
 			left: 0;
 			width: 100%;
@@ -465,9 +460,11 @@
 
 	.LieBIaoList {
 		padding: 10rpx;
-		height: 50vh;
+		height: 49vh;
 		width: 100%;
-		overflow: auto;
 		background-color: #f7f7f7fa;
 	}
+	.lieBiaoListTwo {
+		height: 64vh;
+	}
 </style>