diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 1bbc75b..e2681ff 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -13,7 +13,6 @@ Page({ }, onLoad: function(options) { var that = this; - console.log(options) if (options.couponChannelId && !options.cuserId||options.orderId) { that.setData({ couponChannelId: options.couponChannelId, @@ -23,8 +22,6 @@ Page({ that.setData({ optionData: wx.getStorageSync('options') ? JSON.parse(wx.getStorageSync('options')):null }) - console.log(that.data.optionData) - if (options&&options.path == 'index') { that.setData({ path: options.path diff --git a/pages/index/detail/index.js b/pages/index/detail/index.js index 62ea761..bcaf9d4 100644 --- a/pages/index/detail/index.js +++ b/pages/index/detail/index.js @@ -21,25 +21,12 @@ Page({ */ onLoad: function (options) { let that=this; - this.setData({ - id: options.id - }); - that.getList(options.id); - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow: function () { - let that = this; - + if (options && options.id){ + this.setData({ + id: options.id + }); + that.getList(options.id); + } }, /** * 拨打电话 diff --git a/pages/index/index.js b/pages/index/index.js index ae11113..18347ef 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -41,7 +41,6 @@ Page({ options.couponChannelId = this.data.newArr[1]; options.path = 'daping' } - //// 大屏-二维码-end else if (this.data.newArr[0] == 't') { // 普通二维码 options.type = this.data.newArr[1]; @@ -82,22 +81,18 @@ Page({ data: {} }) .then(res => { - /** - * 参与拼团 - */ + //参与拼团 if (options && options.orderGroupId) { wx.redirectTo({ url: `/pages/joinFrDpell/index?couponId=${options.couponId}&orderGroupId=${options.orderGroupId}&couponChannelId=${options.couponChannelId}&orderId=${options.orderId}&avatarUrl=${options.avatarUrl}&nickName=${options.nickName}` }) return; } - /** - * 来自大屏的跳转拼团券详情 - */ - if (options && options.couponChannelId && options.path == 'daping') { + //来自大屏的跳转拼团券详情 + else if (options && options.couponChannelId && options.path == 'daping') { /** - * 主要是为了拿couponId - */ + * 主要是为了拿couponId + */ Http.get({ url: config.api.couponDetail, data: { @@ -111,26 +106,30 @@ Page({ }); return; } - if (options && options.couponChannelId && app.globalData.type == 'cd') { - // 跳转普通券/消费卡/限时秒杀/砍价详情 + // 跳转普通券/消费卡/限时秒杀/砍价详情 + else if (options && options.couponChannelId) { wx.redirectTo({ url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, }) - } else if (options && options.couponChannelId && options.cuserId) { - // 转赠判断 + } + // 转赠判断 + else if (options && options.couponChannelId && options.cuserId) { wx.redirectTo({ url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, }) - } else if (options && options.couponChannelId && app.globalData.type == 'sd') { - // 拼团详情页 + } + // 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口) + else if (options && options.couponChannelId && app.globalData.type == 'sd') { wx.redirectTo({ url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`, }) - } else if (options && options.id && app.globalData.type == 'gm') { - // 游戏页面 + } + // 游戏页面 + else if (options && options.id && app.globalData.type == 'gm') { that.getGameOne(app.globalData.token, options.id) - } else if (options && options.bt && options.id && app.globalData.type == 'bd') { - // 宣传页详情 + } + // 宣传页详情 + else if (options && options.bt && options.id && app.globalData.type == 'bd') { if (options.bt == '2') { // 自由图文 wx.redirectTo({ @@ -142,77 +141,104 @@ Page({ url: `/pages/bannerdetail/index?id=${options.id}`, }) } - } else if (options && options.id && app.globalData.type == 'td'){ + } + // 专题 + else if (options && options.id && app.globalData.type == 'td'){ wx.redirectTo({ url: `/pages/topicDetail/index?id=${options.id}` }); } - else if (options && options.orderId && app.globalData.type == 'bg') { - // 参与砍价 + // 参与砍价 + else if (options && options.orderId) { wx.redirectTo({ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`, }) - } else if (app.globalData.type == 'uc') { - // 我的 + } + // 我的 + else if (app.globalData.type == 'uc') { wx.switchTab({ url: '/pages/user/index' }); - } else if (app.globalData.type == 'pc') { + } + // 停车 + else if (app.globalData.type == 'pc') { // 停车 wx.switchTab({ url: '/pages/passCar/passCar' }); - } else if (app.globalData.type == 'mc') { + } + // 我的券包 + else if (app.globalData.type == 'mc') { // 我的券包 wx.redirectTo({ url: '/pages/couponorder/index/index' }); - } else if (app.globalData.type == 'mo') { + } + // 我的订单 + else if (app.globalData.type == 'mo') { // 我的订单 wx.redirectTo({ url: '/pages/order/index/index?id=all' }); - } else if (app.globalData.type == 'ca') { + } + // 我的卡包 + else if (app.globalData.type == 'ca') { // 我的卡包 wx.redirectTo({ url: '/pages/cardorder/index/index' }); - } else if (app.globalData.type == 'sc') { + } + // 特享礼遇 + else if (app.globalData.type == 'sc') { // 特享礼遇 wx.redirectTo({ url: '/pages/specialcourtesy/specialcourtesy' }); - } else if (app.globalData.type == 'rb') { + } + // 限时秒杀 + else if (app.globalData.type == 'rb') { // 限时秒杀 wx.redirectTo({ url: '/pages/rushToBuy/index' }); - } else if (app.globalData.type == 'bl') { + } + // 砍价专场 + else if (app.globalData.type == 'bl') { // 砍价专场 wx.redirectTo({ url: '/pages/bargain/bargain' }); - } else if (app.globalData.type == 'mb') { + } + // 我的砍价 + else if (app.globalData.type == 'mb') { // 我的砍价 wx.redirectTo({ url: '/pages/bargain/bargain?from=myhtml' }); - } else if (app.globalData.type == 'sl') { + } + // 拼团专场 + else if (app.globalData.type == 'sl') { // 拼团专场 wx.redirectTo({ url: '/pages/spellGroup/spellGroup' }); - } else if (app.globalData.type == 'ms') { + } + // 我的拼团 + else if (app.globalData.type == 'ms') { // 我的拼团 wx.redirectTo({ url: '/pages/spellGroup/spellGroup?from=myhtml' }); - } else if (app.globalData.type == 'dc') { + } + // 消费卡 + else if (app.globalData.type == 'dc') { // 消费卡 wx.redirectTo({ url: '/pages/discountCardList/discountCardList' }); - } else if (app.globalData.type == 'ml') { + } + // 门店 + else if (app.globalData.type == 'ml') { // 门店 wx.switchTab({ url: '/pages/index/searchbar/index' diff --git a/pages/index/merchantList/index.wxml b/pages/index/merchantList/index.wxml index 67ad2f2..244af9f 100644 --- a/pages/index/merchantList/index.wxml +++ b/pages/index/merchantList/index.wxml @@ -1,12 +1,12 @@ - - - - - - - {{data.merchantName}} - {{item.shopNumber}}, {{item.buildingName}} {{item.floorName}} - - - + + + + + + + {{data.merchantName}} + {{item.shopNumber}}, {{item.buildingName}} {{item.floorName}} + + + \ No newline at end of file diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 399d40a..50aaaf8 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -21,17 +21,13 @@ Page({ actUrl: imgurl.act.url, loading: true, content: '数据正在加载中', - reloadIf: false + reloadIf: false, + creditAmount: 0 }, onLoad: function (options) { let that = this; - console.log(options) - if (options &&options.credit){ - that.setData({ - credit: options.credit - }) - } var todayDate = new Date().getTime(); + that.getPoints(); that.setData({ optionsData: options, todayDate: todayDate @@ -58,6 +54,31 @@ Page({ }) } }, + // 获得积分,渲染页面 + getPoints(){ + let that = this; + Http.get({ + url: config.api.integralList, + data: { + pageNum: 1, + pageSize: 1, + } + }).then(res => { + wx.stopPullDownRefresh(); + that.setData({ + creditAmount: res.data.list[0].creditAmount + }); + }) + .catch(err => { + wx.stopPullDownRefresh(); + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) + }, gotojifen(){ wx.navigateTo({ url: '/pages/integralmall/integraHistory/index', @@ -168,5 +189,6 @@ Page({ onPullDownRefresh: function (e) { let that = this; that.getList(1); + that.getPoints(); } }) \ No newline at end of file diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index 8304e3c..ee06c5f 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -2,7 +2,7 @@ 我的积分 - {{credit}} + {{creditAmount}} diff --git a/pages/main/index.js b/pages/main/index.js index 935b38d..542d986 100644 --- a/pages/main/index.js +++ b/pages/main/index.js @@ -111,9 +111,8 @@ Page({ }, //跳往积分商城 gotouser:function(){ - let credit = this.data.credit; wx.navigateTo({ - url: `/pages/integralmall/index?credit=${credit}` + url: `/pages/integralmall/index` }) }, //跳往砍价专场 diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js index c1348a5..fcaab61 100644 --- a/pages/spellDetail/index.js +++ b/pages/spellDetail/index.js @@ -214,13 +214,6 @@ Page({ }) }); }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - /** * 生命周期函数--监听页面显示 */ @@ -258,13 +251,6 @@ Page({ this.getDetail(this.data.paramData); this.checkUser(this.data.paramData) }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - }, /** * 用户点击右上角分享 */ diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 24c6e0f..ef81906 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -451,13 +451,6 @@ Page({ }) }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - /** * 生命周期函数--监听页面显示 */ @@ -498,11 +491,4 @@ Page({ that.getDetail(that.data.couponChannelId); that.getOneSpell(that.data.couponId) }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - } }) \ No newline at end of file diff --git a/pages/spellGroup/paySpellGroup/index.js b/pages/spellGroup/paySpellGroup/index.js index d3a2338..6ae2245 100644 --- a/pages/spellGroup/paySpellGroup/index.js +++ b/pages/spellGroup/paySpellGroup/index.js @@ -244,13 +244,6 @@ Page({ }); }); }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady: function () { - - }, - /** * 生命周期函数--监听页面显示 */ @@ -284,11 +277,4 @@ Page({ onPullDownRefresh: function () { this.getDetail(this.data.paramData); }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom: function () { - - } }) \ No newline at end of file