From dc42b59789a5aae4128f3998896f25093bf4d94f Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 26 Oct 2021 15:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/signUpPage/signUpPage.js   | 28 +++++++++++++++++-----------
 pages/signUpPage/signUpPage.wxml | 10 +++++-----
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js
index 9643fd8..72ba048 100644
--- a/pages/signUpPage/signUpPage.js
+++ b/pages/signUpPage/signUpPage.js
@@ -82,8 +82,11 @@ Page({
     selectedMeeting: {},
     // 是否正确填写信息
     flag: false,
+    // 是否是首页消息进来的
+    indexMsgBool:false,
     // 首页消息
-    indexMsg: ''
+    indexMsg: '',
+
   },
   // 是否需要发票的选择
   needInvoiceChange(e) {
@@ -159,7 +162,7 @@ Page({
     // 是否需要发票
     if (formData.needInvoice === -1) {
       wx.showToast({
-        title: '请选择发票',
+        title: '请选择是否需要发票',
         icon: 'none',
         duration: 2000
       })
@@ -193,14 +196,14 @@ Page({
       return
     }
     // 是否住酒店
-    if (formData.checkInHotel === '') {
-      wx.showToast({
-        title: '请选择是否住酒店',
-        icon: 'none',
-        duration: 2000
-      })
-      return
-    }
+    // if (formData.checkInHotel === '') {
+    //   wx.showToast({
+    //     title: '请选择是否住酒店',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   return
+    // }
 
     signUpApi.signUpMeeting(formData).then(res => {
       if (res.success) {
@@ -220,7 +223,7 @@ Page({
       }else{
         wx.showToast({
           title: res.message,
-          icon: 'error',
+          icon: 'none',
           duration: 2000
         })
       }
@@ -278,6 +281,9 @@ Page({
     const that = this
     // 是否是从首页消息进来的报名 
     if (options.type === 'indexMsg') {
+      this.setData({
+        indexMsgBool:true
+      })
       // 查询会议信息 
       this.queryMeetingInfo(options.meetingId)
       // 默认填写个人信息
diff --git a/pages/signUpPage/signUpPage.wxml b/pages/signUpPage/signUpPage.wxml
index 216d3ef..32fbd65 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" bindfocus="selectCompany" name="selectedCompany.companyName" bindinput="bindInputPhone" value="{{selectedCompany.companyName}}" placeholder="请选择参会单位" />
+      <input placeholder-class="text-right" disabled="{{indexMsgBool}}" bindfocus="selectCompany" name="selectedCompany.companyName" bindinput="bindInputPhone" value="{{selectedCompany.companyName}}" placeholder="请选择参会单位" />
     </view>
 
     <view class="form-item">
@@ -30,7 +30,7 @@
           </radio-group>
         </view>
     </view>
-<!-- 选择身份为嘉宾和内部企业不需要夫付费 不显示缴费方式 邮寄联系人 邮寄地址 邮编 -->
+<!-- 选择身份为嘉宾和内部企业不需要付费 不显示缴费方式 邮寄联系人 邮寄地址 邮编 -->
     <view class="form-item-radio" wx:if="{{selectedIdentity === '2' && selectedMeeting.meetingCosts !== '0.00'}}">
         <view class="radio-label">
           <text class="item-label flex-1 validate">缴费方式：</text>
@@ -44,8 +44,8 @@
         </view>
     </view>
 
-<!-- 缴费方式为打包的不显示 -->
-    <view class="form-item" wx:if="{{paymentMethod !== '3' && selectedMeeting.meetingCosts !== '0.00'}}">
+<!-- 缴费方式为打包的不显示 参会身份选择嘉宾和内部企业不显示 -->
+    <view class="form-item" wx:if="{{paymentMethod !== '3' && selectedMeeting.meetingCosts !== '0.00' && selectedIdentity === '2'}}">
       <text class="item-label flex-1 validate">是否需要发票：</text>
       <picker name='needInvoice' bindchange="needInvoiceChange" range="{{needInvoiceList}}"  value="{{index}}" range-key='name'>
         <view class="picker">
@@ -71,7 +71,7 @@
 
     <view class="form-item-radio">
         <view class="radio-label">
-          <text  class="item-label flex-1 validate">是否住酒店：</text>
+          <text  class="item-label flex-1">是否住酒店：</text>
         </view>
         <view>
           <radio-group name='checkInHotel' bindchange="paymentMethodRadioChange">