diff --git a/app.js b/app.js index 32e888b..e6d3d3e 100644 --- a/app.js +++ b/app.js @@ -39,7 +39,7 @@ App({ // 获取前端配置文件 commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest169? true : false; + data.isTest = data.isTest170? true : false; data.indexSeason = null this.globalData.configJson = data }).then(() => { diff --git a/pages/index/index.js b/pages/index/index.js index 448c557..0452928 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1536,27 +1536,37 @@ Page({ }, // Ai避高峰 gotoUrls() { - // 判断是否登录 - var token = wx.getStorageSync("jstrip_token"), - userId = wx.getStorageSync("jstrip_userid"); - if (!token || !userId) { - let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html' - - app.globalData.weburl = url; - wx.navigateTo({ - url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), - }) - } else { - commonApi.user_post("uservice/user/userEncry").then(res => { - if (res.code == 1) { - let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data - - app.globalData.weburl = url; - wx.navigateTo({ - url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), - }) - } - }) - } + // 强制登录 + commonApi.user_post("uservice/user/userEncry").then(res => { + if (res.code == 1) { + let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data + + app.globalData.weburl = url; + wx.navigateTo({ + url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + }) + } + }) + // var token = wx.getStorageSync("jstrip_token"), + // userId = wx.getStorageSync("jstrip_userid"); + // if (!token || !userId) { + // let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html' + + // app.globalData.weburl = url; + // wx.navigateTo({ + // url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + // }) + // } else { + // commonApi.user_post("uservice/user/userEncry").then(res => { + // if (res.code == 1) { + // let url = 'https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=' + res.data + + // app.globalData.weburl = url; + // wx.navigateTo({ + // url: '/pages/pbService/web/index?weburl=' + encodeURIComponent(url), + // }) + // } + // }) + // } }, }) \ No newline at end of file