1

pages/work/index.vue

@@ -175,38 +175,38 @@
 				this.enginType = 'new_built'; //写死
 				this.enginClassification = e;
 				this.typeList = ''; //置空
-				console.log("新建",e)
+				console.log("新建", e)
 				if (e == 'indoor_engin') {
 					//新建室内
 					getDicts("new_built_indoor_engin").then(response => {
-				
+
 						this.typeList = response.data;
 					});
-				
+
 				} else if (e == 'courtyard') {
 					//新建庭院
 					getDicts("new_built_courtyard_engin").then(response => {
 						console.log("庭院", response.data)
 						this.typeList = response.data;
-				
+
 					});
 				} else if (e == 'overhead') {
 					//新建架空
 					getDicts("new_built_courtyard_engin").then(response => {
 						console.log("架空", response.data)
 						this.typeList = response.data;
-				
-				
+
+
 					});
 				}
-				
+
 				this.handleShowSheet();
 
 			},
 			OldProject(e) {
 				this.enginType = 'old_renovation'; //写死
 				this.enginClassification = e;
-				console.log("旧改",e)
+				console.log("旧改", e)
 				this.typeList = ''; //置空
 				if (e == 'indoor_engin') {
 					//旧改室内
@@ -252,48 +252,28 @@
 
 				};
 
-				//拆旧管
+
 				this.handleHiddenShare();
-				uni.navigateTo({
-					url: '/pages/oldrenovation/indoor/tearOldPipe?params=' + encodeURIComponent(JSON.stringify(
-						obj))
-				})
-
-				// uni.showActionSheet({
-				// 	itemList: ['拆旧管', '立杠', '挂表', '表后管', '阀管'],
-				// 	success: (res) => {
-				// 		console.log('选择了第' + (res.tapIndex + 1) + '个选项');
-				// 		if (e == 0 && res.tapIndex == 0) {
-				// 			uni.navigateTo({
-				// 				url: '/pages/oldrenovation/indoor/tearOldPipe?description=OldIndoor&form=Pipe'
-				// 			})
-				// 		}
-				// 		if (e == 0 && res.tapIndex == 1) {
-				// 			uni.navigateTo({
-				// 				url: '/pages/oldrenovation/indoor/tearOldPipe?description=OldIndoor&form=verticalBar'
-				// 			})
-				// 		}
-				// 		if (e == 0 && res.tapIndex == 2) {
-				// 			uni.navigateTo({
-				// 				url: '/pages/oldrenovation/indoor/putUpWatch'
-				// 			})
-				// 		}
-				// 		if (e == 0 && res.tapIndex == 3) {
-				// 			uni.navigateTo({
-				// 				url: '/pages/oldrenovation/indoor/watchAfterPipe'
-				// 			})
-				// 		}
-				// 		if (e == 0 && res.tapIndex == 4) {
-				// 			uni.navigateTo({
-				// 				url: '/pages/oldrenovation/indoor/valveTube'
-				// 			})
-				// 		}
-
-				// 	},
-				// 	fail: (err) => {
-				// 		console.log('弹窗取消');
-				// 	}
-				// });
+				// 室内
+				if (this.enginClassification == 'indoor_engin') {
+					uni.navigateTo({
+						url: '/pages/oldrenovation/indoor/tearOldPipe?params=' + encodeURIComponent(JSON.stringify(
+							obj))
+					})
+				}
+				// 庭院
+				else if (this.enginClassification == 'courtyard') {
+					uni.navigateTo({
+						url: '/pages/oldrenovation/indoor/tearOldPipe?params=' + encodeURIComponent(JSON.stringify(
+							obj))
+					})
+				} else if (this.enginClassification == 'overhead') { //架空
+					uni.navigateTo({
+						url: '/pages/oldrenovation/indoor/tearOldPipe?params=' + encodeURIComponent(JSON.stringify(
+							obj))
+					})
+				}
+
 
 			}
 		}