diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index b564c55..2d4f29e 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -174,6 +174,10 @@ Page({
id: id
}).then(res => {
if (res.success) {
+ // 已选择会议名称 是否存在
+ if(res.result.choiceTopic_dictText) {
+ res.result.choiceTopicArr = res.result.choiceTopic_dictText.split(',')
+ }
this.setData({
singInPersonInfo: res.result,
ordeCode: res.result.orderCode,
@@ -399,6 +403,10 @@ Page({
if(meetingInfo){
meetingInfo.meetingType = meetingInfo.meetingType + ''
meetingInfo.tbMeetingType = meetingInfo.tbMeetingType + ''
+ // 国际研讨会 关联会议字段有值,则进行处理
+ if(meetingInfo.linkTopics_dictText) {
+ meetingInfo.linkTopicsArr = meetingInfo.linkTopics_dictText.split(',')
+ }
this.setData({
meetingInfo:meetingInfo,
questionList: meetingInfo.questionList || []
@@ -411,6 +419,10 @@ Page({
}else{
MeetingApi.meetingDetail({id:meetingInfo.id}).then(res => {
if(res.success){
+ // 国际研讨会 关联会议字段有值,则进行处理
+ if(res.result.linkTopics_dictText) {
+ res.result.linkTopicsArr = res.result.linkTopics_dictText.split(',')
+ }
this.setData({
meetingInfo:res.result,
questionList: res.result.questionList || []
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index fd0abb3..ebb4a1b 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -14,8 +14,10 @@
{{meetingInfo.isWasic_dictText || '否'}}
- 关联课题
- {{meetingInfo.linkTopics_dictText}}
+ 关联会议
+
+ {{item}}
+
@@ -44,11 +46,11 @@
- 会议费用(2个课题)
+ 1个及以下专题研讨费用
{{meetingInfo.meetingCostsTwoTopic}}元/人
- 会议费用(3个及以上)
+ 2个及以上专题研讨费用
{{meetingInfo.meetingCostsThreeTopic}}元/人
@@ -191,8 +193,11 @@
- 课题名称
- {{singInPersonInfo.choiceTopic_dictText}}
+ 会议名称
+
+ {{item}}
+
+
手机号
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 30c14f3..622ca0c 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -34,7 +34,7 @@ page{
.basic-info view:not(.inner-box-view){
background-color: #FFF;
padding: 15px;
- height: 40px;
+ min-height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
@@ -47,7 +47,7 @@ page{
.basic-info view.wrap-text-view .basic-label{
flex-basis: 120rpx;
}
-.basic-info view.wrap-text-view text:nth-of-type(2){
+.basic-info view.wrap-text-view > text:nth-of-type(2){
flex: 1;
width: 0;
margin-left: 10rpx;
@@ -409,3 +409,8 @@ margin-top: 15px;
padding-bottom: 5px;
}
/* 问题征集新的样式 --结束 */
+
+
+.block-text {
+ display: block;
+}
diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js
index 0411b84..fff01f3 100644
--- a/pages/signUpEntrance/signUpEntrance.js
+++ b/pages/signUpEntrance/signUpEntrance.js
@@ -49,6 +49,9 @@ Page({
id
}).then(res => {
if (res.success) {
+ if(res.result.linkTopics_dictText) {
+ res.result.linkTopicsArr = res.result.linkTopics_dictText.split(',')
+ }
that.setData({
meetingDetailIngfo: res.result,
meetingType: that.generateMeetingType(res.result.meetingType),
@@ -167,7 +170,7 @@ Page({
let meetingId = url.split('=')[1]
// todo 开发直接测试
// meetingId = '1716697502924484609' // 其他会议
- // meetingId = '1716359804183416834' // 国际研讨会-wasic
+ meetingId = '1717017180230205441' // 国际研讨会-wasic
// meetingId = '1682658807030460418' // 国际研讨会2
this.queryMeetingDetail(meetingId)
diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml
index 0e400a1..4c650e6 100644
--- a/pages/signUpEntrance/signUpEntrance.wxml
+++ b/pages/signUpEntrance/signUpEntrance.wxml
@@ -15,8 +15,11 @@
{{meetingDetailIngfo.isWasic_dictText || '否'}}
- 关联课题
- {{meetingDetailIngfo.linkTopics_dictText}}
+ 关联会议
+
+ {{item}}
+
+
@@ -71,11 +74,11 @@
- 会议费用(2个课题)
+ 1个及以下专题研讨费用
{{meetingDetailIngfo.meetingCostsTwoTopic}}元/人
- 会议费用(3个及以上)
+ 2个及以上专题研讨费用
{{meetingDetailIngfo.meetingCostsThreeTopic}}元/人
diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss
index de62ce9..0681166 100644
--- a/pages/signUpEntrance/signUpEntrance.wxss
+++ b/pages/signUpEntrance/signUpEntrance.wxss
@@ -22,7 +22,7 @@ page{
.basic-info view:not(.question-container-view){
background-color: #FFF;
padding: 15px;
- height: 40px;
+ min-height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
@@ -34,7 +34,7 @@ page{
.basic-info view.wrap-text-view .basic-label{
flex-basis: 120rpx;
}
-.basic-info view.wrap-text-view text:nth-of-type(2){
+.basic-info view.wrap-text-view > text:nth-of-type(2){
flex: 1;
width: 0;
margin-left: 10rpx;
@@ -206,3 +206,6 @@ margin-top: 15px;
padding-right: 8px;
flex-shrink: 0;
}
+.block-text {
+ display: block;
+}
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js
index 1dea72c..811b3d2 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.js
+++ b/pages/signUpPageGuoji/signUpPageGuoji.js
@@ -23,7 +23,7 @@ const NeedArr = [{
name: '否'
},
]
-// 国际研讨会关联课题
+// 国际研讨会关联会议
//汽车网络安全与数据安全标准合规专题,
// 智能网汽车标准化领航及标准路线图专题,
// 汽车地毯专题,
@@ -34,6 +34,10 @@ const LinkTopicsEnums = {
free: {
name: '免费专题',
index: 6
+ },
+ default: {
+ name: '114/22焦点论坛(默认专题)',
+ index: 99
}
}
@@ -362,7 +366,7 @@ Page({
// 国际研讨会嘉宾 内部企业 不需要缴费
if (value === '2') {
let meetingCostSum = that.data.selectedMeeting.meetingCosts
- // 如果当前是WASIC会议 则需要通过课题名称判断会议的费用
+ // 如果当前是WASIC会议 则需要通过会议名称判断会议的费用
if (this.data.meetingDetailInfo.isWasic) {
meetingCostSum = this.handleMeetingCostSum(this.data.linkTopicsOptionArr)
}
@@ -395,6 +399,10 @@ Page({
let arr = res.result || []
arr.map(tt => {
tt.name = tt.text
+ if(tt.value + '' === LinkTopicsEnums.default.index + '') {
+ tt.checked = true
+ tt.disabled = true
+ }
})
const updateObj = {
linkTopicsOptionArr: arr // 参会人信息
@@ -772,15 +780,17 @@ Page({
id: id
}).then(res => {
if (res.success) {
+ let meetingCosts = res.result.meetingCosts
// 国际研讨会 且为WASIC 会议
if (Number(res.result.isWasic)) {
this.getLinkTopicsOptionArr(res.result.id)
+ meetingCosts = res.result.meetingCostsTwoTopic
}
this.setData({
meetingDetailInfo: res.result,
inviteCodeArr: that.validateCodeArr(res.result),
selectedMeeting: res.result,
- meetingCosts: res.result.meetingCosts
+ meetingCosts: meetingCosts
})
}
})
@@ -805,11 +815,11 @@ Page({
})
return
}
- // 如果会议是WASIC 需要对是否选择课题名称做校验
+ // 如果会议是WASIC 需要对是否选择会议名称做校验
if (this.data.meetingDetailInfo.isWasic) {
if (!formData.choiceTopic || formData.choiceTopic.length === 0) {
wx.showToast({
- title: '请选择课题名称',
+ title: '请选择会议名称',
icon: 'none',
duration: 2000
})
@@ -1144,7 +1154,7 @@ Page({
// 邀请码数据
formData.invitationCode = formData.inviteCode
}
- // 国际研讨会-WASIC 所选择的 关联课题
+ // 国际研讨会-WASIC 所选择的 关联会议
if (formData.choiceTopic) {
formData.choiceTopic = formData.choiceTopic.join(',')
}
diff --git a/pages/signUpPageGuoji/signUpPageGuoji.wxml b/pages/signUpPageGuoji/signUpPageGuoji.wxml
index 0e3abde..3c4a400 100644
--- a/pages/signUpPageGuoji/signUpPageGuoji.wxml
+++ b/pages/signUpPageGuoji/signUpPageGuoji.wxml
@@ -24,19 +24,19 @@
手机号:
-
+
- 课题名称:
+ 会议名称:
-
+
@@ -649,4 +649,4 @@
-
\ No newline at end of file
+