From 07ea57f5c239e297c4c7b78d1a71af21e5f49717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=B7=E6=B4=8B=E4=B9=8B=E5=A3=B0?= Date: Mon, 14 Oct 2019 17:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E9=80=89=E6=8B=A9=E8=BE=83?= =?UTF-8?q?=E8=BF=91=E7=9A=84=E5=B9=BF=E5=9C=BA=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 3 ++- ext.json | 2 +- index/index.js | 54 ++++++++++++++++++++++++-------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app.js b/app.js index dcdc168..bd54194 100644 --- a/app.js +++ b/app.js @@ -43,7 +43,8 @@ App({ .then(res => { if (res.data.subMalls) { let list = JSON.parse(res.data.subMalls) - wx.setStorageSync('tenantData', JSON.stringify(list)) + wx.setStorageSync('tenantData', JSON.stringify(list)); + wx.setStorageSync('firstEnter', true) wx.setStorageSync('tenantId', list.filter(e => e.tenantId == res.data.selectedMall)[0].tenantId) } else { wx.setStorageSync('tenantData', "[]") diff --git a/ext.json b/ext.json index 2825668..ba08313 100644 --- a/ext.json +++ b/ext.json @@ -15,7 +15,7 @@ "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "http://10.11.153.193:7000/C/api", + "configUrl": "http://10.11.153.205:7000/C/api", "etcpAppId": "wx192b7d2e8dcbefd0", "socketUrl": "wss://mp.youlane.cn/W/ws", "etcpVersion": "release", diff --git a/index/index.js b/index/index.js index fa27a25..43ac9a3 100644 --- a/index/index.js +++ b/index/index.js @@ -251,15 +251,12 @@ Page({ data: param }).then(res => { wx.setStorageSync('tenantId', tenantId) + wx.setStorageSync('firstEnter', false) + wx.hideLoading(); // wx.showModal({ // title: '提示', // content: '切换成功!', // }) - wx.showToast({ - title: '切换成功!', - icon: 'success', - duration: 2000 - }) wx.reLaunch({ url: '/index/index', }) @@ -290,29 +287,30 @@ Page({ type: "wgs84", success: function (res) { 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) { Http.post({ url: config.api.updateLBS,