commit

map标记

app.js

@@ -1,9 +1,9 @@
 // app.js
-var projectMode = 2;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
-var info = wx.getSystemInfoSync();
-if (info.platform != "devtools" && projectMode == 0) { projectMode = 1 }
+var projectMode=1;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
+var info=wx.getSystemInfoSync();
+if(info.platform!="devtools"&&projectMode==0){projectMode=1}
 var envVersion = `${__wxConfig.envVersion}`;//develop	开发版，trial	体验版，release	正式版
-if (envVersion == 'release') { projectMode = 2 }
+if(envVersion=='release'){projectMode=2}
 import api from './utils/api'
 App({
   onLaunch() {
@@ -11,110 +11,110 @@ App({
     const logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
     wx.setStorageSync('logs', logs)
-    var that = this;
+    var that=this;
 
     this.getLocation();
 
+
+
     // 登录
 
     wx.checkSession({
-      success: res => {
+      success: res=> {
         console.log(res)
       },
-      fail: (res) => {
+      fail:(res)=>{
       }
     })
-
+  
 
     this.globalData.btnInfo = wx.getMenuButtonBoundingClientRect()
-    console.log(this.globalData.btnInfo, '按钮信息');
-
+    console.log(this.globalData.btnInfo,'按钮信息');
+    
   },
   globalData: {
     userInfo: null,
-    btnInfo: null,
-    baseAppUrl: projectMode == 2 ? 'https://wash.nanodreamtech.com/' : (projectMode == 1 ? 'https://wash.nanodreamtech.com/' : 'http://127.0.0.1:8000/'),
-    location: {'latitude':123,'longitude':321}
+    btnInfo:null,
+    baseAppUrl: projectMode==2 ? 'https://wash.nanodreamtech.com/':(projectMode==1 ?'https://wash.nanodreamtech.com/':'http://127.0.0.1:8000/'),
+    location:""
   },
-  api: api,
-
-  getLocation(e) {
-    var that = this;
+  api:api,
 
+  getLocation(e){
+    var that=this;
     wx.startLocationUpdateBackground({
-      success(res) {
-        console.log('开启后台定位', res)
-        wx.onLocationChange(function (ress) {
-         wx.setStorageSync('latitude', ress.latitude)
-         wx.setStorageSync('longitude', ress.longitude)
-          that.globalData.location = ress;
-          that.login(that.globalData.location.latitude,  that.globalData.location.longitude).then(function (res) {
-            if (res.code != 200) {
-
-            }
+        success(res) {
+          console.log('开启后台定位', res)
+          wx.onLocationChange(function(res) {
+            console.log('location change', res)
+            that.globalData.location=res;
 
 
-          }, function (err) {
+   
+            that.login(res.latitude,res.longitude).then(function(res){
+              if(res.code!=200){
+                
+              }
 
-          })
 
+            },function(err){
 
-        })
-      },
-      fail(res) {
-        console.log('开启后台定位失败', res)
-      }
-    })
-  },
-
-  login(lat = "", lng = "") {
-    var that = this;
-    return new Promise((resolve, reject) => {
+            })
 
-      wx.checkSession({
-        success: (res) => {
 
-        },
-        fail: (res) => {
-      
-          wx.login({
-            success: res => {
-              // 发送 res.code 到后台换取 openId, sessionKey, unionId
-              that.api.useApi(that.globalData.baseAppUrl + "api/login", {
-                code: res.code,
-                lat: lat,
-                lng: lng,
-                appid: wx.getAppBaseInfo().host.appId
-              }, "post").then(function (res) {
-                wx.showLoading({
-                  title: '登录中',
-                })
-                console.log(res);
-                if (res.code != 200) {
-                  setTimeout(function () {
-                    that.login(lat, lng);
-                  }, 1000);
-                } else {
-                  wx.hideLoading();
-                  wx.setStorageSync('token', res.message.token);
-                  wx.setStorageSync('uid', res.message.user_id);
-                  wx.setStorageSync('nid', res.message.network_id);//当前网点选择id
-                  resolve(res);
-                }
-
-              }).catch(function (err) {
-                console.log(222);
-              })
-            }
           })
+        },
+        fail(res) {
+          console.log('开启后台定位失败', res)
         }
-
       })
+},
 
+  login(lat="",lng=""){
+    var that=this;
+   return new Promise((resolve,reject)=>{
 
+    wx.checkSession({
+      success: (res) => {
 
+      },
+      fail:(res)=>{
+        wx.login({
+          success: res => {
+            // 发送 res.code 到后台换取 openId, sessionKey, unionId
+            that.api.useApi(that.globalData.baseAppUrl+"api/login",{
+              code:res.code,
+              lat:lat,
+              lng:lng,
+              appid:wx.getAppBaseInfo().host.appId
+            },"post").then(function(res){
+              wx.showLoading({
+                title: '登录中',
+              })
+              if(res.code!=200){
+                setTimeout(function(){
+                  that.login(lat,lng);
+                },1000);
+              }else{
+                wx.hideLoading();
+                resolve(res);
+              }
+          
+    
+            
+            }).catch(function(err){
+              console.log(222);
+            })
+          }
+        })
+      }
 
     })
+
+
+
+   
+   })
   }
 
 })

pages/home/map/map.js

@@ -9,7 +9,8 @@ Page({
         location:{},
         mapworkelist:[],
         inputValue:"",
-        workelist:[]
+        workelist:[],
+        hasMarkers:true
     },
 
     /**
@@ -74,13 +75,18 @@ Page({
             'latitude':data[i]['lat'],
             'longitude':data[i]['lng'],
             'iconPath': '/image/address/location.png',
+            'width':100,
+            'height':100
           }
            
         }
         that.setData({
-          mapworkelist:maplist
+          mapworkelist:maplist,
+          hasMarkers:true
         })
 
+
+        console.log(that.data.mapworkelist)
         }
 
         wx.hideLoading();

pages/home/map/map.wxml

@@ -13,9 +13,10 @@
     </view>
 </view>
 
-<view class="contioner">
-    <map name="" longitude="{{location.longitude}}" latitude="{{location.latitude}}" markers="{{mapworkelist}}" show-location></map>
+<view class="contioner" hover-class="none" hover-stop-propagation="false" style="width: 100%; height: 100%;">
+    <map name="" longitude="{{location.longitude}}" latitude="{{location.latitude}}" markers="{{mapworkelist}}" show-location style="width: 100%; height: 100%;" wx:if="{{hasMarkers}}"></map>
 </view>
+]
 
 <view class="footerBox flex ju-b">
         <view class="le">