增加搜索条件“选择行政区”

api/common.js

@@ -1,5 +1,9 @@
 import utils from '../common/request.js'
 export default {
+	//选择行政区
+	getDistrict(data){
+	    return utils.requestFn(`/system/dict/data/type/district`, data)
+	},
 	//选择小区
 	getArea(data){
 	    return utils.requestEn(`/mobile/area/getArea`, data)

common/http.js

@@ -3,4 +3,5 @@ export default {
 	// webUrl: 'http://127.0.0.1:8080',
 	webUrl: 'https://cczdsz.com/prod-api/',
 	// webUrl: 'http://192.168.0.129:8080',
+	// webUrl: 'http://192.168.31.252:8080',
 }

pages/cityConstrution/cityConstrution.vue

@@ -6,34 +6,22 @@
 				阀管施工
 			</view>
 		</view>
-		<view style="margin-top: 60rpx;">	
+		<view style="margin-top: 60rpx;">
+			<view>
+				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
+					{{districtName ? districtName :'选择行政区'}}
+					<!-- <u-select v-model="houseShow" :list="chooseHouseList" @confirm="chooseHouse"></u-select> -->
+				</view>
+			</view>
+
 			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-					{{house ? house :'选择小区'}}
-					<u-popup v-model="pop" mode="bottom" height="1000rpx">
-						<view style="margin: 20rpx;">
-							<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-						</view>
-						<view>
-							<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-								<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-									<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-										{{item.label}}
-									</view>
-								</view>
-							</scroll-view>
-							<view class="">
-								<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-							</view>
-							<view class="">
-								<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-							</view>
-						</view>
-					</u-popup>
-				<!-- <u-select v-model="houseShow" :list="chooseHouseList" @confirm="chooseHouse"></u-select> -->
+					{{house ? house : '选择小区'}}
+					<!-- <u-select v-model="bulidShow" :list="chooseBuildList" @confirm="chooseBuild"></u-select> -->
 				</view>
+
 			</view>
-			
+
 			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
 					{{bulid ? bulid : '选择楼宇'}}
@@ -87,17 +75,18 @@
 							<image src="/static/icon/chooseimg.png" mode=""
 								style="width: 190rpx; height: 190rpx; margin: 0 12rpx;; " @click="choose()"></image>
 							<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
-								<view v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-									<image :src="item" mode=""
-										style="width: 190rpx; height: 190rpx; margin: 0 12rpx;" @click="showPhoto(index)">
+								<view
+									v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
+									<image :src="item" mode="" style="width: 190rpx; height: 190rpx; margin: 0 12rpx;"
+										@click="showPhoto(index)">
 									</image>
 								</view>
 								<view v-else>
-									<video :src="item"
-										style="width: 190rpx; height: 190rpx; margin: 0 12rpx;"></video>
+									<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 12rpx;"></video>
 								</view>
-								<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-									<u-icon name="close" color="#FFFFFF" size="35" ></u-icon> 
+								<view @click="remove(index)"
+									style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
+									<u-icon name="close" color="#FFFFFF" size="35"></u-icon>
 								</view>
 							</view>
 						</view>
@@ -107,10 +96,10 @@
 					</view>
 					<view class="upload">
 						<text class="font-forty SourceHanSansCN">备注：</text>
-						<textarea value="" placeholder="请输入备注" v-model="remark"/>
+						<textarea value="" placeholder="请输入备注" v-model="remark" />
 					</view>
 				</view>
-				
+
 				<view class="font-fifty-six SourceHanSansCN total background-color1" @click="submit()">
 					提交数据
 				</view>
@@ -119,6 +108,28 @@
 				<!-- <u-select v-model="tubeLongShow" :list="tubeTypeLongList" @confirm="tubeLongConfirm"></u-select> -->
 			</view>
 		</view>
+		<u-popup v-model="pop" mode="bottom" height="1000rpx">
+			<view style="margin: 20rpx;">
+				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword"
+					:action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
+			</view>
+			<view>
+				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
+					<view v-for="(item,index) in chooseHouseList" :key="item.value">
+						<view :class="current === index ? 'active' : '' " style="color: #000000;font-size: 56rpx;"
+							@click="active(item,index)">
+							{{item.label}}
+						</view>
+					</view>
+				</scroll-view>
+				<view class="">
+					<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
+				</view>
+				<view class="">
+					<button type="default" @click="pop = false;" class="font-fifty-six">取消</button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -130,17 +141,20 @@
 		},
 		data() {
 			return {
-				keyword:'',
-				selectType:'',
-				pop:false,
-				housename:'',
-				houseid:0,
-				buildid:0,
-				unitid:0,
-				numberid:0,
+				keyword: '',
+				selectType: '',
+				pop: false,
+				inputShow: false,
+				housename: '',
+				houseid: 0,
+				buildid: 0,
+				unitid: 0,
+				numberid: 0,
 				houseShow: false,
-				current:-1,
+				current: -1,
 				chooseHouseList: [],
+				districtId: 0,
+				districtName: '选择行政区',
 				house: '选择小区',
 				bulid: '选择楼宇',
 				unit: '选择单元',
@@ -166,15 +180,15 @@
 				listTypeShow: false,
 				valueType: '',
 				uploading: false,
-				imgArr:[],
-				remark:'',
-				show:false,
-				progress:0 ,//上传图片进度百分比
-				loading:false
+				imgArr: [],
+				remark: '',
+				show: false,
+				progress: 0, //上传图片进度百分比
+				loading: false
 			}
 		},
 		onLoad() {
-			this.getArea();
+			// this.getArea();
 			this.select();
 			this.getTubeType();
 			this.getTubeLong();
@@ -182,120 +196,167 @@
 		},
 		methods: {
 			openHouse(selectType) {
-				if(selectType === 'xiaoqu'){
+				if (selectType === 'district') {
+					this.inputShow = false
+					//选择行政区
+					this.housename = null;
+					this.selectType = 'district'
+					service.getDistrict().then(res => {
+						// console.log(res);
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'district'
+							})
+						})
+					})
+				} else if (selectType === 'xiaoqu') {
+					this.inputShow = true
 					//选择小区
 					this.selectType = 'xiaoqu'
-					this.getArea();
-				}else if(selectType === 'louyu'){
+					this.housename = null;
+					// this.district = '';
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.id,
+								label: item.name,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+				} else if (selectType === 'louyu') {
+					this.inputShow = true
 					//选择楼宇
 					this.selectType = 'louyu'
 					this.housename = null;
-					this.buildid = 0;
-					service.getBuilding({areaId: this.houseid}).then(res => {
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
-					
-				}else if(selectType === 'danyuan'){
+
+				} else if (selectType === 'danyuan') {
+					this.inputShow = true
 					//选择单元
 					this.selectType = 'danyuan';
 					this.housename = null;
-					this.unitid = 0;
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
-					
-				}else if(selectType === 'menpai'){
+
+				} else if (selectType === 'menpai') {
+					this.inputShow = true
 					//选择门牌
 					this.selectType = 'menpai';
 					this.housename = null;
-					this.numberid = null;
-					service.getHouse({unitId: this.unitid}).then(res => {
+					service.getHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 				}
 				this.pop = !this.pop;
 			},
-			searchinfo(selectType){
-				if(selectType == 'xiaoqu'){
-					console.log('ssss',this.selectType)
-					service.getArea({name:this.keyword}).then(res => {
+			searchinfo(selectType) {
+				if (selectType == 'xiaoqu') {
+					console.log('ssss', this.selectType)
+					service.getArea({
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'xiaoqu'
+								selectType: 'xiaoqu'
 							})
 						})
-					})	
+					})
 					this.keyword = '';
-				}else if(selectType == 'louyu'){
-					console.log('ssss',this.selectType)
-					service.getBuilding({areaId: this.houseid,name:this.keyword}).then(res => {
+				} else if (selectType == 'louyu') {
+					console.log('ssss', this.selectType)
+					service.getBuilding({
+						areaId: this.houseid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'danyuan'){
-					console.log('ssss',this.selectType)
-					service.getUnit({buildingId: this.buildid,name:this.keyword}).then(res => {
+				} else if (selectType == 'danyuan') {
+					console.log('ssss', this.selectType)
+					service.getUnit({
+						buildingId: this.buildid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'menpai'){
-					console.log('ssss',this.selectType)
-					service.getHouse({unitId: this.unitid,name:this.keyword}).then(res => {
+				} else if (selectType == 'menpai') {
+					console.log('ssss', this.selectType)
+					service.getHouse({
+						unitId: this.unitid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.keyword = '';
 				}
-				
+
 			},
-			showPhoto(index){
+			showPhoto(index) {
 				uni.previewImage({
-					current:index,
-					urls:this.imgArr,
+					current: index,
+					urls: this.imgArr,
 				})
 				console.log('sss')
 			},
@@ -305,19 +366,10 @@
 			projectType() {
 				this.listTypeShow = !this.listTypeShow
 			},
-			//获取小区
-			getArea() {
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})
-			},
+			// 	//获取小区
+			// 	getArea() {
+
+			// 	},
 			getProjectType() {
 				service.getProject().then(res => {
 					console.log('getProjectType', res)
@@ -331,16 +383,44 @@
 
 				})
 			},
-			search(selectType){
-				if(selectType == 'xiaoqu'){
-					this.house = this.housename;	
-					service.getBuilding({areaId: this.houseid}).then(res => {
+			search(selectType) {
+				if (selectType == 'district') {
+					this.districtName = this.housename;
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach(item => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+					this.current = -1;
+					this.house = null;
+					this.bulid = null;
+					this.unit = null;
+					this.houseNumber = null;
+
+					this.houseid = 0;
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+
+
+				} else if (selectType == 'xiaoqu') {
+					this.house = this.housename;
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
@@ -348,64 +428,85 @@
 					this.bulid = null;
 					this.unit = null;
 					this.houseNumber = null;
-				}else if(selectType == 'louyu'){
+
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'louyu') {
 					this.bulid = this.housename;
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
-					
+
 					this.unit = null;
 					this.houseNumber = null;
 					this.current = -1;
-				}else if(selectType == 'danyuan'){
+
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'danyuan') {
 					this.unit = this.housename;
-					service.getHouse({unitId: this.unitid}).then(res => {
+					service.getHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.houseNumber = null;
 					this.current = -1;
-					
-				}else if(selectType == 'menpai'){
+
+					this.housedata = 0;
+
+				} else if (selectType == 'menpai') {
 					this.houseNumber = this.housename;
 					this.housedata = this.numberid;
 					this.current = -1;
 				}
 				this.pop = false;
 			},
-			active(item,index){
+			active(item, index) {
 				this.current = index;
-				this.housename = item.label;
-				if(item.selectType == 'xiaoqu'){
+				if (item.selectType == 'district') { //行政区
+					this.housename = item.label;
+					this.districtId = item.value;
+				} else if (item.selectType == 'xiaoqu') { //小区
+					this.housename = item.label;
 					this.houseid = item.value;
-				}else if(item.selectType == 'louyu'){
+				} else if (item.selectType == 'louyu') { //楼宇
+					this.housename = item.label;
 					this.buildid = item.value;
-				}else if(item.selectType == 'danyuan'){
+				} else if (item.selectType == 'danyuan') { //单元
+					this.housename = item.label;
 					this.unitid = item.value;
-				}else if(item.selectType == 'menpai'){
+				} else if (item.selectType == 'menpai') { //门牌
+					this.housename = item.label;
 					this.numberid = item.value
 				}
 				this.selectType = item.selectType;
+				// console.log("xxxxx_type:" + this.selectType + "_" + this.housename)
+
 			},
-			
+
 			openUnit() {
 				this.unitShow = !this.unitShow
 			},
 			//选择门牌
-			
+
 			open() {
 				this.houseNumberShow = !this.houseNumberShow
 			},
@@ -479,7 +580,7 @@
 					success: (res) => {
 						if (res.confirm) {
 							this.imgArr.splice(index, 1)
-							console.log('this.imgarr',this.imgArr)
+							console.log('this.imgarr', this.imgArr)
 							if (this.imgArr.length <= 0) {
 								this.photo = true;
 							}
@@ -490,13 +591,13 @@
 			choose() {
 				let _this = this;
 				uni.showActionSheet({
-					title:'上传',
-					itemList:['图片','视频'],
+					title: '上传',
+					itemList: ['图片', '视频'],
 					success: (res) => {
 						console.log(res)
-						if(res.tapIndex == 0){
+						if (res.tapIndex == 0) {
 							this.chooseimage()
-						}else{
+						} else {
 							this.choosevideo()
 						}
 					}
@@ -532,7 +633,7 @@
 											console.log('imgArr', _this.imgArr)
 											_this.$UTILS.showPrompt('上传成功！')
 											_this.photo = false;
-										} 
+										}
 									}
 								},
 								fail: e => {
@@ -542,7 +643,7 @@
 								complete: res => {
 									uni.hideLoading();
 									_this.uploading = false;
-								
+
 								}
 							});
 							task.onProgressUpdate(res => {
@@ -552,17 +653,17 @@
 								uni.showLoading({
 									title: '上传中'
 								})
-								if(_this.progress != 100){
+								if (_this.progress != 100) {
 									_this.loading = false
 									console.log('_this.loading false', _this.loading)
-								}else {
+								} else {
 									_this.loading = true
 									console.log('_this.loading true', _this.loading)
 								}
 							});
-			
+
 						})
-						
+
 					},
 				})
 			},
@@ -570,7 +671,7 @@
 				let _this = this;
 				console.log('视频')
 				uni.chooseVideo({
-					sourceType: ['album','camera'],
+					sourceType: ['album', 'camera'],
 					maxDuration: 30,
 					success(resp) {
 						const task = uni.uploadFile({
@@ -585,7 +686,7 @@
 									.data) ? JSON.parse(res.data) : res.data;
 								if (![200, 201, 204].includes(res.statusCode)) {
 									this.uploadError(index, data);
-								} else {	
+								} else {
 									//上传成功
 									if (_this.progress === 100) {
 										console.log('_this.progress', _this.progress)
@@ -593,7 +694,7 @@
 										console.log('imgArr', _this.imgArr)
 										_this.$UTILS.showPrompt('上传成功！')
 										_this.photo = false;
-									} 
+									}
 								}
 							},
 							fail: e => {
@@ -611,15 +712,15 @@
 							uni.showLoading({
 								title: '上传中'
 							})
-							if(_this.progress != 100){
+							if (_this.progress != 100) {
 								_this.loading = false
 								console.log('_this.loading false', _this.loading)
-							}else {
+							} else {
 								_this.loading = true
 								console.log('_this.loading true', _this.loading)
 							}
 						});
-			
+
 					},
 				})
 			},
@@ -651,7 +752,7 @@
 					this.$UTILS.showPrompt('请上传照片或视频！')
 					return
 				}
-				if(this.loading == false) {
+				if (this.loading == false) {
 					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
 					return
 				}
@@ -659,7 +760,19 @@
 					serviceType: this.typeValue,
 					pipeType: this.tubeType,
 					pipeLength: this.tubeLong,
+					//小区
+					areaId: this.houseid,
+					areaName: this.house,
+					//楼宇
+					buildingId: this.buildid,
+					buildingName: this.bulid,
+					//单元
+					unitId: this.unitid,
+					unitName: this.unit,
+					//房间
 					houseId: this.housedata,
+					houseName: this.houseNumber,
+
 					valveType: this.valueType,
 					picUrl: this.imgArr,
 					remark: this.remark,
@@ -697,9 +810,11 @@
 		background: #43CEB1;
 		border-radius: 64rpx;
 	}
-	.active{
-	   background-color: #1890FF;
+
+	.active {
+		background-color: #1890FF;
 	}
+
 	.select-type {
 		border: 2rpx solid #3857F3;
 		text-align: center;

pages/noLogin/list.vue

@@ -2,45 +2,30 @@
 	<view class="list_s">
 		<view class="header_s">
 			<u-popup v-model="show" mode="top">
-				<view class="popup">
-					<view style="margin-top: 120rpx;">
+				<scroll-view scroll-y="true" style="height: 100vh; text-align: center" class="popup">
+						<view>
+							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
+								{{districtName ? districtName :'选择行政区'}}
+							</view>
+						</view>
+
 						<view>
 							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-								{{house ? house :'选择小区'}}
-								<u-popup v-model="pop" mode="top" height="1000rpx">
-									<view style="margin: 20rpx;">
-										<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-									</view>
-									<view>
-										<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-											<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-												<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-													{{item.label}}
-												</view>
-											</view>
-										</scroll-view>
-										<view class="">
-											<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-										</view>
-										<view class="">
-											<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-										</view>
-									</view>
-								</u-popup>
+								{{house ? house : '选择小区'}}
 							</view>
+
 						</view>
-						
 						<view>
 							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
 								{{bulid ? bulid : '选择楼宇'}}
 							</view>
-					
+
 						</view>
 						<view>
 							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
 								{{unit ? unit : '选择单元'}}
 							</view>
-					
+
 						</view>
 						<view>
 							<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
@@ -48,12 +33,6 @@
 							</view>
 						</view>
 						<view>
-						<!-- <view class="font-fifty-six SourceHanSansCN choose" @click="openType('shows')">
-							上门类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
-								{{type ? '----' +  type : ''}}</text>
-							<u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select>
-						</view> -->
-						<view>
 							<view class="font-fifty-six SourceHanSansCN choose" @click="showStart = true">
 								{{form.starTime ? form.starTime  : '开始时间'}}
 								<u-picker v-model="showStart" mode="time" @confirm="confirmStart"></u-picker>
@@ -65,23 +44,25 @@
 								<u-picker v-model="showEnd" mode="time" @confirm="confirmEnd"></u-picker>
 							</view>
 						</view>
-						<view style="display: flex;">
-							<view style="height: 100rpx; font-size: 64rpx; width: 180rpx; font-weight: 600;">工号</view>
-							<u-input
-								style="font-size: 64rpx!important; font-weight: 600; width: 400rpx!important;"
-								placeholder="请输入工号"
-								placeholder-style="font-size: 64rpx;"
-								v-model="form.jobNum"
-								maxlength = '4'
-								:type='numberType'
-								:border="border" />
-						</view>
-						<view class="font-fifty-six SourceHanSansCN total background-color1" @click="submit()">
-							提交数据
+						<view>
+							<!-- <view class="font-fifty-six SourceHanSansCN choose" @click="openType('shows')">
+							上门类型 <text class="font-fifty-six SourceHanSansCN" style="color: #232146;">
+								{{type ? '----' +  type : ''}}</text>
+							<u-select v-model="shows" :list="mounicipalList" @confirm="confirm"></u-select>
+						</view> -->
+							<view style="display: flex;">
+								<view style="height: 100rpx; font-size: 64rpx; width: 180rpx; font-weight: 600;">工号
+								</view>
+								<u-input style="font-size: 64rpx!important; font-weight: 600; width: 400rpx!important;"
+									placeholder="请输入工号" placeholder-style="font-size: 64rpx;" v-model="form.jobNum"
+									maxlength='4' :type='numberType' :border="border" />
+							</view>
+							<view class="font-fifty-six SourceHanSansCN total background-color1"  @click="submit()">
+								提交数据
+							</view>
 						</view>
-					</view>
-					</view>
-				</view>
+					
+				</scroll-view>
 			</u-popup>
 			<view style="display: flex;">
 				<view class="btn_s" @click="show = true">查询</view>
@@ -93,7 +74,7 @@
 				<view class="item-title">地址: {{item.house}}</view>
 				<view class="item-title">职工: {{item.userName}}</view>
 				<view class="item-title">时间: {{item.time}}</view>
-				<view class="item-title">备注: 
+				<view class="item-title">备注:
 					<text class="" v-if="item.remark != null">
 						{{item.remark}}
 					</text>
@@ -102,12 +83,14 @@
 					</text>
 				</view>
 				<view class="item-img">
-					<view class="img-view"  v-for="img in item.picUrl">
-						<image :src="img" mode="" @tap="preAvatar(img)" v-if="img.substring(img.length - 3) == 'png' || img.substring(img.length - 3) == 'jpg' "></image>
-						<video :src="img" controls v-else ></video>
+					<view class="img-view" v-for="img in item.picUrl">
+						<image :src="img" mode="" @tap="preAvatar(img)"
+							v-if="img.substring(img.length - 3) == 'png' || img.substring(img.length - 3) == 'jpg' ">
+						</image>
+						<video :src="img" controls v-else></video>
 					</view>
 					<!-- <image v-for="img in item.picUrl" :src="img" @tap="preAvatar(img)"></image> -->
-					
+
 				</view>
 				<view class="main-list-icon"></view>
 			</view>
@@ -115,6 +98,33 @@
 		<view class="footer_s" style="padding-top: 100rpx;" v-else>
 			<u-empty text="暂无数据" mode="list"></u-empty>
 		</view>
+		
+		
+		<u-popup v-model="pop" mode="top">
+			<view style="margin: 20rpx;">
+				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword"
+					:action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)">
+				</u-search>
+			</view>
+			<view>
+				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
+					<view v-for="(item,index) in chooseHouseList" :key="item.value">
+						<view :class="current === index ? 'active' : '' "
+							style="color: #000000;font-size: 56rpx;" @click="active(item,index)">
+							{{item.label}}
+						</view>
+					</view>
+				</scroll-view>
+				<view class="">
+					<button type="default" class="font-fifty-six"
+						@click="search(selectType)">确定</button>
+				</view>
+				<view class="">
+					<button type="default" @click="pop = false;"
+						class="font-fifty-six">取消</button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -127,13 +137,14 @@
 				numberType: 'number',
 				name: '',
 				address: '',
-				keyword:'',
-				selectType:'',
+				keyword: '',
+				selectType: '',
+				inputShow: false,
 				pop: false,
 				show: false,
 				border: false,
 				typeValue: '',
-				current:-1,
+				current: -1,
 				labelPosition: 'left',
 				errorType: ['message'],
 				list: [],
@@ -153,6 +164,8 @@
 				listTypeShow: false,
 				tubeTypeShow: false,
 				tubeLongShow: false,
+				districtId: 0,
+				districtName: '选择行政区',
 				house: '选择小区',
 				bulid: '选择楼宇',
 				unit: '选择单元',
@@ -161,11 +174,11 @@
 				// mounicipalList: [],
 				tubeTypeLongList: [],
 				tubeTypeList: [],
-				houseid:'',
+				houseid: '',
 				type: '',
-				buildid:'',
-				unitid:'',
-				numberid:'',
+				buildid: '',
+				unitid: '',
+				numberid: '',
 			}
 		},
 		onLoad(e) {
@@ -173,7 +186,7 @@
 			this.name = e.name;
 			this.address = e.address
 			this.getListFn();
-			this.getArea();
+			// this.getArea();
 			// this.select();
 			this.getProjectType();
 			this.getTubeType();
@@ -184,12 +197,12 @@
 		},
 		onPullDownRefresh() {
 			this.getListFn();
-			setTimeout(function () {
+			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
-		methods:{
-			kong(){
+		methods: {
+			kong() {
 				this.houseid = '';
 				this.buildid = '';
 				this.unitid = '';
@@ -199,11 +212,11 @@
 				this.form.jobNum = '';
 				this.getListFn();
 			},
-			confirmStart(e){
+			confirmStart(e) {
 				console.log(e)
 				this.form.starTime = `${e.year}-${e.month}-${e.day}`
 			},
-			confirmEnd(e){
+			confirmEnd(e) {
 				console.log(e)
 				this.form.endTime = `${e.year}-${e.month}-${e.day}`
 			},
@@ -218,7 +231,7 @@
 			confirm(e) {
 				this.type = e[0].label
 				this.typeValue = e[0].value
-			
+
 				this.imgArr = [];
 				this.tubeType = null;
 				this.tubeLong = null;
@@ -245,7 +258,7 @@
 				} else {
 					this.tubeLongShow = !this.tubeLongShow
 				}
-			
+
 			},
 			tubeTypeConfirm(e) {
 				this.tubeType = e[0].label
@@ -286,24 +299,52 @@
 							label: item.valveType
 						})
 					})
-			
+
 				})
 			},
 			projectType() {
 				this.listTypeShow = !this.listTypeShow
 			},
-			search(selectType){
-				console.log('this.housename', this.housename)
-				console.log('this.selectType', this.selectType)
-				if(selectType == 'xiaoqu'){
-					this.house = this.housename;	
-					service.getBuilding({areaId: this.houseid}).then(res => {
+			search(selectType) {
+				// console.log('this.housename', this.housename)
+				// console.log('this.selectType', this.selectType)
+				if (selectType == 'district') {
+					this.districtName = this.housename;
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach(item => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+					this.current = -1;
+					this.house = null;
+					this.bulid = null;
+					this.unit = null;
+					this.houseNumber = null;
+				
+					this.houseid = 0;
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+				
+				
+				} else if (selectType == 'xiaoqu') {
+					this.house = this.housename;
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
@@ -311,37 +352,49 @@
 					this.bulid = null;
 					this.unit = null;
 					this.houseNumber = null;
-				}else if(selectType == 'louyu'){
+
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'louyu') {
 					this.bulid = this.housename;
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
 					this.unit = null;
 					this.houseNumber = null;
 					this.current = -1;
-				}else if(selectType == 'danyuan'){
+
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'danyuan') {
 					this.unit = this.housename;
-					service.getAllHouse({unitId: this.unitid}).then(res => {
+					service.getAllHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.houseNumber = null;
 					this.current = -1;
-					
-				}else if(selectType == 'menpai'){
+
+					this.housedata = 0;
+				} else if (selectType == 'menpai') {
 					this.houseNumber = this.housename;
 					this.housedata = this.numberid;
 					this.current = -1;
@@ -349,138 +402,188 @@
 				this.pop = false;
 			},
 			openHouse(selectType) {
-				if(selectType === 'xiaoqu'){
+				if (selectType === 'district') {
+					this.inputShow = false
+					//选择行政区
+					this.housename = null;
+					this.selectType = 'district'
+					service.getDistrict().then(res => {
+						// console.log(res);
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'district'
+							})
+						})
+					})
+				} else if (selectType === 'xiaoqu') {
+					this.inputShow = false
 					//选择小区
 					this.selectType = 'xiaoqu';
-					this.getArea();
-				}else if(selectType === 'louyu'){
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.id,
+								label: item.name,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+				} else if (selectType === 'louyu') {
+					this.inputShow = false
 					//选择楼宇
 					this.selectType = 'louyu'
-					service.getBuilding({areaId: this.houseid}).then(res => {
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
-				}else if(selectType === 'danyuan'){
+				} else if (selectType === 'danyuan') {
+					this.inputShow = false
 					//选择单元
 					this.selectType = 'danyuan'
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
-				}else if(selectType === 'menpai'){
+				} else if (selectType === 'menpai') {
+					this.inputShow = false
 					//选择门牌
 					this.selectType = 'menpai'
-					service.getAllHouse({unitId: this.unitid}).then(res => {
+					service.getAllHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 				}
 				this.pop = !this.pop;
 			},
-			searchinfo(selectType){
-				if(selectType == 'xiaoqu'){
-					console.log('ssss',this.selectType)
-					service.getArea({name:this.keyword}).then(res => {
+			searchinfo(selectType) {
+				if (selectType == 'xiaoqu') {
+					console.log('ssss', this.selectType)
+					service.getArea({
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'xiaoqu'
+								selectType: 'xiaoqu'
 							})
 						})
-					})	
+					})
 					this.keyword = '';
-				}else if(selectType == 'louyu'){
-					console.log('ssss',this.selectType)
-					service.getBuilding({areaId: this.houseid,name:this.keyword}).then(res => {
+				} else if (selectType == 'louyu') {
+					console.log('ssss', this.selectType)
+					service.getBuilding({
+						areaId: this.houseid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'danyuan'){
-					console.log('ssss',this.selectType)
-					service.getUnit({buildingId: this.buildid,name:this.keyword}).then(res => {
+				} else if (selectType == 'danyuan') {
+					console.log('ssss', this.selectType)
+					service.getUnit({
+						buildingId: this.buildid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'menpai'){
-					console.log('ssss',this.selectType)
-					service.getAllHouse({unitId: this.unitid,name:this.keyword}).then(res => {
+				} else if (selectType == 'menpai') {
+					console.log('ssss', this.selectType)
+					service.getAllHouse({
+						unitId: this.unitid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.keyword = '';
 				}
-				
+
 			},
-			active(item,index){
+			active(item, index) {
 				this.current = index;
 				this.housename = item.label;
-				if(item.selectType == 'xiaoqu'){
+				if (item.selectType == 'district') { //行政区
+					this.districtId = item.value;
+				} else if (item.selectType == 'xiaoqu') {
 					this.houseid = item.value;
-				}else if(item.selectType == 'louyu'){
+				} else if (item.selectType == 'louyu') {
 					this.buildid = item.value;
-				}else if(item.selectType == 'danyuan'){
+				} else if (item.selectType == 'danyuan') {
 					this.unitid = item.value;
-				}else if(item.selectType == 'menpai'){
+				} else if (item.selectType == 'menpai') {
 					this.numberid = item.value
 				}
 				this.selectType = item.selectType;
 			},
-			//获取小区
-			getArea() {
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})
-			},
-			getListFn(){
+			// //获取小区
+			// getArea() {
+			// 	service.getArea().then(res => {
+			// 		this.chooseHouseList = [];
+			// 		res.forEach((item, index) => {
+			// 			this.chooseHouseList.push({
+			// 				value: item.id,
+			// 				label: item.name,
+			// 				selectType:'xiaoqu'
+			// 			})
+			// 		})
+			// 	})
+			// },
+			getListFn() {
 				let that = this;
-				let params ={
+				let params = {
 					areaId: this.houseid,
 					buildingId: this.buildid,
 					unitId: this.unitid,
@@ -493,16 +596,16 @@
 					serviceType: this.id
 				}
 				console.log('params', params)
-				service.getOtherList(params).then(res =>{
+				service.getOtherList(params).then(res => {
 					console.log("999", res)
 					that.list = res.records;
 					that.total = res.total || 0;
 					that.params.pageNum = res.current + 1;
 				})
 			},
-			getNextListFn(){
+			getNextListFn() {
 				let that = this;
-				let params={
+				let params = {
 					areaId: this.houseid,
 					buildingId: this.buildid,
 					unitId: this.unitid,
@@ -517,7 +620,7 @@
 				if (this.list.length < this.total) {
 					service.getOtherList(params).then(response => {
 						that.params.pageNum = response.current + 1
-						response.records.forEach(item =>{
+						response.records.forEach(item => {
 							that.list.push(item)
 						})
 					})
@@ -528,11 +631,11 @@
 				console.log('url', url)
 				wx.previewImage({
 					current: url, // 当前显示图片的 http 链接
-					urls: [url] ,// 需要预览的图片 http 链接列表
+					urls: [url], // 需要预览的图片 http 链接列表
 				})
 			},
 			submit() {
-				console.log('submit',this.houseid,this.buildid,this.unitid,this.numberid);
+				console.log('submit', this.houseid, this.buildid, this.unitid, this.numberid);
 				this.show = false;
 				this.getListFn()
 			}
@@ -541,37 +644,43 @@
 </script>
 
 <style lang="scss" scoped>
-	/deep/ .u-input__input{
-		font-size: 64rpx!important;
+	/deep/ .u-input__input {
+		font-size: 64rpx !important;
 		color: #303133;
-		width: calc(100% - 200rpx)!important;
+		width: calc(100% - 200rpx) !important;
 	}
-	/deep/ .u-column-item{
+
+	/deep/ .u-column-item {
 		display: flex;
 		flex-direction: row;
 		align-items: center;
 		justify-content: center;
-		font-size: 64rpx!important;
+		font-size: 64rpx !important;
 		color: #303133;
 		padding: 8rpx;
 	}
+
 	/deep/ .u-btn-picker.data-v-70102400 {
-	    padding: 16rpx;
-	    box-sizing: border-box;
-	    text-align: center;
-	    text-decoration: none;
-	    font-size: 64rpx!important;
+		padding: 16rpx;
+		box-sizing: border-box;
+		text-align: center;
+		text-decoration: none;
+		font-size: 64rpx !important;
 	}
-	.list_s{
+
+	.list_s {
 		min-height: 100vh;
 		background-color: #F9F9F9;
 	}
-	.header_s{
+
+	.header_s {
 		padding: 30rpx 30rpx 0rpx 30rpx;
-		.popup{
-			padding: 0rpx 30rpx;
+
+		.popup {
+			// padding: 0rpx 30rpx;
 		}
-		.btn_s{
+
+		.btn_s {
 			margin: 0 15rpx;
 			width: calc(50% - 15px);
 			height: 100rpx;
@@ -583,23 +692,27 @@
 			border-radius: 16rpx;
 		}
 	}
-	.footer_s{
+
+	.footer_s {
 		padding: 30rpx;
-		.footer-item{
+
+		.footer-item {
 			background: #FFFFFF;
 			height: auto;
 			border-radius: 8rpx;
 			margin-bottom: 30rpx;
 			padding: 20rpx 0rpx 20rpx 66rpx;
 			position: relative;
-			.item-title{
+
+			.item-title {
 				font-size: 48rpx;
 				font-family: PingFangSC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #333333;
 				padding-bottom: 20rpx;
 			}
-			.main-list-icon{
+
+			.main-list-icon {
 				position: absolute;
 				top: 43rpx;
 				left: 30rpx;
@@ -608,20 +721,24 @@
 				background: #3857F3;
 				border-radius: 2rpx;
 			}
-			.item-img{
+
+			.item-img {
 				display: flex;
 				justify-content: flex-start;
 				flex-wrap: wrap;
-				.img-view{
+
+				.img-view {
 					width: calc(50% - 20rpx);
 					height: 200rpx;
 					padding-bottom: 20rpx;
 					padding-right: 20rpx;
-					image{
+
+					image {
 						width: 100%;
 						height: 100%;
 					}
-					video{
+
+					video {
 						width: 100%;
 						height: 100%;
 					}
@@ -629,6 +746,7 @@
 			}
 		}
 	}
+
 	.choose {
 		text-align: center;
 		padding: 20rpx;
@@ -637,9 +755,11 @@
 		background: #43CEB1;
 		border-radius: 64rpx;
 	}
-	.active{
-	   background-color: #1890FF;
+
+	.active {
+		background-color: #1890FF;
 	}
+
 	.select-type {
 		border: 2rpx solid #3857F3;
 		text-align: center;
@@ -648,6 +768,7 @@
 		color: #3857F3;
 		border-radius: 64rpx;
 	}
+
 	.total {
 		width: 100%;
 		padding: 40rpx 30rpx;

pages/noLogin/repair.vue

@@ -14,41 +14,27 @@
 				</view>
 			</view>
 			<view>
+				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('district')">
+					{{districtName ? districtName :'选择行政区区'}}
+				</view>
+			</view>
+			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('xiaoqu')">
-					{{house ? house :'选择小区'}}
-					<u-popup v-model="pop" mode="bottom" height="1000rpx">
-						<view style="margin: 20rpx;">
-							<u-search placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}" @custom="searchinfo(selectType)"></u-search>
-						</view>
-						<view>
-							<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
-								<view v-for="(item,index) in chooseHouseList" :key="item.value" >
-									<view :class="current === index ? 'active' : '' " style="color: #000000;" @click="active(item,index)">
-										{{item.label}}
-									</view>
-								</view>
-							</scroll-view>
-							<view class="">
-								<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
-							</view>
-							<view class="">
-								<button type="default" @click="pop = false;"  class="font-fifty-six">取消</button>
-							</view>
-						</view>
-					</u-popup>
+					{{house ? house : '选择小区'}}
 				</view>
+
 			</view>
 			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('louyu')">
 					{{bulid ? bulid : '选择楼宇'}}
 				</view>
-			
+
 			</view>
 			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('danyuan')">
 					{{unit ? unit : '选择单元'}}
 				</view>
-			
+
 			</view>
 			<view>
 				<view class="font-fifty-six SourceHanSansCN choose" @click="openHouse('menpai')">
@@ -63,23 +49,23 @@
 			</view>
 			<view class="upload">
 				<text class="font-forty SourceHanSansCN">备注：</text>
-				<textarea value="" placeholder="请输入备注" v-model="remark"/>
+				<textarea value="" placeholder="请输入备注" v-model="remark" />
 			</view>
 			<view class="" style="display: flex; flex-wrap: wrap; margin: 0 55rpx;">
 				<image src="/static/icon/chooseimg.png" mode="" style="width: 190rpx; height: 190rpx; margin: 0 12rpx; "
 					@click="choose()"></image>
 				<view v-for="(item,index) in imgArr" :key="index" style="position: relative;">
 					<view v-if="item.substring(item.length - 3) == 'png' || item.substring(item.length - 3) == 'jpg' ">
-						<image :src="item" mode=""
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;" @click="showPhoto(index)">
+						<image :src="item" mode="" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"
+							@click="showPhoto(index)">
 						</image>
 					</view>
 					<view v-else>
-						<video :src="item"
-							style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
+						<video :src="item" style="width: 190rpx; height: 190rpx; margin: 0 20rpx;"></video>
 					</view>
-					<view @click="remove(index)" style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
-						<u-icon name="close" color="#FFFFFF" size="35" ></u-icon> 
+					<view @click="remove(index)"
+						style="position: absolute; top: 0; right: 14rpx; border-radius: 50%; background-color: #FF0000;">
+						<u-icon name="close" color="#FFFFFF" size="35"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -87,7 +73,28 @@
 				确定上传
 			</view>
 		</view>
-
+		<u-popup v-model="pop" mode="bottom" height="1000rpx">
+			<view style="margin: 20rpx;">
+				<u-search v-show="inputShow" placeholder="请输入搜索内容" v-model="keyword" :action-style="{'font-size':'40rpx'}"
+					@custom="searchinfo(selectType)"></u-search>
+			</view>
+			<view>
+				<scroll-view scroll-y="true" style="height: 600rpx; text-align: center;">
+					<view v-for="(item,index) in chooseHouseList" :key="item.value">
+						<view :class="current === index ? 'active' : '' " style="color: #000000;font-size: 56rpx;"
+							@click="active(item,index)">
+							{{item.label}}
+						</view>
+					</view>
+				</scroll-view>
+				<view class="">
+					<button type="default" class="font-fifty-six" @click="search(selectType)">确定</button>
+				</view>
+				<view class="">
+					<button type="default" @click="pop = false;" class="font-fifty-six">取消</button>
+				</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -105,34 +112,34 @@
 				name: '',
 				address: '',
 				photo: [],
-
 				uploading: false,
 				imgArr: [],
-				progress: 0 ,//图片或视频上传百分比
-				
-				pop:false,
-				housename:'',
-				houseid:0,
-				buildid:0,
-				unitid:0,
-				numberid:0,
+				progress: 0, //图片或视频上传百分比
+				inputShow: false,
+				districtId: 0,
+				districtName: '选择行政区',
+				pop: false,
+				housename: '',
+				houseid: 0,
+				buildid: 0,
+				unitid: 0,
+				numberid: 0,
 				houseShow: false,
-				current:-1,
+				current: -1,
 				chooseHouseList: [],
 				house: '选择小区',
 				bulid: '选择楼宇',
 				unit: '选择单元',
 				houseNumber: '选择门牌',
-				serviceType:'',
-				housedata:0,
-				remark:'',
-				keyword:'',
-				loading:false,
-				
-				isqualified:null,
-				qualifiedShow:false,
-				qualifiedList:[
-					{
+				serviceType: '',
+				housedata: 0,
+				remark: '',
+				keyword: '',
+				loading: false,
+
+				isqualified: null,
+				qualifiedShow: false,
+				qualifiedList: [{
 						value: '是',
 						label: '是',
 					},
@@ -151,10 +158,10 @@
 			// this.getEngineDetail();
 		},
 		methods: {
-			showPhoto(index){
+			showPhoto(index) {
 				uni.previewImage({
-					current:index,
-					urls:this.imgArr,
+					current: index,
+					urls: this.imgArr,
 				})
 			},
 			updatePhoto() {
@@ -162,16 +169,16 @@
 					this.$UTILS.showPrompt('请选择门牌号!')
 					return
 				}
-				if(this.imgArr.length <= 0) {
-					this.$UTILS.showPrompt('请上传照片!')
+				if (this.isqualified == null || this.isqualified == '') {
+					this.$UTILS.showPrompt('请选择是否合格!')
 					return
 				}
-				if(this.loading == false) {
-					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
+				if (this.imgArr.length <= 0) {
+					this.$UTILS.showPrompt('请上传照片!')
 					return
 				}
-				if(this.isqualified == null || this.isqualified == '') {
-					this.$UTILS.showPrompt('请选择是否合格!')
+				if (this.loading == false) {
+					this.$UTILS.showPrompt('照片或视频未上传完毕，无法提交！')
 					return
 				}
 				let param = {
@@ -179,8 +186,19 @@
 					picUrl: this.imgArr,
 					serviceType: this.id,
 					houseId: this.housedata,
-					remark:this.remark,
-					whether:this.isqualified,
+					remark: this.remark,
+					whether: this.isqualified,
+					//小区
+					areaId: this.houseid,
+					areaName: this.house,
+					//楼宇
+					buildingId: this.buildid,
+					buildingName: this.bulid,
+					//单元
+					unitId: this.unitid,
+					unitName: this.unit,
+					//房间
+					houseName: this.houseNumber,
 				}
 				console.log('param', param)
 				// this.$UTILS.showPrompt('提交成功！')
@@ -192,155 +210,233 @@
 					this.$UTILS.showPrompt('提交失败！')
 					console.error(e)
 				})
-				
-			},
-			//获取小区
-			getArea() {
-				service.getArea().then(res => {
-					this.chooseHouseList = [];
-					res.forEach((item, index) => {
-						this.chooseHouseList.push({
-							value: item.id,
-							label: item.name,
-							selectType:'xiaoqu'
-						})
-					})
-				})
+
 			},
-			searchinfo(selectType){
-				if(selectType == 'xiaoqu'){
-					console.log('ssss',this.selectType)
-					service.getArea({name:this.keyword}).then(res => {
+			// //获取小区
+			// getArea() {
+			// 	service.getArea().then(res => {
+			// 		this.chooseHouseList = [];
+			// 		res.forEach((item, index) => {
+			// 			this.chooseHouseList.push({
+			// 				value: item.id,
+			// 				label: item.name,
+			// 				selectType: 'xiaoqu'
+			// 			})
+			// 		})
+			// 	})
+			// },
+			searchinfo(selectType) {
+				if (selectType == 'xiaoqu') {
+					console.log('ssss', this.selectType)
+					service.getArea({
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'xiaoqu'
+								selectType: 'xiaoqu'
 							})
 						})
-					})	
+					})
 					this.keyword = '';
-				}else if(selectType == 'louyu'){
-					console.log('ssss',this.selectType)
-					service.getBuilding({areaId: this.houseid,name:this.keyword}).then(res => {
+				} else if (selectType == 'louyu') {
+					console.log('ssss', this.selectType)
+					service.getBuilding({
+						areaId: this.houseid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'danyuan'){
-					console.log('ssss',this.selectType)
-					service.getUnit({buildingId: this.buildid,name:this.keyword}).then(res => {
+				} else if (selectType == 'danyuan') {
+					console.log('ssss', this.selectType)
+					service.getUnit({
+						buildingId: this.buildid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
 					this.keyword = '';
-				}else if(selectType == 'menpai'){
-					console.log('ssss',this.selectType)
-					service.getAllHouse({unitId: this.unitid,name:this.keyword}).then(res => {
+				} else if (selectType == 'menpai') {
+					console.log('ssss', this.selectType)
+					service.getAllHouse({
+						unitId: this.unitid,
+						name: this.keyword
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach((item, index) => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.keyword = '';
 				}
-				
+
 			},
 			openHouse(selectType) {
-				if(selectType === 'xiaoqu'){
+				if (selectType === 'district') {
+					this.inputShow = false
+					//选择行政区
+					this.housename = null;
+					this.selectType = 'district'
+					service.getDistrict().then(res => {
+						// console.log(res);
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'district'
+							})
+						})
+					})
+				} else if (selectType === 'xiaoqu') {
+					this.inputShow = true
 					//选择小区
 					this.selectType = 'xiaoqu'
-					this.getArea();
-				}else if(selectType === 'louyu'){
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach((item, index) => {
+							this.chooseHouseList.push({
+								value: item.id,
+								label: item.name,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+				} else if (selectType === 'louyu') {
+					this.inputShow = true
 					//选择楼宇
 					this.selectType = 'louyu'
 					this.housename = null;
 					this.buildid = 0;
-					service.getBuilding({areaId: this.houseid}).then(res => {
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
-				}else if(selectType === 'danyuan'){
+				} else if (selectType === 'danyuan') {
+					this.inputShow = true
 					//选择单元
 					this.selectType = 'danyuan'
 					this.housename = null;
 					this.unitid = 0;
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
-				}else if(selectType === 'menpai'){
+				} else if (selectType === 'menpai') {
+					this.inputShow = true
 					//选择门牌
-					console.log('menpai',this.numberid)
+					console.log('menpai', this.numberid)
 					this.selectType = 'menpai'
 					this.housename = null;
 					this.numberid = null;
-					service.getAllHouse({unitId: this.unitid}).then(res => {
+					service.getAllHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 				}
 				this.pop = !this.pop;
 			},
-			active(item,index){
+			active(item, index) {
 				this.current = index;
 				this.housename = item.label;
-				if(item.selectType == 'xiaoqu'){
+				if (item.selectType == 'district') { //行政区
+					this.districtId = item.value;
+				} else if (item.selectType == 'xiaoqu') {
 					this.houseid = item.value;
-				}else if(item.selectType == 'louyu'){
+				} else if (item.selectType == 'louyu') {
 					this.buildid = item.value;
-				}else if(item.selectType == 'danyuan'){
+				} else if (item.selectType == 'danyuan') {
 					this.unitid = item.value;
-				}else if(item.selectType == 'menpai'){
+				} else if (item.selectType == 'menpai') {
 					this.numberid = item.value
 				}
 				this.selectType = item.selectType;
 			},
-			search(selectType){
-				if(selectType == 'xiaoqu'){
-					this.house = this.housename;	
-					service.getBuilding({areaId: this.houseid}).then(res => {
+			search(selectType) {
+				if (selectType == 'district') {
+					this.districtName = this.housename;
+					service.getArea({
+						district: this.districtId
+					}).then(res => {
+						this.chooseHouseList = [];
+						res.forEach(item => {
+							this.chooseHouseList.push({
+								value: item.dictValue,
+								label: item.dictLabel,
+								selectType: 'xiaoqu'
+							})
+						})
+					})
+					this.current = -1;
+					this.house = null;
+					this.bulid = null;
+					this.unit = null;
+					this.houseNumber = null;
+
+					this.houseid = 0;
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+
+
+				} else if (selectType == 'xiaoqu') {
+					this.house = this.housename;
+					service.getBuilding({
+						areaId: this.houseid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'louyu'
+								selectType: 'louyu'
 							})
 						})
 					})
@@ -348,40 +444,52 @@
 					this.bulid = null;
 					this.unit = null;
 					this.houseNumber = null;
-				}else if(selectType == 'louyu'){
+
+					this.buildid = 0;
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'louyu') {
 					this.bulid = this.housename;
-					service.getUnit({buildingId: this.buildid}).then(res => {
+					service.getUnit({
+						buildingId: this.buildid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'danyuan'
+								selectType: 'danyuan'
 							})
 						})
 					})
 					this.unit = null;
 					this.houseNumber = null;
 					this.current = -1;
-				}else if(selectType == 'danyuan'){
+
+					this.unitid = 0;
+					this.housedata = 0;
+				} else if (selectType == 'danyuan') {
 					this.unit = this.housename;
-					service.getAllHouse({unitId: this.unitid}).then(res => {
+					service.getAllHouse({
+						unitId: this.unitid
+					}).then(res => {
 						this.chooseHouseList = [];
 						res.forEach(item => {
 							this.chooseHouseList.push({
 								value: item.id,
 								label: item.name,
-								selectType:'menpai'
+								selectType: 'menpai'
 							})
 						})
 					})
 					this.houseNumber = null;
 					this.current = -1;
-					
-				}else if(selectType == 'menpai'){
+					this.housedata = 0;
+
+				} else if (selectType == 'menpai') {
 					this.houseNumber = this.housename;
 					this.housedata = this.numberid;
-					console.log('this.housedata',this.housedata)
+					// console.log('this.housedata', this.housedata)
 					this.current = -1;
 				}
 				this.pop = false;
@@ -467,10 +575,10 @@
 								uni.showLoading({
 									title: '上传中'
 								})
-								if(_this.progress != 100){
+								if (_this.progress != 100) {
 									_this.loading = false
 									console.log('_this.loading false', _this.loading)
-								}else {
+								} else {
 									_this.loading = true
 									console.log('_this.loading true', _this.loading)
 								}
@@ -483,7 +591,7 @@
 				let _this = this;
 				console.log('视频')
 				uni.chooseVideo({
-					sourceType: ['album','camera'],
+					sourceType: ['album', 'camera'],
 					maxDuration: 30,
 					success(resp) {
 						const task = uni.uploadFile({
@@ -512,7 +620,7 @@
 										_this.imgArr.push(data.data.url)
 										console.log('imgArr', _this.imgArr)
 										_this.$UTILS.showPrompt('上传成功！')
-									} 
+									}
 								}
 							},
 							fail: e => {
@@ -537,10 +645,10 @@
 							uni.showLoading({
 								title: '上传中'
 							})
-							if(_this.progress != 100){
+							if (_this.progress != 100) {
 								_this.loading = false
 								console.log('_this.loading false', _this.loading)
-							}else {
+							} else {
 								_this.loading = true
 								console.log('_this.loading true', _this.loading)
 							}
@@ -556,15 +664,15 @@
 					success: (res) => {
 						if (res.confirm) {
 							this.imgArr.splice(index, 1)
-							console.log('this.imgarr',this.imgArr)
+							console.log('this.imgarr', this.imgArr)
 						}
 					}
 				})
 			},
-			openQualified(){
+			openQualified() {
 				this.qualifiedShow = !this.qualifiedShow;
 			},
-			qualifiedConfirm(e){
+			qualifiedConfirm(e) {
 				this.isqualified = e[0].value;
 			}
 		}
@@ -579,6 +687,7 @@
 		height: 100%;
 		background-size: 100% 100%;
 	}
+
 	.choose {
 		text-align: center;
 		padding: 20rpx;
@@ -587,15 +696,18 @@
 		background: #43CEB1;
 		border-radius: 64rpx;
 	}
+
 	.upload {
 		margin: 30rpx;
 		padding: 30rpx 20rpx;
 		border: 2rpx solid #3857F3;
 		border-radius: 48rpx;
 	}
-	.active{
-	   background-color: #1890FF;
+
+	.active {
+		background-color: #1890FF;
 	}
+
 	.project-content {
 		border: 4rpx solid #3857F3;
 		margin: 80rpx 55rpx 30rpx;