diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index b22df07..625ff2e 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -283,56 +283,56 @@ Page({ if (err.code == 2011) { wx.showToast({ title: "商户信息没找到", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 2013) { wx.showToast({ title: "商户信息禁用", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 3000) { wx.showToast({ title: "库存不足", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 3001) { wx.showToast({ title: "超过限购条件", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 3002) { wx.showToast({ title: "订单失败", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 3003) { wx.showToast({ title: "订单不存在", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 3004) { wx.showToast({ title: "订单不存在", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); } else if (err.code == 4003) { wx.showToast({ title: "卡券已作废", - image: './../../../assets/images/fail.png', + image: './../../assets/images/fail.png', duration: 2000, mask: false }); diff --git a/pages/joinFrDpell/index.wxss b/pages/joinFrDpell/index.wxss index a0a9fe6..6448dde 100644 --- a/pages/joinFrDpell/index.wxss +++ b/pages/joinFrDpell/index.wxss @@ -25,8 +25,7 @@ padding: 0 30rpx; } .title{ - position: absolute; - top: 503rpx; + position: relative; background-color: #fff; z-index: 100; width: 750rpx; @@ -34,6 +33,7 @@ padding-left: 30rpx; line-height: 50rpx; border-radius:20rpx 20rpx 0px 0px; + margin-top: -25rpx; opacity: 1; font-size:32rpx; font-family:PingFang-SC-Bold; @@ -42,12 +42,11 @@ box-sizing: border-box; } .remark{ - margin-top: 48rpx; font-size:24rpx; font-family:PingFang-SC-Medium; font-weight:500; color:rgba(134,134,134,1); - margin-bottom: 12rpx; + line-height: 48rpx; } .des{ width: 100%; diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 66f93c3..938d085 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -204,7 +204,7 @@ Page({ }) .then(res => { wx.hideLoading() - if (!orderGroupId){ + if (orderGroupId==undefined){ wx.navigateTo({ url: '/pages/order/detail/index?orderId='+res.data.id, }) diff --git a/pages/spellGroup/mySpellGroup/index.wxss b/pages/spellGroup/mySpellGroup/index.wxss index 28b654b..fdcaad4 100644 --- a/pages/spellGroup/mySpellGroup/index.wxss +++ b/pages/spellGroup/mySpellGroup/index.wxss @@ -25,8 +25,7 @@ padding: 0 30rpx; } .title{ - position: absolute; - top: 503rpx; + position: relative; background-color: #fff; z-index: 100; width: 750rpx; @@ -34,6 +33,7 @@ padding-left: 30rpx; line-height: 50rpx; border-radius:20rpx 20rpx 0px 0px; + margin-top: -25rpx; opacity: 1; font-size:32rpx; font-family:PingFang-SC-Bold; @@ -42,12 +42,11 @@ box-sizing: border-box; } .remark{ - margin-top: 48rpx; font-size:24rpx; font-family:PingFang-SC-Medium; font-weight:500; color:rgba(134,134,134,1); - margin-bottom: 12rpx; + line-height: 48rpx; } .des{ width: 100%;