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 @@ {{$store.getters.userInfo.realname}} {{$store.getters.userInfo.phone}} - - 个人信息 + + 领用记录 - - 修改密码 + + 出入库记录 采购记录 - - 领用记录 - 系统消息 {{$store.state.sysMsgNum}} + + 个人信息 + 退出 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){