diff --git a/ext.json b/ext.json index 83ee33e..4f5099c 100644 --- a/ext.json +++ b/ext.json @@ -1,16 +1,16 @@ { "extEnable": true, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wxea71200db93d756b", "ext": { - "weappId": "wx6a2524a8286d687f", - "name": "富茂链客生产版", - "appVersion": "C.4.1.1", + "weappId": "wxea71200db93d756b", + "name": "富茂客官开发", + "appVersion": "C.3.4.1", "attr": { "ifHaveCarModular": "1", "etcpversion": "release", - "configUrl": "https://c.malls.iformall.com/C/api", - "passCarAppId": "wxc07f9d67923d676d", - "passCarreturnUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" + "configUrl": "https://ciformall.youlane.cn/C/api", + "passCarAppId": "wx192b7d2e8dcbefd0", + "passCarreturnUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" } }, "permission": { diff --git a/pages/main/bargain/index.js b/pages/main/bargain/index.js index 8452255..0b9e8f5 100644 --- a/pages/main/bargain/index.js +++ b/pages/main/bargain/index.js @@ -53,21 +53,46 @@ Component({ }).then(res => { this.setData({ list: res.data.list, - total:res.data.total - }); - }) - .catch(err => { - console.log(err) - wx.showToast({ - title: err.errMsg, - icon: 'none', - duration: 2000, - mask: false + total: res.data.total }); }) + .catch(err => { + console.log(err) + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) }; if (app.globalData.token && app.globalData.token != null) { app.couponChannelListCallback(app.globalData.token); } + }, + getList1(){ + let that = this; + Http.get({ + url: config.api.couponChannelList, + data: { + pageNum: 1, + pageSize: 5, + targetAd: 6 + } + }).then(res => { + that.setData({ + list: res.data.list, + total: res.data.total + }); + }) + .catch(err => { + console.log(err) + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) } }); diff --git a/pages/main/index.js b/pages/main/index.js index bfffb08..63ec388 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -301,6 +301,9 @@ Page({ console.log(e.detail.val) console.log(e.detail.pageNum) }, + onBargain:function(e){ + console.log(e) + }, /** * 用户登录 */ @@ -512,6 +515,10 @@ Page({ that.selectComponent("#lists").getList(that.data.code, 1, "refresh"); wx.stopPullDownRefresh(); }; + // 砍价下拉刷新 + that.selectComponent("#bargain").getList1(); + console.log(that.selectComponent("#bargain")) + wx.stopPullDownRefresh(); }, //加载更多 onReachBottom: function() { diff --git a/pages/main/index.wxml b/pages/main/index.wxml index 39381e2..7fcee84 100644 --- a/pages/main/index.wxml +++ b/pages/main/index.wxml @@ -22,7 +22,7 @@ - + diff --git a/project.config.json b/project.config.json index e03f6ca..b11f49c 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.2.0", - "appid": "wx453ae0d37f3550d0", + "appid": "wxb11603577a84a86d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "condition": {