diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js
index a545193..d7d4e11 100644
--- a/public/local_production_address_config.js
+++ b/public/local_production_address_config.js
@@ -21,4 +21,4 @@ window._CONFIG["singInQRCodHref"]= 'http://bxxt.hzwlsoft.com/signupentrance'
window._CONFIG["memberURL"] = "/memberApi";
// 会员系统的静态文件的地址
window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static";
-window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66:2015/memberApi";
+window._CONFIG["memberDomianWebSocketURL"] = "http://139.9.235.66/memberApi";
diff --git a/public/production_address_config.js b/public/production_address_config.js
index 38987ec..791dcfd 100644
--- a/public/production_address_config.js
+++ b/public/production_address_config.js
@@ -22,4 +22,4 @@ window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance'
window._CONFIG["memberURL"] = "/memberApi";
// 会员系统的静态文件的地址
window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static";
-window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn:8077/memberApi";
+window._CONFIG["memberDomianWebSocketURL"] = "http://cwp.catarc.org.cn/memberApi";
diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue
index b5a932e..856198b 100644
--- a/src/components/detailPage/MeetingList.vue
+++ b/src/components/detailPage/MeetingList.vue
@@ -39,19 +39,27 @@
报名
-
-
-
- 查看凭证
-
- 上传凭证
+
+
+
+ 上传凭证
+
+
+
+ 查看凭证
-
+
+
请用小程序现场签到
@@ -68,7 +76,7 @@
import { getAction } from '../../api/manage'
import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal'
import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
-import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '../../enums/commonEnum'
+import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetIdentifyTypeEnums } from '../../enums/commonEnum'
import { compareCurrentTime } from '../../utils/meetingJudgeUtil'
// 表格的列配置
@@ -136,7 +144,7 @@ const columns = [
dataIndex: 'action',
align: 'center',
fixed: 'right',
- width: 180,
+ width: 220,
scopedSlots: { customRender: 'action' }
}
]
@@ -173,6 +181,7 @@ export default {
SignUpStatusEnum,
MeetingStatusEnums,
MeetingSignUpTypeEnums,
+ MeetIdentifyTypeEnums,
dataSource: [],
loading: false,
/* 分页参数 */
diff --git a/src/enums/commonEnum.js b/src/enums/commonEnum.js
index 300ec41..df958b4 100644
--- a/src/enums/commonEnum.js
+++ b/src/enums/commonEnum.js
@@ -41,3 +41,9 @@ export const MeetingTypeEnums = {
committee: { name: '分标委会议', index: 5 },
council: { name: '理事会会议', index: 6 }
}
+// 参会人员身份类型
+export const MeetIdentifyTypeEnums = {
+ guest: { name: '嘉宾', index: 1 },
+ attendee: { name: '参会人', index: 2 },
+ internal: { name: '内部企业', index: 3 }
+}
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index ccecc49..baccee9 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -121,24 +121,44 @@
@click.stop="signUpRecord(item)">报名
-
-
-
+ <!– 凭证待审核 状态有查看凭证按钮 –>