From e91f8e57740cb37a8a3d1a11c1c4d25f344ca153 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 2 Nov 2021 18:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=A0=87=E5=8D=8F?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=9A=84=E8=B4=B9=E7=94=A8=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/companyList/companyList.js |  1 -
 pages/signUpPage/signUpPage.js   | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

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
+              })
+            }
+          })
+        }
       }
     })