修改搜索

common/request.js

@@ -2,8 +2,8 @@ import store from "@/store"
 
 export function host(host='default',suffix='/plant_manage'){
 	var url=process.env.NODE_ENV === 'development'?{
-			default:`http://zrxsae.natappfree.cc` //陈
+			// default:`http://zrxsae.natappfree.cc` //陈
-			// default:`http://uq5pak.natappfree.cc` //马
+			default:`http://uq5pak.natappfree.cc` //马
 		}:{
 			default:`http://qv6mj8.natappfree.cc`
 		}

pages/massif/info.vue

@@ -14,7 +14,7 @@
 				v-bind="v"
 				:required="!!rules[k]"
 				:field="k"
-				:value="(/^dateRange$|^select$/.test(v.type)?fields[k].value:formData[k])"
+				:value="(/^dateRange$|^select$|^map$/.test(v.type)?fields[k].value:formData[k])"
 				ref="dForm"
 				@input="formData[k]=$event"
 				@selectRDate="selectDate"
@@ -37,7 +37,7 @@ import request from '@/common/request'
 					realityArea:{label:"实际面积",type:'digit'},
 					image:{label:"地块图片",type:"upImg",num:3,value:''},
 					date:{label:"使用日期",type:"dateRange",value:[]},
-					jw:{label:"经/纬度",type:"map"},
+					jw:{label:"经/纬度",type:"map",value:[]},
 					address:{label:"详细地址",type:"textarea"},
 				},
 				formData:{

pages/massif/mana/recovery.vue

@@ -118,7 +118,7 @@
 			@close="show=false"
 			@cancel="show=false"
 			:value="date"
-			@confirm="searchVal[dateType]=new Date($event.value).format('yyyy-MM-dd');show=false"/>
+			@confirm="searchVal[dateType]=new Date($event.value).format('yyyy-MM-dd');clean();search();show=false"/>
 	</view>
 </template>
 <script>
@@ -163,6 +163,11 @@ export default {
 				this.search(plantId)
 			})
 		},
+		chean(){
+			this.list=[]
+			this.total=0
+			this.searchVal.pageNo=1
+		},
 		async search(plantId=''){
 			if(this.total==0||this.list.length<this.total){
 				var res=await request("/api/plantHarvest/list",{

uni_modules/d-form/components/d-form/d-form.vue

@@ -381,6 +381,9 @@ import {dataType} from 'black-knight/lib/config/tools'
 				})
 			}
 		},
+		activated(){
+			console.log("-------activated---------------")
+		},
 		methods:{
 			async afterRead(e){
 				this.imgList=this.imgList.concat(e.file.map(v=>Object.assign(v,{
@@ -426,27 +429,34 @@ import {dataType} from 'black-knight/lib/config/tools'
 				this.showMap=true
 				if(!this.maps){
 					var amap=uni.createMapContext("amap",this)
+
 					this.maps=amap.$getAppMap()
 					this.maps.setMapType(plus.maps.MapType.MAPTYPE_SATELLITE)
 					this.maps.onclick=(e)=>{
 						console.log(e,'-------maps--click---------')
 					}
-					var polygon=new plus.maps.Polygon([
+					// var polygon=new plus.maps.Polygon([
-						new plus.maps.Point(116.39524,39.925301),
+					// 	new plus.maps.Point(116.39524,39.925301),
-						new plus.maps.Point(116.400444,39.925285),
+					// 	new plus.maps.Point(116.400444,39.925285),
-						new plus.maps.Point(116.400558,39.923282),
+					// 	new plus.maps.Point(116.400558,39.923282),
-						new plus.maps.Point(116.395502,39.923082),
+					// 	new plus.maps.Point(116.395502,39.923082),
-					])
+					// ])
-					polygon.setLineWidth(2)
+					// polygon.setLineWidth(2)
-					polygon.setStrokeColor("#10C176")
+					// polygon.setStrokeColor("#10C176")
-					polygon.setFillColor("#10C176")
+					// polygon.setFillColor("#10C176")
-					polygon.setFillOpacity(0.3)
+					// polygon.setFillOpacity(0.3)
-					this.maps.addOverlay(polygon)
+					// this.maps.addOverlay(polygon)
 					
 					var marker=new plus.maps.Marker(new plus.maps.Point(116.396137,39.924055));
-					marker.setIcon("/static/tab_home.png");
+					marker.setIcon("/static/map_point_1.png");
 					marker.bringToTop()
 					marker.setDraggable(true)
+					marker.onclick= e=>{
+						console.log('---onclick----')
+					}
+					marker.onDrag= e=>{
+						console.log("-----Drag:",JSON.stringify(e.getPoint()))
+					}
 					this.maps.addOverlay(marker);
 				}
 				/* #endif */