Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0

components/bottomSheet/bottomSheet.vue

@@ -181,7 +181,7 @@
 										v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg'  || item.substring(item.length - 3) == 'jpeg'">
 										<image :src="item" mode=""
 											style="width: 100rpx; height: 100rpx; margin: 0 12rpx;"
-											@click="showPhoto(index)">
+											@click="showPhoto(index,value.zEngiineeringPhotoBoList)">
 										</image>
 									</view>
 									<view v-else>
@@ -226,10 +226,10 @@
 			};
 		},
 		methods: {
-			showPhoto(index) {
+			showPhoto(index, list) {
 				uni.previewImage({
 					current: index,
-					urls: this.historyPhotoList,
+					urls: list,
 				})
 
 			},

pages/oldrenovation/courtyard/courtyard.vue

@@ -824,6 +824,8 @@
 							enginCycle: this.projectValue.dictValue, // 工程周期
 							unitId: unitId,
 							houseId: houseId, //传空
+							enginType: this.objValue.enginType, //写死 上一页面传过来的
+							enginClassification: this.objValue.enginClassification, //写死  上一页面传过来的  //室内 - 庭院 - 架空
 						}
 						getRoomProjectId(param).then(res => {