diff --git a/config/config.js b/config/config.js index 823a6f9..e91985d 100755 --- a/config/config.js +++ b/config/config.js @@ -251,7 +251,11 @@ var config = { /** * 查询是否已参团 */ - queryAttendStatus:'/orderGroup/queryAttendStatus' + queryAttendStatus:'/orderGroup/queryAttendStatus', + /** + * 专题 + */ + topicShow:"/topic/show" }, weapp: { AppId: weappId diff --git a/pages/game/index.json b/pages/game/index.json index bfbf839..0d6ac40 100644 --- a/pages/game/index.json +++ b/pages/game/index.json @@ -2,5 +2,5 @@ "usingComponents": { }, - "navigationBarTitleText": "富茂小游戏" + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/pages/main/index.js b/pages/main/index.js index 46da3d5..db7e1dd 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -346,6 +346,7 @@ Page({ // that.checkUserCarStatus(); that.getUserInfo(); that.getBannerlist(); + that.topicShow(); if (app.couponChannelListCallback) { app.couponChannelListCallback(app.globalData.token); } @@ -464,6 +465,21 @@ Page({ }) ; }, + // 专题显示 + topicShow: function () { + let that = this; + Http.get({ + url: config.api.topicShow, + data: { + token: app.globalData.token + } + }).then(res => { + console.log(res); + }) + .catch(err => { + console.log(err); + }) + }, /** * 检查用户是否有车 @@ -486,24 +502,24 @@ Page({ /** * car共同登录 */ - userCarLogin: function() { - var that = this; - if (!app.globalData.carLogin) { - // 共同登录 - Http.post({ - url: config.api.carInit, - data: { - phone: app.globalData.phone - } - }).then(res => { - app.globalData.carLogin = true; - app.globalData.parkVendor = res.data.vendor; - if (res.data.token != "undefined") { - app.globalData.etcpToken = res.data.token; - } - }); - } - }, + // userCarLogin: function() { + // var that = this; + // if (!app.globalData.carLogin) { + // // 共同登录 + // Http.post({ + // url: config.api.carInit, + // data: { + // phone: app.globalData.phone + // } + // }).then(res => { + // app.globalData.carLogin = true; + // app.globalData.parkVendor = res.data.vendor; + // if (res.data.token != "undefined") { + // app.globalData.etcpToken = res.data.token; + // } + // }); + // } + // }, /** * 获取用户信息 */ diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index f33d618..69c03bb 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -50,7 +50,7 @@ Page({ }, onShow(){ let that=this; - if (this.data.reloadIf!=null){ + if (this.data.reloadIf){ wx.setNavigationBarTitle({ title: '拼团专场' })