diff --git a/ext.json b/ext.json index 8e88d54..afcaf1b 100644 --- a/ext.json +++ b/ext.json @@ -4,7 +4,7 @@ "ext": { "weappId": "wxea71200db93d756b", "name": "富茂客官开发", - "appVersion": "C.4.1.8", + "appVersion": "C.5.1.106", "attr": { "configUrl": "https://ciformall.youlane.cn/C/api", "socketUrl": "wss://mp.youlane.cn/W/ws", diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 8bd2ba5..64431f6 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -34,6 +34,7 @@ Page({ that.setData({ couponChannelId: options.couponChannelId, cuserId: options.cuserId, + updateDate: options.updateDate, coverImg: options.coverImg, userName: options.userName, avatarUrl: options.avatarUrl, @@ -88,7 +89,7 @@ Page({ }); } else { //返回主页 - if (that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { + if (that.data.couponChannelId && !that.data.cuserId||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { // 跳转普通券/消费卡/限时秒杀/砍价详情 wx.navigateTo({ url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` diff --git a/pages/index/index.js b/pages/index/index.js index d24966e..2fa9446 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -106,17 +106,19 @@ Page({ }); return; } - // 跳转普通券/消费卡/限时秒杀/砍价详情 + else if (options && options.couponChannelId) { - wx.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, - }) - } - // 转赠判断 - 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}`, - }) + // 转赠判断 + if (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{ + // 跳转普通券/消费卡/限时秒杀/砍价详情 + wx.redirectTo({ + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, + }) + } } // 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口) else if (options && options.couponChannelId && app.globalData.type == 'sd') { diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss index 24b014a..6a860d1 100644 --- a/pages/index/searchbar/index.wxss +++ b/pages/index/searchbar/index.wxss @@ -122,6 +122,7 @@ color: #333; letter-spacing: 0; height: 40rpx; + margin-top: 10rpx; line-height: 40rpx; } diff --git a/pages/main/bargain/index.wxss b/pages/main/bargain/index.wxss index 5a7f331..74b633f 100644 --- a/pages/main/bargain/index.wxss +++ b/pages/main/bargain/index.wxss @@ -37,6 +37,7 @@ .index-scroll-view { width: 100%; white-space: nowrap; + height: 300rpx; } .index-scroll-view .commodity { display: inline-block;