diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index de63585..fee4b02 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -72,24 +72,31 @@ Page({
// 会议详情
meetingDetail(e){
let meetingInfo =JSON.stringify(e.currentTarget.dataset.meetinginfo)
- // wx.navigateTo({
- // // url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
- // // 报名页面
- // url:`../signUpPage/signUpPage?meetingInfo=${meetingInfo}`
+ let meetingItem = e.currentTarget.dataset.meetinginfo
- // })
// 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息
- if(true){
+ if(meetingItem.meetingSignUpType === 1){
wx.setStorage({
key:"currentMeetingInfo",
data:e.currentTarget.dataset.meetinginfo,
success(){
- wx.navigateTo({
- url:`../signUpPage/signUpPage`
- })
+ // 国际研讨会去国际研讨会的报名页面
+ if(meetingItem.meetingType !== 3){
+ wx.navigateTo({
+ url:`../signUpPage/signUpPage`
+ })
+ }else if(meetingItem.meetingSignUpType === 2){
+ wx.navigateTo({
+ url:`../signUpPageGuoji/signUpPageGuoji`
+ })
+ }
}
})
+ }else if(meetingItem.meetingType === 4){
+ wx.navigateTo({
+ url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名)
+ })
}
},
@@ -117,7 +124,7 @@ Page({
})
})
},
-
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml
index d3a99b5..d5040d1 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.wxml
+++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml
@@ -123,7 +123,7 @@
费用合计:
- {{selectedMeeting.meetingCosts}}元
+ {{meetingDetailInfo.meetingCosts}}元