Browse Source

bug修复

ming 3 years ago
parent
commit
3a38a9d428

+ 2 - 2
pages/authAdd/authAdd.vue

@@ -246,7 +246,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/authManage/authManage',
 				
 					});
@@ -311,7 +311,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/authManage/authManage',
 					});
 				}, 1000);

+ 10 - 3
pages/authManage/authManage.vue

@@ -81,9 +81,11 @@
 				flag: false,
 				
 				currentPage: 1,
-				size: 10,
+				size: 12,
 				loadStatus: 'loading', //加载样式:more-加载前样式,loading-加载中样式,nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 
 
 			};
@@ -118,13 +120,14 @@
 			},
 			
 			EditItem(item){
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/authAdd/authAdd?phone='+item.phone+'',
 				
 				});
 			},
 			  deleteItem(item) {
 				 let deleteT=0;
+				 this.deleteStatus=true
 				 uni.showModal({	
 				     title: '确认删除吗?',
 				     content: '',
@@ -164,6 +167,10 @@
 					data: ming
 				})
 				this.authListRes = 1;
+				if(this.deleteStatus){
+					this.authList=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.total) {
 					this.authList = this.authList.concat(res.data.data)
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
@@ -186,7 +193,7 @@
 
 			// 页面跳转
 			goAddPage(type) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/authAdd/authAdd',
 					success: res => {},
 					fail: () => {},

+ 1 - 1
pages/eleControl/controlReport/controlReport.vue

@@ -81,7 +81,7 @@
 		
 			// 页面跳转
 			goAddPage(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/controlReport/controlReportAdd/controlReportAdd',
 				});
 			},

+ 2 - 2
pages/eleControl/controlReport/controlReportAdd/controlReportAdd.vue

@@ -228,7 +228,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/controlReport/controlReport',
 					});
 				}, 1000);
@@ -287,7 +287,7 @@
 			},
 
 			submit() {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/accountManage/success/success',
 				});
 			},

+ 11 - 2
pages/eleControl/powerCut/powerCut.vue

@@ -148,6 +148,8 @@
 				size: 10,
 				loadStatus: 'loading', //加载样式:more-加载前样式,loading-加载中样式,nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 			};
 		},
 		onReachBottom() { //上拉触底函数
@@ -169,7 +171,7 @@
 			
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd?id=' + item.id + '&status_value=' + this.status_value + '',
 				});
 			},
@@ -194,6 +196,7 @@
 			
 			//删除
 			deleteItem(item) {
+				this.deleteStatus=true
 				uni.showModal({
 					title: '确认删除吗?',
 					content: '',
@@ -202,6 +205,7 @@
 							this.setDelSite({
 								"id": item.id
 							})
+							
 						} else if (result.cancel) {
 							// console.log('用户点击取消');
 						}
@@ -241,7 +245,12 @@
 				// console.log('res.data.data')
 				// console.log(res.data.data)
 				// this.planListData = res.data.data
+				if(this.deleteStatus){
+					this.planListData=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.data.length) {
+
 					this.planListData = this.planListData.concat(res.data.data)
 									
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
@@ -273,7 +282,7 @@
 				this.loadData()
 			},
 			goAddPage(id) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/eleControl/powerCut/powerCutAdd/powerCutAdd',
 				});
 			},

+ 2 - 2
pages/eleControl/powerCut/powerCutAdd/powerCutAdd.vue

@@ -226,7 +226,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/powerCut/powerCut'
 					});
 				}, 1000);
@@ -283,7 +283,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/eleControl/powerCut/powerCut'
 					});
 				}, 1000);

+ 1 - 1
pages/processDetailEle/processDetailEle.vue

@@ -211,7 +211,7 @@
 				}
 
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/processList/processList?companyCode=' + this.companyCode +
 							'&type=' + this.type + '',
 

+ 2 - 2
pages/processList/processList.vue

@@ -395,14 +395,14 @@
 
 			// 页面跳转
 			goUnprocessDetail(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
 						'&id=' + item.id +
 						'&type=1',
 				});
 			},
 			goProcessedDetail(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/processDetailEle/processDetailEle?companyCode=' + this.companyCode +
 						'&id=' + item.id + '&type=1',
 				});

+ 2 - 2
pages/siteAdd/siteAdd.vue

@@ -510,7 +510,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/siteManage/siteManage',
 					});
 				}, 1000);
@@ -552,7 +552,7 @@
 					});
 				}
 				setTimeout(() => {
-					uni.navigateTo({
+					uni.redirectTo({
 						url: '/pages/siteManage/siteManage',
 					});
 				}, 1000);

+ 2 - 2
pages/siteArchive/siteArchive.vue

@@ -125,7 +125,7 @@
 
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd?id=' + item.id + '',
 				});
 			},
@@ -165,7 +165,7 @@
 				});
 			},
 			goAddPage(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteArchive/siteArchiveAdd/siteArchiveAdd',
 				});
 			},

+ 1 - 1
pages/siteArchive/siteArchiveAdd/siteArchiveAdd.vue

@@ -747,7 +747,7 @@
 							delta: 2
 						});
 					} else {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/siteArchive/siteArchive',
 						});
 					}

+ 15 - 3
pages/siteManage/siteManage.vue

@@ -112,6 +112,8 @@
 				size: 10,
 				loadStatus: 'loading', //加载样式:more-加载前样式,loading-加载中样式,nomore-没有数据样式
 				isLoadMore: false, //是否加载中
+				
+				deleteStatus:false
 
 			};
 		},
@@ -190,13 +192,14 @@
 
 			//编辑
 			editItem(item) {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteAdd/siteAdd?id=' + item.id + '',
 				});
 			},
 
 			//删除
 			deleteItem(item) {
+				this.deleteStatus=true
 				uni.showModal({
 					title: '确认删除吗?',
 					content: '',
@@ -255,7 +258,9 @@
 						title: "删除成功",
 					});
 					setTimeout(() => {
-						this.getSiteList()
+						console.log(this.siteList)
+						// this.siteList=[]
+						this.loadData()
 					}, 1000);
 				}
 
@@ -269,8 +274,15 @@
 				})
 				this.siteListRes = 1;
 				
+				
+				if(this.deleteStatus){
+					this.siteList=[];
+					this.deleteStatus=false;
+				}
 				if (res.data.total) {
 					this.siteList = this.siteList.concat(res.data.data)
+					console.log('this.siteList')
+					console.log(this.siteList)
 					if (res.data.data.length < this.size) { //判断接口返回数据量小于请求数据量,则表示此为最后一页
 						this.isLoadMore = true
 						this.loadStatus = 'nomore'
@@ -285,7 +297,7 @@
 
 			// 新增跳转
 			goAddPage() {
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages/siteAdd/siteAdd',
 					success: res => {},
 					fail: () => {},