|
@@ -251,15 +251,12 @@ Page({ |
|
|
data: param |
|
|
data: param |
|
|
}).then(res => { |
|
|
}).then(res => { |
|
|
wx.setStorageSync('tenantId', tenantId) |
|
|
wx.setStorageSync('tenantId', tenantId) |
|
|
|
|
|
wx.setStorageSync('firstEnter', false) |
|
|
|
|
|
wx.hideLoading(); |
|
|
// wx.showModal({ |
|
|
// wx.showModal({ |
|
|
// title: '提示', |
|
|
// title: '提示', |
|
|
// content: '切换成功!', |
|
|
// content: '切换成功!', |
|
|
// }) |
|
|
// }) |
|
|
wx.showToast({ |
|
|
|
|
|
title: '切换成功!', |
|
|
|
|
|
icon: 'success', |
|
|
|
|
|
duration: 2000 |
|
|
|
|
|
}) |
|
|
|
|
|
wx.reLaunch({ |
|
|
wx.reLaunch({ |
|
|
url: '/index/index', |
|
|
url: '/index/index', |
|
|
}) |
|
|
}) |
|
@@ -290,29 +287,30 @@ Page({ |
|
|
type: "wgs84", |
|
|
type: "wgs84", |
|
|
success: function (res) { |
|
|
success: function (res) { |
|
|
console.log(res, 9999) |
|
|
console.log(res, 9999) |
|
|
// let minNum = 0; |
|
|
|
|
|
// let minIndex = 0; |
|
|
|
|
|
// JSON.parse(wx.getStorageSync('tenantData')).map((item, index) => { |
|
|
|
|
|
// let lang = that.GetDistance(res.latitude,item.latitude,res.longitude,item.longitude) |
|
|
|
|
|
// minIndex = (index == 0 || lang < minNum) ? index : minIndex; |
|
|
|
|
|
// minNum = (index == 0 || lang < minNum) ? lang : minNum; |
|
|
|
|
|
// }) |
|
|
|
|
|
// if (JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId != wx.getStorageSync('tenantId')){ |
|
|
|
|
|
// wx.showModal({ |
|
|
|
|
|
// title: '提示', |
|
|
|
|
|
// content: '系统检测到您离' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name + '较近,要切换至' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name+'吗?', |
|
|
|
|
|
// success: function (res) { |
|
|
|
|
|
// // 重启首页 |
|
|
|
|
|
// if (res.confirm) { |
|
|
|
|
|
// console.log(6789) |
|
|
|
|
|
// that.checkoutGroup(JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId, JSON.parse(wx.getStorageSync('tenantData'))[minIndex].parentTenantId) |
|
|
|
|
|
// // wx.reLaunch({ |
|
|
|
|
|
// // url: '/pages/index/index', |
|
|
|
|
|
// // }) |
|
|
|
|
|
// } |
|
|
|
|
|
// } |
|
|
|
|
|
// }) |
|
|
|
|
|
// } |
|
|
|
|
|
|
|
|
let minNum = 0; |
|
|
|
|
|
let minIndex = 0; |
|
|
|
|
|
JSON.parse(wx.getStorageSync('tenantData')).map((item, index) => { |
|
|
|
|
|
let lang = that.GetDistance(res.latitude,item.latitude,res.longitude,item.longitude) |
|
|
|
|
|
minIndex = (index == 0 || lang < minNum) ? index : minIndex; |
|
|
|
|
|
minNum = (index == 0 || lang < minNum) ? lang : minNum; |
|
|
|
|
|
}) |
|
|
|
|
|
if (JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId != wx.getStorageSync('tenantId') && wx.getStorageSync('firstEnter')){ |
|
|
|
|
|
wx.showModal({ |
|
|
|
|
|
title: '提示', |
|
|
|
|
|
content: '系统检测到您离' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name + '较近,要切换至' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name+'吗?', |
|
|
|
|
|
success: function (res) { |
|
|
|
|
|
// 重启首页 |
|
|
|
|
|
if (res.confirm) { |
|
|
|
|
|
wx.showLoading({ |
|
|
|
|
|
title: '切换中...', |
|
|
|
|
|
}) |
|
|
|
|
|
that.checkoutGroup(JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId, JSON.parse(wx.getStorageSync('tenantData'))[minIndex].parentTenantId) |
|
|
|
|
|
}else{ |
|
|
|
|
|
wx.setStorageSync('firstEnter', false) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
if (res && res.longitude && res.latitude) { |
|
|
if (res && res.longitude && res.latitude) { |
|
|
Http.post({ |
|
|
Http.post({ |
|
|
url: config.api.updateLBS, |
|
|
url: config.api.updateLBS, |
|
|