Commit 5e304a63b1ad3c99d27166f74d4f6bd03b0549bb
1 parent
8ca3a9e8
促销栏点击礼包
Showing
5 changed files
with
7 additions
and
6 deletions
packageA/pages/myGiftDetails/myGiftDetails.js
| @@ -34,7 +34,7 @@ Page({ | @@ -34,7 +34,7 @@ Page({ | ||
| 34 | options: options, | 34 | options: options, |
| 35 | id: options.id, | 35 | id: options.id, |
| 36 | index: options.index, | 36 | index: options.index, |
| 37 | - showBtn, | 37 | + showBtn: showBtn, |
| 38 | }) | 38 | }) |
| 39 | 39 | ||
| 40 | // console.log('options', options); | 40 | // console.log('options', options); |
packageA/pages/myGiftDetails/myGiftDetails.wxml
| @@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
| 122 | 122 | ||
| 123 | <view style="height: 20rpx"></view> | 123 | <view style="height: 20rpx"></view> |
| 124 | <!-- 按钮 --> | 124 | <!-- 按钮 --> |
| 125 | - <view class="btn-container" wx:if="{{details.lbtype==1}}"> | 125 | + <view class="btn-container" wx:if="{{details.lbtype==1 && showBtn}}"> |
| 126 | <block wx:if="{{index == 0}}"> | 126 | <block wx:if="{{index == 0}}"> |
| 127 | <block wx:if="{{is_not_start}}"> | 127 | <block wx:if="{{is_not_start}}"> |
| 128 | <view class="btn gray">活动还未开始</view> | 128 | <view class="btn gray">活动还未开始</view> |
pages/giftpack/giftpacklist/giftpacklist.js
| @@ -413,12 +413,13 @@ Page({ | @@ -413,12 +413,13 @@ Page({ | ||
| 413 | if (pagePath.indexOf('/') != 0) { | 413 | if (pagePath.indexOf('/') != 0) { |
| 414 | pagePath = '/' + pagePath; | 414 | pagePath = '/' + pagePath; |
| 415 | } | 415 | } |
| 416 | - pagePath += "?isBuy=1" + "&lbId=" + this.data.lbId + "&first_leader="+ this.data.getUserID; | 416 | + pagePath += "?isBuy=1" + "&lbId=" + this.data.getGiftID + "&first_leader="+ this.data.getUserID; |
| 417 | // if (this.data.isBuy == 0) { | 417 | // if (this.data.isBuy == 0) { |
| 418 | // pagePath += "&orderSn=" + this.data.orderSn; | 418 | // pagePath += "&orderSn=" + this.data.orderSn; |
| 419 | // } else { | 419 | // } else { |
| 420 | // pagePath += "&lbId=" + this.data.getGiftID; | 420 | // pagePath += "&lbId=" + this.data.getGiftID; |
| 421 | // } | 421 | // } |
| 422 | + // console.log('pagePath', pagePath); | ||
| 422 | return { | 423 | return { |
| 423 | title: "礼包详情", | 424 | title: "礼包详情", |
| 424 | path: pagePath, | 425 | path: pagePath, |
pages/goods/goodsInfo/goodsInfo.js
| @@ -6071,10 +6071,10 @@ Page({ | @@ -6071,10 +6071,10 @@ Page({ | ||
| 6071 | }, | 6071 | }, |
| 6072 | 6072 | ||
| 6073 | // 促销 -> 送礼包 -> 查看详情 | 6073 | // 促销 -> 送礼包 -> 查看详情 |
| 6074 | - viewGiftDetails(e) { | 6074 | + viewLbDetails(e) { |
| 6075 | let id = e.currentTarget.dataset.id; // 获取礼包id | 6075 | let id = e.currentTarget.dataset.id; // 获取礼包id |
| 6076 | let url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮 | 6076 | let url = `/packageA/pages/myGiftDetails/myGiftDetails?btn=0&index=0&id=${id}`; // btn=0 控制跳转到的页面不显示按钮 |
| 6077 | - console.log('myurl', url); | 6077 | + // console.log('myurl', url); |
| 6078 | getApp().goto(url); | 6078 | getApp().goto(url); |
| 6079 | } | 6079 | } |
| 6080 | 6080 |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -609,7 +609,7 @@ | @@ -609,7 +609,7 @@ | ||
| 609 | <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text> | 609 | <text class="tick lh2 pdr20" wx:if="{{item.intValue>0}}">送{{item.intValue}}积分</text> |
| 610 | <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view> | 610 | <view class="tick lh2 pdr20" wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券</view> |
| 611 | <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}}</view> | 611 | <view class="tick ellipsis-1x lh2" wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}}</view> |
| 612 | - <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewGiftDetails">送{{item.lbtitle}}</view> | 612 | + <view class="tick ellipsis-1x lh2 details pdr40" wx:if="{{item.lb_id>0}}" data-id="{{item.lb_id}}" bindtap="viewLbDetails">送{{item.lbtitle}}</view> |
| 613 | </view> | 613 | </view> |
| 614 | </view> | 614 | </view> |
| 615 | </block> | 615 | </block> |