From 3bb5f15e478f0681847d42430ac1bc024971ffda Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 11 Apr 2023 10:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=97=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue  |  2 ++
 pages/home/my.vue     | 14 +++++++-------
 pages/massif/info.vue | 18 +++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7950e0b..d95a298 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -379,6 +379,7 @@ import request,{host} from '@/common/request'
 			this.$provise.on("updateMassif", this.getMassif)
 			this.$provise.on("updateStock", this.getStock)
 
+			//#ifdef APP-PLUS
 			uni.getLocation({
 				type:"gcj02",
 				geocode:true,
@@ -392,6 +393,7 @@ import request,{host} from '@/common/request'
 					}
 				}
 			})
+			//#endif
 		},
 		methods: {
 			async getHeadImg(){
diff --git a/pages/home/my.vue b/pages/home/my.vue
index 95786f2..2190f0d 100644
--- a/pages/home/my.vue
+++ b/pages/home/my.vue
@@ -64,21 +64,21 @@
 			<text class="name">{{$store.getters.userInfo.realname}}</text>
 			<text class="phone">{{$store.getters.userInfo.phone}}</text>
 			
-			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
-				<text class="plant-gerenzhongxinwode"/> <text>个人信息</text> <text class="plant-youbian"/>
+			<view class="item" @click="$u.route({url:'/pages/stock/already'})">
+				<text class="plant-kufangguanli-lingyongguihuan"/> <text>领用记录</text> <text class="plant-youbian"/>
 			</view>
-			<view class="item" @click="$u.route({url:'pages/home/rePassword'})">
-				<text class="plant-icon2"/> <text>修改密码</text> <text class="plant-youbian"/>
+			<view class="item" @click="$u.route({url:'/plantPages/stock/record'})">
+				<text class="plant-liulanjilu-tianchong"/> <text>出入库记录</text> <text class="plant-youbian"/>
 			</view>
 			<view class="item" @click="$u.route({url:'/pages/purchase/record'})">
 				<text class="plant-liulanjilu-tianchong"/> <text>采购记录</text> <text class="plant-youbian"/>
 			</view>
-			<view class="item" @click="$u.route({url:'/pages/stock/already'})">
-				<text class="plant-kufangguanli-lingyongguihuan"/> <text>领用记录</text> <text class="plant-youbian"/>
-			</view>
 			<view class="item" @click="$u.route({url:'/pages/home/news'})">
 				<text class="plant-xitongxiaoxi"/> <text>系统消息</text> <text class="number">{{$store.state.sysMsgNum}}</text> <text class="plant-youbian"/>
 			</view>
+			<view class="item" @click="$u.route({url:'pages/home/personalInfo'})">
+				<text class="plant-gerenzhongxinwode"/> <text>个人信息</text> <text class="plant-youbian"/>
+			</view>
 			<view class="item" @click="outLogin">
 				<text class="plant-tuichu"/> <text>退出</text> <text class="plant-youbian"/>
 			</view>
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 9a02fee..a9be2da 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -145,14 +145,14 @@ import request from '@/common/request'
 					this.formData=res.data
 					this.fields.date.value=[res.data.beginTime, res.data.endTime]
 					this.fields.plantBaseInfoId.value=[res.data.plantBaseInfoId]
-					this.fields.image.value=res.data.image.join(',')
-					this.fields.longitude.value=this.formData.longitude.split("|").map(v=>{
-						var point=v.split(",")
-						if(point.length==2){
-							return {longitude:point[0],latitude:point[1]}
-						}
-						return null
-					}).filter(v=>v)
+					this.fields.image.value=(res.data.image||'').join(',')
+					// this.fields.longitude.value=this.formData.longitude.split(";").map(v=>{
+					// 	var point=v.split(",")
+					// 	if(point.length==2){
+					// 		return {longitude:point[0],latitude:point[1]}
+					// 	}
+					// 	return null
+					// }).filter(v=>v)
 				}else{
 					uni.showModal({
 						title:"提示",
@@ -163,7 +163,7 @@ import request from '@/common/request'
 			},
 			editorMap(e){
 				this.fields.longitude.value=e
-				this.formData.longitude=e.map(v=>`${v.longitude},${v.latitude}`).join('|')
+				this.formData.longitude=e.map(v=>`${v.longitude},${v.latitude}`).join(';')
 			},
 		},
 		onBackPress(e){