浏览代码

[集团版兼容普通版修改]

dev
海洋之声 5 年前
父节点
当前提交
55ee13fe39
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. +2
    -2
      components/navbar/navbar.js
  2. +1
    -1
      ext.json
  3. +2
    -2
      index/index.js

+ 2
- 2
components/navbar/navbar.js 查看文件

@@ -31,8 +31,8 @@ Component({
}, },


data: { data: {
showGroupIf: JSON.parse(wx.getStorageSync('tenantData')).length>0?true:false,
tenantData: JSON.parse(wx.getStorageSync('tenantData')),
showGroupIf: wx.getStorageSync('tenantData')&&JSON.parse(wx.getStorageSync('tenantData')).length>0?true:false,
tenantData: wx.getStorageSync('tenantData')&&JSON.parse(wx.getStorageSync('tenantData')),
tenantId: wx.getStorageSync('tenantId'), tenantId: wx.getStorageSync('tenantId'),
array: [], array: [],
index: 1, index: 1,


+ 1
- 1
ext.json 查看文件

@@ -15,7 +15,7 @@
"orgUrl": "https://wx.qlogo.cn" "orgUrl": "https://wx.qlogo.cn"
} }
], ],
"configUrl": "http://10.11.153.205:7000/C/api",
"configUrl": "https://ciformall.youlane.cn/C/api",
"etcpAppId": "wx192b7d2e8dcbefd0", "etcpAppId": "wx192b7d2e8dcbefd0",
"socketUrl": "wss://mp.youlane.cn/W/ws", "socketUrl": "wss://mp.youlane.cn/W/ws",
"ifStoreApp": "0", "ifStoreApp": "0",


+ 2
- 2
index/index.js 查看文件

@@ -286,7 +286,7 @@ Page({
wx.getLocation({ wx.getLocation({
type: "wgs84", type: "wgs84",
success: function (res) { success: function (res) {
console.log(res, 9999)
console.log(res, wx.getStorageSync('tenantData'), 9999)
let minNum = 0; let minNum = 0;
let minIndex = 0; let minIndex = 0;
JSON.parse(wx.getStorageSync('tenantData')).map((item, index) => { JSON.parse(wx.getStorageSync('tenantData')).map((item, index) => {
@@ -294,7 +294,7 @@ Page({
minIndex = (index == 0 || lang < minNum) ? index : minIndex; minIndex = (index == 0 || lang < minNum) ? index : minIndex;
minNum = (index == 0 || lang < minNum) ? lang : minNum; minNum = (index == 0 || lang < minNum) ? lang : minNum;
}) })
if (JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId != wx.getStorageSync('tenantId') && wx.getStorageSync('firstEnter')){
if (JSON.parse(wx.getStorageSync('tenantData')).length>0&&JSON.parse(wx.getStorageSync('tenantData'))[minIndex].tenantId != wx.getStorageSync('tenantId') && wx.getStorageSync('firstEnter')){
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: '系统检测到您离' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name + '较近,要切换至' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name+'吗?', content: '系统检测到您离' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name + '较近,要切换至' + JSON.parse(wx.getStorageSync('tenantData'))[minIndex].name+'吗?',


正在加载...
取消
保存