| @@ -29,7 +29,8 @@ Page({ | |||||
| this.setData({ | this.setData({ | ||||
| couponChannelId: options.couponChannelId, | couponChannelId: options.couponChannelId, | ||||
| couponId: options.couponId, | couponId: options.couponId, | ||||
| orderGroupId: options.orderGroupId | |||||
| orderGroupId: options.orderGroupId, | |||||
| orderId:options.orderId | |||||
| }) | }) | ||||
| this.getDetail(options.couponChannelId); | this.getDetail(options.couponChannelId); | ||||
| this.getOneSpell(options.couponId) | this.getOneSpell(options.couponId) | ||||
| @@ -111,7 +112,7 @@ Page({ | |||||
| this.setData({ | this.setData({ | ||||
| canSpell: false | canSpell: false | ||||
| }) | }) | ||||
| this.orderFunc(0) | |||||
| this.orderFunc(this.data.orderGroupId) | |||||
| }, | }, | ||||
| //参与别人的拼团 | //参与别人的拼团 | ||||
| gotoPartner() { | gotoPartner() { | ||||
| @@ -55,7 +55,7 @@ | |||||
| <view class='real-price'>{{data.salePrice}}</view> | <view class='real-price'>{{data.salePrice}}</view> | ||||
| <view class='real-price-unit'>元</view> | <view class='real-price-unit'>元</view> | ||||
| </view> | </view> | ||||
| <view class='edit-right-bottom'>发起拼团</view> | |||||
| <view class='edit-right-bottom'>参加拼团</view> | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| @@ -90,14 +90,14 @@ Page({ | |||||
| }) | }) | ||||
| } else { | } else { | ||||
| that.setData({ | that.setData({ | ||||
| spellData:null, | |||||
| // spellData:null, | |||||
| clock: "00", | clock: "00", | ||||
| day: "00", | day: "00", | ||||
| hour: "00", | hour: "00", | ||||
| min: "00", | min: "00", | ||||
| sec: "00", | sec: "00", | ||||
| }) | }) | ||||
| that.getOneSpell(that.data.couponId) | |||||
| // that.getOneSpell(that.data.couponId) | |||||
| } | } | ||||
| setTimeout(function () { | setTimeout(function () { | ||||
| total_micro_second -= 1000; | total_micro_second -= 1000; | ||||
| @@ -117,7 +117,7 @@ Page({ | |||||
| //参与别人的拼团 | //参与别人的拼团 | ||||
| gotoPartner(){ | gotoPartner(){ | ||||
| wx.navigateTo({ | wx.navigateTo({ | ||||
| url: `/pages/spellDetail/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}` | |||||
| url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&couponChannelId=${this.data.couponChannelId}` | |||||
| }); | }); | ||||
| }, | }, | ||||
| /** | /** | ||||
| @@ -47,9 +47,11 @@ Page({ | |||||
| this.getList(1, "spellList") | this.getList(1, "spellList") | ||||
| }, | }, | ||||
| //跳转到我的拼团详情 | //跳转到我的拼团详情 | ||||
| gotoStatusDetail(){ | |||||
| gotoStatusDetail(e){ | |||||
| console.log(e,333) | |||||
| let data = e.currentTarget.dataset.data | |||||
| wx.navigateTo({ | wx.navigateTo({ | ||||
| url: '/pages/spellDetail/index', | |||||
| url: `/pages/spellDetail/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}`, | |||||
| }) | }) | ||||
| }, | }, | ||||
| //切换我的拼团 | //切换我的拼团 | ||||
| @@ -26,11 +26,11 @@ | |||||
| <view class='right-text'>剩余{{item.remainInventory}}</view> | <view class='right-text'>剩余{{item.remainInventory}}</view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <view class='sepll-list' wx:if='{{flag=="myspellList"}}' wx:for="{{lists}}" wx:key="{{index}}" data-couponId='{{item.couponId}}' data-id='{{item.id}}' data-='item' bindtap='gotoStatusDetail' style='position:relative;'> | |||||
| <view class='spell-left'> | |||||
| <view class='sepll-list' wx:if='{{flag=="myspellList"}}' wx:for="{{lists}}" wx:key="{{index}}" style='position:relative;'> | |||||
| <view class='spell-left' data-id='{{item.id}}' data-data='{{item}}' bindtap='gotoStatusDetail'> | |||||
| <image src='{{item.coverImg}}'></image> | <image src='{{item.coverImg}}'></image> | ||||
| </view> | </view> | ||||
| <view class='spell-center'> | |||||
| <view class='spell-center' data-id='{{item.id}}' data-data='{{item}}' bindtap='gotoStatusDetail'> | |||||
| <view class='tilte'>{{item.title}}</view> | <view class='tilte'>{{item.title}}</view> | ||||
| <view class='remark'>{{item.subTitle}}</view> | <view class='remark'>{{item.subTitle}}</view> | ||||
| <view class='price' style='margin-top:50rpx;'> | <view class='price' style='margin-top:50rpx;'> | ||||
| @@ -43,7 +43,7 @@ | |||||
| </view> | </view> | ||||
| <view class='spell-right' style='position:absolute;width:auto;bottom:30rpx;right:20rpx;'> | <view class='spell-right' style='position:absolute;width:auto;bottom:30rpx;right:20rpx;'> | ||||
| <!-- 继续邀请好友 --> | <!-- 继续邀请好友 --> | ||||
| <button class='share user-motto right-button' open-type="share" id="shareBtn" wx:if='{{item.status==10}}' data-status='{{item.status}}' style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</button> | |||||
| <button class='share user-motto right-button' open-type="share" id="shareBtn" wx:if='{{item.status==10}}' data-status='{{item.status}}' hover-class="other-button-hover" style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</button> | |||||
| <!-- 去使用 --> | <!-- 去使用 --> | ||||
| <view class='right-button' wx:if='{{item.status==11}}' data-status='{{item.status}}' bindtap='gotoEdit' style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</view> | <view class='right-button' wx:if='{{item.status==11}}' data-status='{{item.status}}' bindtap='gotoEdit' style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</view> | ||||
| <!-- 重新拼团 --> | <!-- 重新拼团 --> | ||||