From cf9dc355f9e5735f909d7f08e5b4d79a2849cfad Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 20:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=8A=A5=E5=90=8D=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/meeting/meeting.js               |  2 +-
 pages/signUpEntrance/signUpEntrance.js | 16 ++++++++++------
 pages/signUpPage/signUpPage.js         | 14 +++++++-------
 pages/signUpPage/signUpPage.wxml       |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 816843e..4663ef0 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -86,7 +86,7 @@ Page({
           // 国际研讨会去国际研讨会的报名页面
           if (meetingItem.meetingType !== 3) {
             wx.navigateTo({
-              url: `../signUpPage/signUpPage`
+              url: `../signUpPage/signUpPage?type=indexMsg`
             })
           } else if (meetingItem.meetingSignUpType === 2) {
             wx.navigateTo({
diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index ac363bd..076755a 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -18,7 +18,7 @@ Page({
   data: {
     // 会议详情信息
     meetingDetailIngfo: {},
-    // 会议类型 
+    // 会议类型
     meetingType: '',
     // 标协会议类型  1标准宣贯 2学习培训
     tbMeetingType:'',
@@ -52,7 +52,7 @@ Page({
       }
     })
   },
-  // 报名 
+  // 报名
   signUp() {
     // 不同的会议通跳转不同的会议页面
     let meetingType = this.data.meetingDetailIngfo.meetingType
@@ -67,7 +67,7 @@ Page({
       })
     }
   },
-  // 会议类型 
+  // 会议类型
   generateMeetingType(meetingType) {
     switch (meetingType) {
       case "1":
@@ -82,7 +82,7 @@ Page({
         return "分标委会议"
     }
   },
-   // 标协会议类型 
+   // 标协会议类型
    generateTbMeetingType(type) {
     switch (type) {
       case "1":
@@ -101,7 +101,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.queryMeetingDetail('1448568227696041986')
+    let url = decodeURIComponent(options.q)
+    if(url){
+      let meetingId = url.split('=')[1]
+    }
+    this.queryMeetingDetail({id:meetingId})
   },
 
   /**
@@ -152,4 +156,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
\ No newline at end of file
+})
diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js
index 72ba048..2205e46 100644
--- a/pages/signUpPage/signUpPage.js
+++ b/pages/signUpPage/signUpPage.js
@@ -168,7 +168,7 @@ Page({
       })
       return
     }
-    // 邮寄联系人 
+    // 邮寄联系人
     if (formData.postContactId === undefined) {
       wx.showToast({
         title: '请选择邮寄联系人',
@@ -186,7 +186,7 @@ Page({
       })
       return
     }
-    // 邮编 
+    // 邮编
     if (formData.postCode === '') {
       wx.showToast({
         title: '请输入邮编',
@@ -271,7 +271,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
- 
+
     this.setData({
       indexMsg: options.type,
     })
@@ -279,12 +279,12 @@ Page({
     //   selectedCompany:JSON.parse(options.company)
     // })
     const that = this
-    // 是否是从首页消息进来的报名 
+    // 是否是从首页消息进来的报名
     if (options.type === 'indexMsg') {
       this.setData({
         indexMsgBool:true
       })
-      // 查询会议信息 
+      // 查询会议信息
       this.queryMeetingInfo(options.meetingId)
       // 默认填写个人信息
       // 从缓存中拿个人信息
@@ -308,7 +308,7 @@ Page({
 
     }
   },
-  // 手机号验证 
+  // 手机号验证
   validatePhone(e) {
     console.log(e);
     let value = e.detail.value
@@ -391,7 +391,7 @@ Page({
   onShow: function () {
     const that = this
     console.log(this.data.type ,'this.data.type ');
-    // 是否是从首页消息进来的报名 
+    // 是否是从首页消息进来的报名
     if (this.data.type === 'indexMsg') {
       // 默认填写个人信息
       // 从缓存中拿个人信息
diff --git a/pages/signUpPage/signUpPage.wxml b/pages/signUpPage/signUpPage.wxml
index 32fbd65..2882d43 100644
--- a/pages/signUpPage/signUpPage.wxml
+++ b/pages/signUpPage/signUpPage.wxml
@@ -5,7 +5,7 @@
 <!-- 如果是小程序消息进入的报名页面 需要回显企业与参会人  参会企业不可更改  -->
     <view class="form-item">
       <text class="item-label flex-1">参会单位：</text>
-      <input placeholder-class="text-right" disabled="{{indexMsgBool}}" bindfocus="selectCompany" name="selectedCompany.companyName" bindinput="bindInputPhone" value="{{selectedCompany.companyName}}" placeholder="请选择参会单位" />
+      <input placeholder-class="text-right" bindfocus="selectCompany" name="selectedCompany.companyName" bindinput="bindInputPhone" value="{{selectedCompany.companyName}}" placeholder="请选择参会单位" />
     </view>
 
     <view class="form-item">