修改页面样式

pages/massif/add_farming.vue

@@ -209,7 +209,7 @@ export default {
 				farmingTime:{label:"操作日期",styleType:"parallel",type:"calendar"},
 				farmingPlanId:{label:"种植计划",type:"select",columns:[],value:[]},
 				images:{label:"农事图片",type:"upImg",num:3},
-				farmingRemarks:{label:"产品介绍",type:"textarea"},
+				farmingRemarks:{label:"备注",type:"textarea"},
 			},
 			formData:{
 				farmingType:"",

pages/massif/mana/farmRecord.vue

@@ -88,6 +88,7 @@
 					<text>负责人：{{v.principal}}</text> <text>记录时间：{{v.time}}</text>
 				</view>
 			</view>
+			<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>

pages/massif/mana/index.vue

@@ -68,6 +68,7 @@ export default {
 			var points=await this.getDetail()
 			
 			this.maps=amap.$getAppMap()
+			
 			this.maps.setMapType(plus.maps.MapType.MAPTYPE_SATELLITE)
 			if(points.length>0){
 				var bound=computeArea(points)
@@ -79,9 +80,15 @@ export default {
 				polygon.setFillColor("#10C176")
 				polygon.setFillOpacity(0.3)
 				this.maps.addOverlay(polygon)
+			}else{
+				this.maps.getUserLocation((state,point)=>{
+					if(state==0){
+						this.maps.centerAndZoom(new plus.maps.Point(point.longitude, point.latitude),10)
 					}else{
 						this.maps.centerAndZoom(new plus.maps.Point(102.712251,25.040609),10)
 					}
+				})
+			}
 			
 		/* #endif */
 	},

pages/massif/mana/plantPlan.vue

@@ -203,7 +203,12 @@ export default {
 			})
 		},
 		//结束种植
-		async finishPlant(index){
+		finishPlant(index){
+			uni.showModal({
+				title:"提示",
+				content:"确定结束种植！",
+				success: async e=>{
+					if(e.confirm){
 						var res=await request("/api/plantPlan/finishPlant",{
 							params:{plantPlanId:this.list[index].id}
 						})
@@ -217,6 +222,9 @@ export default {
 								showCancel:false,
 							})
 						}
+					}
+				}
+			})
 		},
 		//跳转新增采收页面
 		toAdd(plantId){

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

@@ -497,9 +497,15 @@ import {computeArea} from '@/common/utils'
 						this.markerList[this.markerList.length-1].next=this.markerList[0].value
 						this.maps.centerAndZoom(new plus.maps.Point(bound.center.longitude, bound.center.latitude),10)
 						this.drawOver(true)
+					}else{
+						this.maps.getUserLocation((state,point)=>{
+							if(state==0){
+								this.maps.centerAndZoom(new plus.maps.Point(point.longitude, point.latitude),10)
 							}else{
 								this.maps.centerAndZoom(new plus.maps.Point(102.712251,25.040609),10)
 							}
+						})
+					}
 					this.maps.onclick=(e)=>{
 						console.log("zoom",this.maps.getZoom())
 						this.markerList.length<=0 && this.maps.addOverlay(polyline)