Browse Source

返回触发

maxiaoxiao 1 week ago
parent
commit
499bcab079

+ 1 - 1
pages/check/MapView.vue

@@ -30,7 +30,7 @@
 			},
 			setitem(val) {
 				console.log(val, 'val')
-				this.mapitem = val
+				if(val)this.mapitem = val
 			},
 		}
 	}

+ 7 - 0
pages/index.vue

@@ -44,6 +44,13 @@
 		mounted() {},
 		onReady() {
 
+		},
+		onShow() {
+			if (this.isdetail) {
+				this.goDetail()
+			} else {
+				this.returnList()
+			}
 		},
 		methods: {
 			golist(a, hccount) {

+ 2 - 1
pages/index/common/affirm.vue

@@ -71,7 +71,8 @@
 				this.$refs.form.validate().then(res => {
 					confirm(this.firm).then(response => {
 						this.$modal.msgSuccess("修改成功")
-						this.$tab.navigateTo('/pages/index')
+						// this.$tab.navigateTo('/pages/index')
+						uni.navigateBack()
 					})
 				})
 			}

+ 6 - 6
pages/index/common/hcDetails.vue

@@ -184,18 +184,18 @@
 		},
 		methods: {
 			handleClick(val) {
-				this.nowobj = val
+				if (val) this.nowobj = val
 				this.getsteps();
 				this.reset();
-				this.getInfos(val);
+				this.getInfos(this.nowobj);
 				this.getdict()
 			},
 			getInfos(val) {
 				let id = val.dkjdxxId
 				getDkjbxx(id).then((res) => {
 					this.infoObj = res.data;
-					this.loadAndConvertTIFF(this.infoObj.qsxtif, 'qsxtif')
-					this.loadAndConvertTIFF(this.infoObj.hsxtif, 'hsxtif')
+					// this.loadAndConvertTIFF(this.infoObj.qsxtif, 'qsxtif')
+					// this.loadAndConvertTIFF(this.infoObj.hsxtif, 'hsxtif')
 					console.log(this.infoObj, 'this.infoObj')
 				});
 				getDkjbywy(id).then((res) => {
@@ -336,8 +336,8 @@
 			},
 			tj() {
 				uni.$globalData = this.nowobj
-				console.log('[zzxxzzzx]',uni.$globalData,)
-				console.log('[zzxxx]',this.nowobj,)
+				console.log('[zzxxzzzx]', uni.$globalData, )
+				console.log('[zzxxx]', this.nowobj, )
 				this.$tab.navigateTo('/pages/index/common/tjDialog')
 			},
 			selectfile(e, fname) {

+ 2 - 1
pages/index/common/tjDialog.vue

@@ -67,7 +67,8 @@
 				// this.$refs.form.validate().then(res => {
 					tjWork(this.tjform).then(response => {
 						this.$modal.msgSuccess("提交成功")
-						this.$tab.navigateTo('/pages/index')
+						// this.$tab.navigateTo('/pages/index')
+						uni.navigateBack()
 					})
 				// })
 			}