diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index fccec60..85bd614 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -70,6 +70,9 @@ Page({ * 跳转到门店列表的详情页面 */ gotoDetail(e) { + if (e.currentTarget.dataset.id == undefined) { + return + } wx.navigateTo({ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` }) @@ -128,9 +131,12 @@ Page({ }, onLoad(options) { let that = this; - console.log(options.cardId) - that.cardpayList(options.cardId); - that.cardDetail(options.cardId); + + if (options.cardId){ + that.cardpayList(options.cardId); + that.cardDetail(options.cardId); + } + if (options.from){ this.setData({ showIndexReuturn:true diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index de2e053..7bf63a5 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -117,9 +117,11 @@ Page({ }, // 跳转到详情 gotoConsumeDetail: function(e) { - wx.navigateTo({ - url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, - }) + if (e.currentTarget.dataset.id){ + wx.navigateTo({ + url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, + }) + } }, //点击跳转到券详情页面 gotouse: function(e) { @@ -128,10 +130,12 @@ Page({ } else { var mystatus = this.data.mystatus; } - wx.navigateTo({ - url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` - }); + if (e.currentTarget.dataset.quancode) { + wx.navigateTo({ + url: `/pages/couponorder/detail/index?quancode=${ + e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` + }); + } }, gotoBuy: function() { wx.navigateTo({ diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index f8eb123..083cec2 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -36,6 +36,10 @@ Page({ frommd: options.frommd }) } + // that.setData({ + // optionData: null + // }) + console.log(wx.getStorageSync('options'),6666) that.setData({ optionData: wx.getStorageSync('options') ? JSON.parse(wx.getStorageSync('options')):null }) diff --git a/pages/index/index.js b/pages/index/index.js index 012c41c..43f1174 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -173,7 +173,7 @@ Page({ } } // 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口) - else if (options && options.couponChannelId && app.globalData.type == 'sd' || options && options.couponChannelId && options.spellGroup) { + else if ((options && options.couponChannelId && app.globalData.type == 'sd') || (options && options.couponChannelId && options.spellGroup) ){ wx.redirectTo({ url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`, }) diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 2076456..2b0f006 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -181,11 +181,6 @@ Page({ /** * 获取多商铺列表 */ - // shopList: function(e) { - // wx.navigateTo({ - // url: `/pages/index/merchantList/index?id=${e.currentTarget.dataset.id}` - // }) - // }, onShareAppMessage: function(res) { let that = this; let shareObj = { diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 124e625..e565800 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -13,7 +13,7 @@ Page({ erweima: imgurl.erweima.url, bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, - nodata: imgurl.nodata.url, + nodata: imgurl.noCoupon.url, wmhome: imgurl.wmhome.url, barcode: imgurl.barcode.url, list: [], diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index eef0f33..bb9db83 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -8,16 +8,18 @@ - - - - {{levelName}} + + + + + {{levelName}} + + 还需{{upgradeScore}}成长值升级 - 还需{{upgradeScore}}成长值升级 diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss index fd6f9ca..7378149 100644 --- a/pages/integralmall/index.wxss +++ b/pages/integralmall/index.wxss @@ -62,15 +62,19 @@ .myName{ float: left; font-size: 32rpx; - height: 100%; - width:35%; margin-top:36rpx; } +.bot{ + display: flex; + flex-direction: column; +} .view{ + height: 40rpx; display: block; - margin: 60rpx 0 0 20rpx; } progress{ + margin: 14rpx 8rpx 0 20rpx; + float: left; width:230rpx; border-radius:60rpx; overflow:hidden; @@ -81,7 +85,6 @@ progress{ font-family:PingFangSC-Regular; font-weight:400; color:rgba(255,255,255,1); - margin-top: 84rpx; } .btoml{ float: left; diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 39eb742..37ca9ea 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -75,6 +75,9 @@ Page({ // }, getList(key, pageNum) { let that = this; + if (key == undefined) { + key = 'all' + } /** * key==0 * 不发送该字段 diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index fabc580..28a2de4 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -55,7 +55,7 @@ Page({ onLoad: function(options) { this.setData({ couponChannelId: options.couponChannelId, - couponId: options.couponId + couponId: options.couponId ? options.couponId:'' }) if (options && options.couponChannelId) { this.getDetail(options.couponChannelId); @@ -63,6 +63,7 @@ Page({ if (options && options.couponId) { this.getOneSpell(options.couponId) } + console.log(this.data.couponId) this.getUserInfo(); }, /** @@ -607,14 +608,12 @@ Page({ * */ wx.redirectTo({ - url: "/pages/getphoneInfo/index?path=spell&couponChannelId=" + - that.data.couponChannelId + '&couponId=' + that.data.couponId + url: `/pages/getphoneInfo/index?path=spell&couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}` }); } else if (err.code == 11006) { // 用户手机已加密 wx.redirectTo({ - url: "/pages/phoneinput/phoneinput?path=spell&couponChannelId=" + - that.data.couponChannelId + '&couponId=' + that.data.couponId + url: `/pages/phoneinput/phoneinput?path=spell&couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}` }); } else { wx.showToast({ @@ -739,6 +738,7 @@ Page({ */ onPullDownRefresh: function(e) { let that = this; + console.log(this.data.couponId,222) that.getDetail(that.data.couponChannelId); if (that.data.couponId) { that.getOneSpell(that.data.couponId) @@ -749,7 +749,7 @@ Page({ var that = this; var shareObj = { title: that.data.data.title, - path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}&spellGroup=spellGroup`, + path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}&spellGroup=spellGroup`, success: function (res) { if (res.errMsg == 'shareAppMessage:ok') { } }, @@ -760,7 +760,7 @@ Page({ // 来自页面内的按钮的转发 if (options.from == 'button') { var eData = options.target.dataset.id; - shareObj.path = `/pages/index/index?couponChannelId=${eData}&spellGroup=spellGroup&frommd=JC`; + shareObj.path = `/pages/index/index?couponChannelId=${eData}&couponId=${that.data.data.couponId}&spellGroup=spellGroup&frommd=JC`; } // 返回shareObj return shareObj; diff --git a/pages/spellGroup/paySpellGroup/index.js b/pages/spellGroup/paySpellGroup/index.js index 7957268..8ecbbc2 100644 --- a/pages/spellGroup/paySpellGroup/index.js +++ b/pages/spellGroup/paySpellGroup/index.js @@ -109,7 +109,7 @@ Page({ */ payOrderUpdate: (orderId, payOrderId, status, reason, _this, orderGroupId) => { console.log(orderGroupId,7777) - let that = this; + let that = _this; // 支付成功 Http.post({ url: config.api.payOrderUpdate,