@@ -149,7 +149,7 @@ Page({ | |||||
}, | }, | ||||
//参与别人的拼团 | //参与别人的拼团 | ||||
gotoPartner() { | gotoPartner() { | ||||
wx.navigateTo({ | |||||
wx.reLaunch({ | |||||
url: `/pages/spellDetail/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}` | url: `/pages/spellDetail/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}` | ||||
}); | }); | ||||
}, | }, | ||||
@@ -211,7 +211,7 @@ Page({ | |||||
} | } | ||||
}) | }) | ||||
.then(res => { | .then(res => { | ||||
wx.navigateTo({ | |||||
wx.reLaunch({ | |||||
url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}` | url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.data.couponId}&orderGroupId=${res.data.orderGroupId}` | ||||
}); | }); | ||||
}) | }) | ||||
@@ -238,7 +238,7 @@ Page({ | |||||
.then(res => { | .then(res => { | ||||
wx.hideLoading() | wx.hideLoading() | ||||
if (orderGroupId==undefined) { | if (orderGroupId==undefined) { | ||||
wx.navigateTo({ | |||||
wx.reLaunch({ | |||||
url: '/pages/order/detail/index?orderId=' + res.data.id, | url: '/pages/order/detail/index?orderId=' + res.data.id, | ||||
}) | }) | ||||
} else { | } else { | ||||
@@ -24,7 +24,7 @@ | |||||
<image src='{{avatarUrl}}'></image> | <image src='{{avatarUrl}}'></image> | ||||
</view> | </view> | ||||
<view class='status04 st join-c' style='width:auto;'> | <view class='status04 st join-c' style='width:auto;'> | ||||
<view class='j-f'>您的好友 {{nickName}} 邀请您参加拼团</view> | |||||
<view class='j-f'>您正在参加 {{nickName}} 的拼团</view> | |||||
<view class='j-t'>剩余时间:<view class='j-time'>{{hour+' : '+min+' : '+sec}}</view></view> | <view class='j-t'>剩余时间:<view class='j-time'>{{hour+' : '+min+' : '+sec}}</view></view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
@@ -35,6 +35,8 @@ | |||||
<view class='p-time' wx:if='{{data.status==10}}'>{{min}}</view> | <view class='p-time' wx:if='{{data.status==10}}'>{{min}}</view> | ||||
<view class='p-mao' wx:if='{{data.status==10}}'>:</view> | <view class='p-mao' wx:if='{{data.status==10}}'>:</view> | ||||
<view class='p-time' wx:if='{{data.status==10}}'>{{hour}}</view> | <view class='p-time' wx:if='{{data.status==10}}'>{{hour}}</view> | ||||
<view class='p-mao' wx:if='{{data.status==10}}'>天</view> | |||||
<view class='p-time' wx:if='{{data.status==10}}'>{{day}}</view> | |||||
<view class='p-text' wx:if='{{data.status==10}}'>剩余</view> | <view class='p-text' wx:if='{{data.status==10}}'>剩余</view> | ||||
</view> | </view> | ||||
<view class='status-center'> | <view class='status-center'> | ||||