From d21aa47427096c7d33236356d1bc37e28b0f2fa6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 29 Apr 2022 14:17:59 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
=?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=8A=A5=E5=90=8D=E5=88=A4=E6=96=AD=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A=E6=98=AF=E5=90=A6=E6=98=AF=E5=86=85=E9=83=A8=E4=BC=81?=
=?UTF-8?q?=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/js/http/signUp.js | 4 +-
pages/companyList/companyList.js | 20 ++++-
pages/signUpPage/signUpPage.js | 77 +++++++++++++++++-
pages/signUpPage/signUpPage.wxml | 3 +-
pages/signUpPageGuoji/signUpPageGuoji.js | 90 +++++++++++++++++++---
pages/signUpPageGuoji/signUpPageGuoji.wxml | 3 +-
6 files changed, 181 insertions(+), 16 deletions(-)
diff --git a/assets/js/http/signUp.js b/assets/js/http/signUp.js
index 55dcc5d..7fdfffb 100644
--- a/assets/js/http/signUp.js
+++ b/assets/js/http/signUp.js
@@ -22,7 +22,9 @@ const signUpApi = {
// 上传汇款凭证
uploadPayRecord:(params) =>http.post(`${URL_CONFIG}meeting/payMeetingSituation/editTerminal`, params),
// 通过单位名称校验是否标协会员
- validateStandard:(params) => http.get(`${URL_CONFIG}meeting/internalMeetingSituation/checkMember`,params)
+ validateStandard:(params) => http.get(`${URL_CONFIG}meeting/internalMeetingSituation/checkMember`,params),
+ // 判断当前企业是否是内部企业
+ judgeInternalEnterprise : (params) => http.get(`${URL_CONFIG}company/payCompanyManagement/getInternalEnterprise`,params),
}
export default signUpApi
diff --git a/pages/companyList/companyList.js b/pages/companyList/companyList.js
index 7d3266c..5c8c495 100644
--- a/pages/companyList/companyList.js
+++ b/pages/companyList/companyList.js
@@ -110,7 +110,7 @@ Page({
wx.showModal({
title: '提示',
content: '是否选中该企业',
- success: function (res) {
+ success: async function (res) {
if (res.confirm) {
//这里是点击了确定以后
if (that.data.page === 'guoji') {
@@ -124,6 +124,8 @@ Page({
'selectedCompany.companyName':e.currentTarget.dataset.company.companyName,
'selectedCompany.id':e.currentTarget.dataset.company.id,
})
+ let bool = await that.judgeCompany(e.currentTarget.dataset.company.id)
+ prevPage.setIdentityDisabled(bool)
wx.navigateBack({
delta: 1,
})
@@ -140,6 +142,8 @@ Page({
'selectedCompany.companyName':e.currentTarget.dataset.company.companyName,
'selectedCompany.id':e.currentTarget.dataset.company.id,
})
+ let bool = await that.judgeCompany(e.currentTarget.dataset.company.id)
+ prevPage.setIdentityDisabled(bool)
wx.navigateBack({
delta: 1,
})
@@ -152,6 +156,20 @@ Page({
}
})
},
+ // 判断选择的企业是否是内部企业
+ judgeCompany(id){
+ const param = {
+ id:id
+ }
+ return new Promise(resolve => {
+ signUpApi.judgeInternalEnterprise(param).then(res => {
+ if(res.success){
+ resolve(res.result === 'true' )
+ }
+ })
+ })
+
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js
index c784c15..4de8202 100644
--- a/pages/signUpPage/signUpPage.js
+++ b/pages/signUpPage/signUpPage.js
@@ -14,15 +14,18 @@ Page({
// 参会身份数组
identifyList: [{
value: '2',
- name: '参会人'
+ name: '参会人',
+ disabled:false
},
{
value: '1',
- name: '嘉宾'
+ name: '嘉宾',
+ disabled:false
},
{
value: '3',
- name: '内部企业'
+ name: '内部企业',
+ disabled:true
},
],
// 缴费方式
@@ -112,8 +115,59 @@ Page({
departureTime: e.detail.value
})
},
+ // 内部企业是否禁用 只有参会单位是内部企业才能选 否则禁用内部企业
+ setIdentityDisabled(bool){
+ const identifyLiseSelect = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '1',
+ name: '嘉宾',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:false
+ },
+ ]
+ const identifyLiseSelectDisabled = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '1',
+ name: '嘉宾',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:true
+ },
+ ]
+ if(bool){
+ // bool为真 说明是内部企业可以选择内部企业
+ this.setData({
+ 'identifyList':identifyLiseSelect
+ })
+
+ }else{
+ // 否则不能选中
+ console.log('不是内部i企业')
+ this.setData({
+ 'identifyList':identifyLiseSelectDisabled
+ })
+ }
+ },
// 选择参会身份
changeIdentity(e) {
+ // 如果没有选择参会单位 让先选择参会
const that = this
this.setData({
selectedIdentity: e.detail.value
@@ -185,6 +239,23 @@ Page({
})
return
}
+
+ if(!formData.companyId ){
+ wx.showToast({
+ title: '请选择参会单位',
+ icon: 'none',
+ duration: 2000
+ })
+ return
+ }
+ if(!formData.companyContactId ){
+ wx.showToast({
+ title: '请选择参会人',
+ icon: 'none',
+ duration: 2000
+ })
+ return
+ }
// 参会身份验证
if (formData.identity === '') {
wx.showToast({
diff --git a/pages/signUpPage/signUpPage.wxml b/pages/signUpPage/signUpPage.wxml
index 3424f77..1e12502 100644
--- a/pages/signUpPage/signUpPage.wxml
+++ b/pages/signUpPage/signUpPage.wxml
@@ -25,7 +25,8 @@
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js
index 00daa14..c2f3fbd 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.js
+++ b/pages/signUpPageGuoji/signUpPageGuoji.js
@@ -19,15 +19,9 @@ Page({
// 会议详情
meetingDetailInfo: {},
// 参会身份
- identifyList: [{
- value: '2',
- name: '参会人'
- },
- {
- value: '3',
- name: '内部企业'
- },
+ identifyList: [
],
+ isNbqyBool:false,
// 邀请码数组
inviteCodeArr: [],
// 是否出现输入邀请码 参会身份选择嘉宾才出现
@@ -211,13 +205,48 @@ Page({
})
} else {
+ const identifyListDisabled = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:false
+ },
+ ]
+ const identifyList = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:true
+ },
+ ]
+ if(this.data.isNbqyBool){
+ // 是内部企业
+ this.setData({
+ identifyList:identifyListDisabled
+ })
+ }else{
+ this.setData({
+ identifyList:identifyList
+ })
+ }
this.setData({
identity: '',
vipBool: false,
speakerBool: false,
cooperatieBool: false,
guestBool: false,
- guestType:''
+ guestType:'',
+
})
}
},
@@ -511,6 +540,49 @@ Page({
}
]
},
+ // 内部企业是否禁用 只有参会单位是内部企业才能选 否则禁用内部企业
+ setIdentityDisabled(bool){
+ this.setData({
+ isNbqyBool:bool
+ })
+ const identifyLiseSelect = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:false
+ },
+ ]
+ const identifyLiseSelectDisabled = [
+ {
+ value: '2',
+ name: '参会人',
+ disabled:false
+ },
+ {
+ value: '3',
+ name: '内部企业',
+ disabled:true
+ },
+ ]
+ if(bool){
+ // bool为真 说明是内部企业可以选择内部企业
+ this.setData({
+ 'identifyList':identifyLiseSelect
+ })
+
+ }else{
+ // 否则不能选中
+ console.log('不是内部i企业')
+ this.setData({
+ 'identifyList':identifyLiseSelectDisabled
+ })
+ }
+ },
// 获取会议的详情
queryMeetingDetail(id) {
const that = this
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml
index 9a3730a..b3c66d1 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.wxml
+++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml
@@ -44,7 +44,8 @@