From 7c12c14ec688d9165a2b9a8105ead245056298fa Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 2 Apr 2019 13:39:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=A2=9E=E5=8A=A0=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3][=E5=A2=9E=E5=8A=A0]:[?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=93=E9=A2=98=E6=98=BE=E7=A4=BA=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 6 +++++- pages/main/index.js | 36 ++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) 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/main/index.js b/pages/main/index.js index f4f8f41..ee49677 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -459,24 +459,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; + // } + // }); + // } + // }, /** * 获取用户信息 */ From e66d97e9c4b1d32c3c0960f1fc0da9b8b8e788bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Tue, 2 Apr 2019 14:33:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=8F=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/game/index.json | 2 +- pages/spellGroup/spellGroup.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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: '拼团专场' }) From 3d84491382cee0d89d7df3e2c6345d44a6d7decf Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 2 Apr 2019 14:36:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=B8=93=E9=A2=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3][=E4=BF=AE=E6=94=B9]:[=E4=B8=93=E9=A2=98?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/main/index.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pages/main/index.js b/pages/main/index.js index ee49677..5a8c53e 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -320,6 +320,7 @@ Page({ // that.checkUserCarStatus(); that.getUserInfo(); that.getBannerlist(); + that.topicShow(); if (app.couponChannelListCallback) { app.couponChannelListCallback(app.globalData.token); } @@ -437,6 +438,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); + }) + }, /** * 检查用户是否有车