From e65ffd1b66878eb9a2e24d6c64dc72334b3b553b Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 1 Nov 2021 20:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/personList/personList.js |  5 +++--
 pages/scanSign/scanSign.js     |  4 ++--
 pages/signUpPage/signUpPage.js | 28 ++++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/pages/personList/personList.js b/pages/personList/personList.js
index 846ff4b..7412d2f 100644
--- a/pages/personList/personList.js
+++ b/pages/personList/personList.js
@@ -10,8 +10,8 @@ Page({
     queryParam: {
       companyId: '',
       pageNo: 1,
-      pageSize: 20,
       name:'',
+      pageSize: 20,
       column:'createTime',
       order:'desc'
     },
@@ -65,7 +65,8 @@ Page({
           if(that.data.selectType === '1'){
             prevPage.setData({
               'selectedPerson.name':selectedPerson.name,
-              'selectedPerson.id':selectedPerson.id
+              'selectedPerson.id':selectedPerson.id,
+              phone:selectedPerson.phone
             })
             wx.navigateBack({
               delta: 1,
diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js
index d5c4bb0..29cf907 100644
--- a/pages/scanSign/scanSign.js
+++ b/pages/scanSign/scanSign.js
@@ -59,11 +59,11 @@ Page({
     // 国际研讨会去国际研讨会的报名
     if(this.data.form.meetingType !== 3){
       wx.navigateTo({
-        url: `../signUpPage/signUpPage?id=${this.data.form.meetingId}`,
+        url: `../signUpPage/signUpPage?meetingId=${this.data.form.meetingId}`,
       })
     }else{
       wx.navigateTo({
-        url: `../signUpPageGuoji/signUpPageGuoji?id=${this.data.form.meetingId}`,
+        url: `../signUpPageGuoji/signUpPageGuoji?meetingId=${this.data.form.meetingId}`,
       })
   
     }
diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js
index 731b86e..85d5945 100644
--- a/pages/signUpPage/signUpPage.js
+++ b/pages/signUpPage/signUpPage.js
@@ -80,6 +80,8 @@ Page({
     selectedPostPerson: {},
     // 选中的会议
     selectedMeeting: {},
+    // 会议id 
+    meetingId:'',
     // 是否正确填写信息
     flag: false,
     // 是否是首页消息进来的
@@ -138,7 +140,18 @@ Page({
     console.log(e);
     const formData = Object.assign({}, e.detail.value)
      // 会议id
-     formData.meetingId = this.data.selectedMeeting.id
+     if( this.data.selectedMeeting.id){
+      formData.meetingId = this.data.selectedMeeting.id 
+     }else{
+       wx.getStorage({
+         key:"meetingId",
+         success(res){
+           console.log(res,'res');
+           formData.meetingId = res.data
+         }
+       })
+     }
+    console.log( formData.meetingId ,'; formData.meetingId ');
      // 参会人id
      formData.companyContactId = this.data.selectedPerson.id
      // 邮寄联系人id
@@ -231,6 +244,9 @@ Page({
         wx.removeStorage({
           key: 'selectedCompany',
         })
+        wx.removeStorage({
+          key: 'meetingId',
+        })
         wx.removeStorage({
           key: 'currentMeetingInfo',
           success() {
@@ -324,7 +340,16 @@ Page({
     }
 
     if(options.meetingId){
+      console.log(options.meetingId,'options.meetingId');
       this.queryMeetingInfo(options.meetingId)
+      this.setData({
+        meetingId:options.meetingId
+      })
+
+      wx.setStorage({
+        key:'meetingId',
+        data:options.meetingId
+      })
     }
     const that = this
     // 是否是从首页消息进来的报名
@@ -437,7 +462,6 @@ Page({
    */
   onShow: function () {
     const that = this
-    console.log(this.data.type ,'this.data.type ');
     // 是否是从首页消息进来的报名
     if (this.data.type === 'indexMsg') {
       // 默认填写个人信息