Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/components/fnHeader.vue

@@ -107,12 +107,13 @@ const getGardenList = () => {
     };
     console.log('userInfo', userInfo);
     if(userInfo.userName === "游客"){
-      options.value = [{name: "荔枝博览园",organId:766, wkt: "POINT(113.61702297075017 23.584863449735067)"}]
+      options.value = [{name: "湛江湖畔荔庄",organId:90440, wkt: "POINT(113.61702297075017 23.584863449735067)"}]
     }else{
       VE_API.home.userGarden(params).then((res) => {
         // options.value = res.data;
         options.value.push(
             {name: "汕尾妙荔果园",organId:43318, wkt: "POINT(115.455766 22.883073)"},
+            {name: "湛江湖畔荔庄",organId:90440, wkt: "POINT(110.907297 21.432212)"},
             {name: "荔枝博览园",organId:766, wkt: "POINT(113.61702297075017 23.584863449735067)"},
             {name: "柏桥村",organId:80865, wkt: "POINT(111.010804321 21.7759452836)"},
             {name: "从化凤二基地",organId:90264, wkt: "POINT(113.67884027228604 23.511176408307904)"},

src/views/home/map/samplePointLayer.js

@@ -441,7 +441,7 @@ class SamplePointLayer {
   getIcon(item) {
     // let imgSrc = require(`@/assets/images/map/${item.iconName}-icon.png`)
     let imgSrc = require('@/assets/images/map/status/status-zc.png')
-    let scale = 0.8
+    let scale = 0.6
     if (item.status == 1) {
       imgSrc = require('@/assets/images/map/status/status-szyc.png')
     }
@@ -461,7 +461,7 @@ class SamplePointLayer {
     // }
     if (item.noImg === 1) {
       imgSrc = require('@/assets/images/map/status/defalut-icon.png')
-      scale = 0.3
+      scale = 0.2
     }
     if (item.nonghu === 1) {
       imgSrc = require('@/assets/images/map/status/nonghu-icon.png')