diff --git a/pages/cannotSignUp/cannotSignUp.wxml b/pages/cannotSignUp/cannotSignUp.wxml index d91ad43..2e4c9ea 100644 --- a/pages/cannotSignUp/cannotSignUp.wxml +++ b/pages/cannotSignUp/cannotSignUp.wxml @@ -4,7 +4,7 @@ - + 报名未开始或已结束 diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js index ecfe435..7751d0d 100644 --- a/pages/scanSign/scanSign.js +++ b/pages/scanSign/scanSign.js @@ -56,9 +56,17 @@ Page({ }, // 去报名 goSignUp(){ - wx.navigateTo({ - url: `../signUpPage/signUpPage?id=${meetingId}`, - }) + // 国际研讨会去国际研讨会的报名 + if(this.data.form.meetingType !== 3){ + wx.navigateTo({ + url: `../signUpPage/signUpPage?id=${this.data.form.meetingId}`, + }) + }else{ + wx.navigateTo({ + url: `../signUpPageGuoji/signUpPageGuoji?id=${this.data.form.meetingId}`, + }) + + } }, /** * 生命周期函数--监听页面加载 diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js index 52b85f9..6dc7316 100644 --- a/pages/signUpEntrance/signUpEntrance.js +++ b/pages/signUpEntrance/signUpEntrance.js @@ -53,6 +53,7 @@ Page({ }).catch(err => { wx.showToast({ title: '加载失败', + icon:'none' }) }) },