提交

@@ -53,7 +53,7 @@
 			}
 		},
 		methods: {
-			delAddress(){
+			delAddress(index){
 				this.keyList[index].moreInfo.LAT = ''
 				this.keyList[index].moreInfo.LON = ''
 			},

 <template>
 	<view>
 		<!-- 顶部区域 -->
-		<check-top-wrap @changeParamType="changeParamType" :yearVal="param.year" :keyword="keyword" :cityVal="basinTxt" @showPicker="showPicker"></check-top-wrap>
+		<check-top-wrap @changeParamType="changeParamType" :yearVal="yearTxt" :keyword="keyword" :cityVal="basinTxt" @showPicker="showPicker"></check-top-wrap>
 		<w-picker
 			:visible.sync="visibleYear"
 			mode="date" 
@@ -55,6 +55,7 @@
 	export default {
 		data() {
 			return {
+				yearTxt:new Date().getFullYear().toString(),
 				basinTxt:'全流域',
 				param:{
 					// 恢复位置
@@ -89,7 +90,7 @@
 		},
 		onLoad() {
 			//#ifdef APP-PLUS
-			uni.getLocation({
+			/* uni.getLocation({
 			    type: 'gcj02',
 				geocode: true,
 			    success: (res) => {
@@ -97,12 +98,15 @@
 					this.basinTxt = res.address.city
 					this.defaultRegion = [res.address.province,res.address.city]
 			    }
-			});
+			}); */
 			//#endif
 			//#ifdef H5
 			// 恢复位置
-			this.defaultRegion = ['全流域','']
+			// this.defaultRegion = ['全流域','']
 			//#endif
+			this.param.basin = ''
+			this.basinTxt = '全流域'
+			this.defaultRegion = ['全流域','']
 			this.getData()
 		},
 		methods: {
@@ -143,7 +147,15 @@
 			},
 			onConfirm(e,pickerType){
 				if(pickerType == 'year'){
-					this.param.year = e.result
+					console.log('e.result',e.result)
+					if(e.result == '全'){
+						this.param.year = ''
+						this.yearTxt = '全'
+					}else{
+						this.param.year = e.result
+						this.yearTxt = e.result
+					}
+					
 				}
 				if(pickerType == 'region'){
 					if(e.obj.city.label != ''){

@@ -2002,8 +2002,8 @@
 				uni.getLocation({
 				    type: 'wgs84',
 				    success: (res) => {
-						this.LAT = 123
-						this.LON = 456
+						this.LAT = res.latitude
+						this.LON = res.longitude
 						var moreInfo = {
 							LAT:this.LAT,
 							LON:this.LON,
@@ -2056,11 +2056,25 @@
 				this.showRecordMore = false
 			},
 			editRecordMore(e){
-				console.log('e',e)
+				if(this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.LAT != ''){
+					this.LAT = this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.LAT
+				}else{
+					this.LAT = ''
+					this.LON = ''
+				}
+				if(this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.NOTE != ''){
+					this.desc = this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.NOTE
+				}else{
+					this.desc = ''
+				}
+				if(this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.IMGS){
+					this.IMGS = this.checkList[e.checkIndex].keyList[e.keyIndex].moreInfo.IMGS
+				}else{
+					this.IMGS = []
+				}
 				this.checkIndex = e.checkIndex
 				this.keyIndex = e.keyIndex
 				this.showRecordMore = true
-				// this.checkList[e.checkIndex].keyList[e.keyIndex].
 			},
 			async setSubKeyList(subKeyObj,keyList){
 				var subKey = {

@@ -214,6 +214,9 @@
 					}
 				})
 			},
+			onCancel(){
+				
+			},
 			onConfirm(e,pickerType){
 				this.checkTime = e.result
 			},