diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js
index 1dff35f..1b91b8e 100644
--- a/pages/joinFrDpell/index.js
+++ b/pages/joinFrDpell/index.js
@@ -29,7 +29,8 @@ Page({
this.setData({
couponChannelId: options.couponChannelId,
couponId: options.couponId,
- orderGroupId: options.orderGroupId
+ orderGroupId: options.orderGroupId,
+ orderId:options.orderId
})
this.getDetail(options.couponChannelId);
this.getOneSpell(options.couponId)
@@ -111,7 +112,7 @@ Page({
this.setData({
canSpell: false
})
- this.orderFunc(0)
+ this.orderFunc(this.data.orderGroupId)
},
//参与别人的拼团
gotoPartner() {
diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml
index 73ff86f..4c4ac14 100644
--- a/pages/joinFrDpell/index.wxml
+++ b/pages/joinFrDpell/index.wxml
@@ -55,7 +55,7 @@
{{data.salePrice}}
元
- 发起拼团
+ 参加拼团
diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js
index f9dfe41..01bb501 100644
--- a/pages/spellGroup/mySpellGroup/index.js
+++ b/pages/spellGroup/mySpellGroup/index.js
@@ -90,14 +90,14 @@ Page({
})
} else {
that.setData({
- spellData:null,
+ // spellData:null,
clock: "00",
day: "00",
hour: "00",
min: "00",
sec: "00",
})
- that.getOneSpell(that.data.couponId)
+ // that.getOneSpell(that.data.couponId)
}
setTimeout(function () {
total_micro_second -= 1000;
@@ -117,7 +117,7 @@ Page({
//参与别人的拼团
gotoPartner(){
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}`
});
},
/**
diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js
index 1889ac5..8ba30ef 100644
--- a/pages/spellGroup/spellGroup.js
+++ b/pages/spellGroup/spellGroup.js
@@ -47,9 +47,11 @@ Page({
this.getList(1, "spellList")
},
//跳转到我的拼团详情
- gotoStatusDetail(){
+ gotoStatusDetail(e){
+ console.log(e,333)
+ let data = e.currentTarget.dataset.data
wx.navigateTo({
- url: '/pages/spellDetail/index',
+ url: `/pages/spellDetail/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}`,
})
},
//切换我的拼团
diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml
index 8655ac5..424ca63 100644
--- a/pages/spellGroup/spellGroup.wxml
+++ b/pages/spellGroup/spellGroup.wxml
@@ -26,11 +26,11 @@
剩余{{item.remainInventory}}
-
-
+
+
-
+
{{item.title}}
@@ -43,7 +43,7 @@
-
+
{{item.statusText}}