|
@@ -133,6 +133,13 @@ Page({
|
|
// this.showAlert();
|
|
// this.showAlert();
|
|
// return;
|
|
// return;
|
|
// }
|
|
// }
|
|
|
|
+ console.log(this.data.haveTapJoin)
|
|
|
|
+ if (this.data.haveTapJoin) {
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
|
|
+ this.setData({
|
|
|
|
+ haveTapJoin: true
|
|
|
|
+ })
|
|
const orderId = this.data.orderId;
|
|
const orderId = this.data.orderId;
|
|
const formId = e.detail.formId
|
|
const formId = e.detail.formId
|
|
console.log(e)
|
|
console.log(e)
|
|
@@ -162,17 +169,20 @@ Page({
|
|
case 801:
|
|
case 801:
|
|
this.setData({
|
|
this.setData({
|
|
isModalShow: true,
|
|
isModalShow: true,
|
|
- modalType: 'text'
|
|
|
|
|
|
+ modalType: 'text',
|
|
|
|
+ haveTapJoin: false
|
|
})
|
|
})
|
|
break;
|
|
break;
|
|
case 802:
|
|
case 802:
|
|
this.setData({
|
|
this.setData({
|
|
// damnDialogLine1:'您已拥有本课程使用权',
|
|
// damnDialogLine1:'您已拥有本课程使用权',
|
|
// damnDialogLine2:'快去朗读吧',
|
|
// damnDialogLine2:'快去朗读吧',
|
|
- damnDialogShow: true
|
|
|
|
|
|
+ damnDialogShow: true,
|
|
|
|
+ haveTapJoin: false
|
|
})
|
|
})
|
|
break;
|
|
break;
|
|
case 806:
|
|
case 806:
|
|
|
|
+ console.log(this.data.haveTapJoin)
|
|
wx.pageScrollTo({
|
|
wx.pageScrollTo({
|
|
scrollTop: 0,
|
|
scrollTop: 0,
|
|
duration: 17
|
|
duration: 17
|
|
@@ -180,7 +190,8 @@ Page({
|
|
this.setData({
|
|
this.setData({
|
|
// isModalShow: true,
|
|
// isModalShow: true,
|
|
// modalType: 'text'
|
|
// modalType: 'text'
|
|
- alertFlag: true
|
|
|
|
|
|
+ alertFlag: true,
|
|
|
|
+ haveTapJoin: false
|
|
})
|
|
})
|
|
// wx.navigateTo({
|
|
// wx.navigateTo({
|
|
// url:'/pages/groupPage/my-group/my-group'
|
|
// url:'/pages/groupPage/my-group/my-group'
|
|
@@ -196,6 +207,9 @@ Page({
|
|
} else if (res.cancel) {
|
|
} else if (res.cancel) {
|
|
console.log('用户点击取消')
|
|
console.log('用户点击取消')
|
|
}
|
|
}
|
|
|
|
+ this.setData({
|
|
|
|
+ haveTapJoin: false
|
|
|
|
+ })
|
|
}
|
|
}
|
|
})
|
|
})
|
|
break;
|
|
break;
|
|
@@ -221,12 +235,7 @@ Page({
|
|
//支付
|
|
//支付
|
|
prePayMap: function (prePayMap, type) {
|
|
prePayMap: function (prePayMap, type) {
|
|
console.log(prePayMap)
|
|
console.log(prePayMap)
|
|
- if (this.data.haveTapMoney) {
|
|
|
|
- return false
|
|
|
|
- }
|
|
|
|
- this.setData({
|
|
|
|
- haveTapMoney: true
|
|
|
|
- })
|
|
|
|
|
|
+
|
|
// const that = this;
|
|
// const that = this;
|
|
this.setData({
|
|
this.setData({
|
|
joinGroupType: type
|
|
joinGroupType: type
|
|
@@ -242,7 +251,7 @@ Page({
|
|
console.log('支付成功')
|
|
console.log('支付成功')
|
|
this.setData({
|
|
this.setData({
|
|
isModalShow: true,
|
|
isModalShow: true,
|
|
- haveTapMoney: false
|
|
|
|
|
|
+ haveTapJoin: false
|
|
})
|
|
})
|
|
// const type1 = type;
|
|
// const type1 = type;
|
|
// wx.showModal({
|
|
// wx.showModal({
|
|
@@ -268,7 +277,7 @@ Page({
|
|
'fail': res => {
|
|
'fail': res => {
|
|
console.log('支付失败', res)
|
|
console.log('支付失败', res)
|
|
this.setData({
|
|
this.setData({
|
|
- haveTapMoney: false
|
|
|
|
|
|
+ haveTapJoin: false
|
|
})
|
|
})
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -283,6 +292,9 @@ Page({
|
|
const joinUser = res.data.data.joinUserList;
|
|
const joinUser = res.data.data.joinUserList;
|
|
const groupId = res.data.data.groupPurchaseOrder.id;
|
|
const groupId = res.data.data.groupPurchaseOrder.id;
|
|
const myUid = wx.getStorageSync('uid');
|
|
const myUid = wx.getStorageSync('uid');
|
|
|
|
+ this.setData({
|
|
|
|
+ haveTapJoin: false
|
|
|
|
+ })
|
|
if (myUid === res.data.data.organizer.uid) {
|
|
if (myUid === res.data.data.organizer.uid) {
|
|
wx.redirectTo({
|
|
wx.redirectTo({
|
|
url: `../collage-details/collage-details?orderId=${groupId}&goBackHome=${this.data.goBackHome}`
|
|
url: `../collage-details/collage-details?orderId=${groupId}&goBackHome=${this.data.goBackHome}`
|
|
@@ -357,8 +369,8 @@ Page({
|
|
dataLoading: false,
|
|
dataLoading: false,
|
|
groupOSType: groupOrder.os,
|
|
groupOSType: groupOrder.os,
|
|
isLoading: false
|
|
isLoading: false
|
|
- },()=>{
|
|
|
|
- if(groupOrder.os === 'ANDROID' && app.globalData.isIOS){
|
|
|
|
|
|
+ }, () => {
|
|
|
|
+ if (groupOrder.os === 'ANDROID' && app.globalData.isIOS) {
|
|
wx.redirectTo({
|
|
wx.redirectTo({
|
|
url: `/pages/groupPage/grade-details/grade-details?productId=${res.data.data.groupPurchaseOrder.productId}&goBackHome=1`
|
|
url: `/pages/groupPage/grade-details/grade-details?productId=${res.data.data.groupPurchaseOrder.productId}&goBackHome=1`
|
|
})
|
|
})
|