diff --git a/pages/companyList/companyList.js b/pages/companyList/companyList.js index 59bc4c7..637482c 100644 --- a/pages/companyList/companyList.js +++ b/pages/companyList/companyList.js @@ -117,7 +117,6 @@ Page({ wx.navigateTo({ url: `../signUpPageGuoji/signUpPageGuoji?company=${selectedCompany}`, }) - console.log('that.data.page', that.data.page); } else { wx.navigateTo({ url: `../signUpPage/signUpPage?company=${selectedCompany}`, diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js index 7d602de..ef0e5f4 100644 --- a/pages/signUpPage/signUpPage.js +++ b/pages/signUpPage/signUpPage.js @@ -312,6 +312,11 @@ Page({ selectedMeeting:res.result, meetingCost:res.result.meetingCosts }) + // 存储会议信息 + wx.setStorage({ + key:'currentMeetingInfo', + data:res.result + }) } }).catch( () => { wx.showToast({ @@ -458,6 +463,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + console.log(this.data.selectedMeeting,'this.selectedMeeting'); const that = this // 是否是从首页消息进来的报名 if (this.data.type === 'indexMsg') { @@ -512,10 +518,23 @@ Page({ wx.getStorage({ key: 'currentMeetingInfo', success(res) { - console.log(res, 'meetingInfo'); that.setData({ selectedMeeting: res.data }) + // 标协会议需要判断单位是否是会员单位 + if(selectedCompany.companyName && res.data.meetingType+'' === '2' ){ + signUpApi.validateStandard({companyName:selectedCompany.companyName}).then(res => { + if(res.result){ + that.setData({ + meetingCost:res.data.meetingCostsVip + }) + }else{ + that.setData({ + meetingCost:res.data.meetingCost + }) + } + }) + } } })