From 45e16f41db57d3ea55ae92a31e9078029dcac120 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 3 Nov 2021 13:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=20=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/http/signUp.js                 |  6 ++---
 pages/signUpPageGuoji/signUpPageGuoji.js | 31 ++++++++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/assets/js/http/signUp.js b/assets/js/http/signUp.js
index 3648343..55dcc5d 100644
--- a/assets/js/http/signUp.js
+++ b/assets/js/http/signUp.js
@@ -2,7 +2,7 @@ import http from './http.js'
 let URL_CONFIG = '/jero-boot/'
 const signUpApi = {
   // 选择参会单位有权限的接口
-  companyList: (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/listMeeting`, params),
+  companyList: (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/list`, params),
   // 选择参会单位无权限的接口
   companyListNoLimit: (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/listMeeting`, params),
   // 添加参会单位
@@ -12,7 +12,7 @@ const signUpApi = {
   // 选择联系人接口
   personList:(params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryWXByCompany`, params),
   // 选择联系人的接口无权限
-  personListNolimit:(params) => http.get(`${URL_CONFIG}/company/payContactsManagement/queryWXByCompany`, params),
+  personListNolimit:(params) => http.get(`${URL_CONFIG}company/payContactsManagement/queryWXByCompany`, params),
   // 添加联系人接口
   addPerson: (params) => http.post(`${URL_CONFIG}company/payContactsManagement/add`, params),
   // 添加联系人接口无权限
@@ -22,7 +22,7 @@ const signUpApi = {
   // 上传汇款凭证
   uploadPayRecord:(params) =>http.post(`${URL_CONFIG}meeting/payMeetingSituation/editTerminal`, params),
   // 通过单位名称校验是否标协会员
-  validateStandard:(params) => http.get('/meeting/internalMeetingSituation/checkMember',params)
+  validateStandard:(params) => http.get(`${URL_CONFIG}meeting/internalMeetingSituation/checkMember`,params)
 }
 
 export default signUpApi
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js
index 0c39f6c..1512c18 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.js
+++ b/pages/signUpPageGuoji/signUpPageGuoji.js
@@ -503,7 +503,6 @@ Page({
   // 确定
   formSubmit(e) {
     const formData = Object.assign({}, e.detail.value)
-
     if (this.data.flag) {
       wx.showToast({
         title: '信息输入有误',
@@ -583,7 +582,7 @@ Page({
       return
     }
     // 是否用餐
-    if (this.data.guestType !== '4' && (formData.haveMeals == '' || formData.haveMeals === undefined)) {
+    if (this.data.guestType !== '4' && this.data.identity === '1'  && (formData.haveMeals == '' || formData.haveMeals === undefined)) {
       wx.showToast({
         title: '请选择是否用餐',
         icon: 'none',
@@ -592,7 +591,7 @@ Page({
       return
     }
     // 是否回民 选择了是否用餐才去校验
-    if (this.data.guestType !== '4' && thism.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) {
+    if (this.data.guestType !== '4' && this.data.haveMeal === '1' && (formData.huiPeople == '' || formData.huiPeople === undefined)) {
       wx.showToast({
         title: '请选择是否回民',
         icon: 'none',
@@ -718,7 +717,16 @@ Page({
       return
     }
     // 会议id
-    formData.meetingId = this.meetingDetailInfo.id
+    if( this.data.selectedMeeting.id){
+      formData.meetingId = this.data.selectedMeeting.id 
+     }else{
+       wx.getStorage({
+         key:"meetingId",
+         success(res){
+           formData.meetingId = res.data
+         }
+       })
+     }
     // 参会人id
     formData.companyContactId = this.data.selectedPerson.id
     // 邮寄联系人id
@@ -747,13 +755,22 @@ Page({
         wx.removeStorage({
           key: 'selectedPostPerson',
         })
+        wx.removeStorage({
+          key: 'meetingId',
+        })
         wx.removeStorage({
           key: 'currentMeetingInfo',
           success() {
             // 跳转报名成功页面
-            wx.navigateTo({
-              url: '../signUpSuccess/signUpSuccess',
-            })
+            if(formData.payMode){
+              wx.navigateTo({
+                url: `../signUpSuccess/signUpSuccess?payMode=${formData.payMode}`,
+              })
+            }else{
+              wx.navigateTo({
+                url: `../signUpSuccess/signUpSuccess`,
+              })
+            }
           }
         })
       }