@@ -4,7 +4,7 @@ | |||||
"ext": { | "ext": { | ||||
"weappId": "wxea71200db93d756b", | "weappId": "wxea71200db93d756b", | ||||
"name": "富茂客官开发", | "name": "富茂客官开发", | ||||
"appVersion": "C.4.1.8", | |||||
"appVersion": "C.5.1.106", | |||||
"attr": { | "attr": { | ||||
"configUrl": "https://ciformall.youlane.cn/C/api", | "configUrl": "https://ciformall.youlane.cn/C/api", | ||||
"socketUrl": "wss://mp.youlane.cn/W/ws", | "socketUrl": "wss://mp.youlane.cn/W/ws", | ||||
@@ -34,6 +34,7 @@ Page({ | |||||
that.setData({ | that.setData({ | ||||
couponChannelId: options.couponChannelId, | couponChannelId: options.couponChannelId, | ||||
cuserId: options.cuserId, | cuserId: options.cuserId, | ||||
updateDate: options.updateDate, | |||||
coverImg: options.coverImg, | coverImg: options.coverImg, | ||||
userName: options.userName, | userName: options.userName, | ||||
avatarUrl: options.avatarUrl, | avatarUrl: options.avatarUrl, | ||||
@@ -88,7 +89,7 @@ Page({ | |||||
}); | }); | ||||
} else { | } 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({ | wx.navigateTo({ | ||||
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` | url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` | ||||
@@ -106,17 +106,19 @@ Page({ | |||||
}); | }); | ||||
return; | return; | ||||
} | } | ||||
// 跳转普通券/消费卡/限时秒杀/砍价详情 | |||||
else if (options && options.couponChannelId) { | 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') { | else if (options && options.couponChannelId && app.globalData.type == 'sd') { | ||||
@@ -122,6 +122,7 @@ | |||||
color: #333; | color: #333; | ||||
letter-spacing: 0; | letter-spacing: 0; | ||||
height: 40rpx; | height: 40rpx; | ||||
margin-top: 10rpx; | |||||
line-height: 40rpx; | line-height: 40rpx; | ||||
} | } | ||||
@@ -37,6 +37,7 @@ | |||||
.index-scroll-view { | .index-scroll-view { | ||||
width: 100%; | width: 100%; | ||||
white-space: nowrap; | white-space: nowrap; | ||||
height: 300rpx; | |||||
} | } | ||||
.index-scroll-view .commodity { | .index-scroll-view .commodity { | ||||
display: inline-block; | display: inline-block; | ||||