diff --git a/public/development_address_config.js b/public/development_address_config.js index 92d517b..c3ef998 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -12,12 +12,14 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://10.0.1.9:9012/onlinePreview"; -// todo 需要改为企业端的报名地址 --- 本地 -// 会议管理报名二维码地址 需 -window._CONFIG['singUpQRCodeURL'] = 'http://10.0.1.9:21825/signupentrance' +// 需要改为企业端的报名地址 --- 本地 +// 会议报名页面-报名二维码网址 -生成小程序二维码使用 +window._CONFIG['singUpQRCodeURL'] = 'http://bxxt.hzwlsoft.com/signupentrance' +// 页面显示用的会议报名网址-pc端使用 +window._CONFIG["singInQRCodHref"]= 'http://10.0.1.9:21826/signupentrance' // 路由转发 -会员系统的路由转发前缀 window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; -window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.10.78:9000/memberApi"; +window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.1.9:9000/api"; diff --git a/public/local_production_address_config.js b/public/local_production_address_config.js index f3d230f..a545193 100644 --- a/public/local_production_address_config.js +++ b/public/local_production_address_config.js @@ -12,8 +12,10 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://139.9.235.66:8012/onlinePreview"; -// 会议管理报名二维码地址 +// 会议报名页面-报名二维码网址 -生成小程序二维码使用 window._CONFIG['singUpQRCodeURL'] = 'http://bxxt.hzwlsoft.com/signupentrance' +// 页面显示用的会议报名网址-pc端使用 +window._CONFIG["singInQRCodHref"]= 'http://bxxt.hzwlsoft.com/signupentrance' // 路由转发 -会员系统的路由转发前缀 window._CONFIG["memberURL"] = "/memberApi"; diff --git a/public/production_address_config.js b/public/production_address_config.js index 5208f51..38987ec 100644 --- a/public/production_address_config.js +++ b/public/production_address_config.js @@ -12,8 +12,10 @@ window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/onlinePreview"; -// 会议管理报名二维码地址 -window._CONFIG['singUpQRCodeURL'] = 'http://cwp.catarc.org.cn/signupentrance' +// 会议报名页面-报名二维码网址 -生成小程序二维码使用 +window._CONFIG['singUpQRCodeURL'] = 'https://cwp.catarc.org.cn/signupentrance' +// 页面显示用的会议报名网址-pc端使用 +window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance' // 路由转发 -会员系统的路由转发前缀 diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue index ae8afb5..0583366 100644 --- a/src/components/detailPage/MeetingList.vue +++ b/src/components/detailPage/MeetingList.vue @@ -254,7 +254,7 @@ export default { }, // 去报名 signUpRecord(item) { - let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}` + let url = `${window._CONFIG['singInQRCodHref']}?id=${item.id}` window.open(url, '_blank') }, /* diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index 8a43908..31e57e6 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -899,7 +899,7 @@ export default { } }, goSignUpPage() { - let url = `${window._CONFIG['singUpQRCodeURL']}?id=${this.model.id}` + let url = `${window._CONFIG['singInQRCodHref']}?id=${this.model.id}` window.open(url, '_blank') } diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue index e02b967..e593cb7 100644 --- a/src/views/meetingActivity/MeetingActivity.vue +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -393,7 +393,7 @@ export default { // 可报名的点击应该是去报名 // if (item.meetingSignUpType === 1) { - // let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}` + // let url = `${window._CONFIG['singInQRCodHref']}?id=${item.id}` // window.open(url, '_blank') // } else { // 打开会议详情 @@ -403,7 +403,7 @@ export default { }, // 去报名 signUpRecord(item) { - let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}` + let url = `${window._CONFIG['singInQRCodHref']}?id=${item.id}` window.open(url, '_blank') }, /* diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue index 280ad73..1744244 100644 --- a/src/views/signUp/SignUpEntrance.vue +++ b/src/views/signUp/SignUpEntrance.vue @@ -125,12 +125,13 @@ export default { } }, async mounted() { - this.singUpQRCode = await this.generateQRCode(this.signUpHerfUrl) + let codeUrl = `${ window._CONFIG['singUpQRCodeURL'] }?id=${this.meetingId}` + this.singUpQRCode = await this.generateQRCode(codeUrl) }, computed:{ // 报名链接 signUpHerfUrl() { - return `${ window._CONFIG['singUpQRCodeURL'] }?id=${this.meetingId}` + return `${ window._CONFIG['singInQRCodHref'] }?id=${this.meetingId}` }, }, methods: { @@ -327,4 +328,4 @@ export default { .word-beak { word-break: break-all; } - \ No newline at end of file + diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue index 1d9626a..cd6b004 100644 --- a/src/views/standardsAssociation/meeting/MeetingList.vue +++ b/src/views/standardsAssociation/meeting/MeetingList.vue @@ -378,7 +378,7 @@ export default { }, // 去报名 signUpRecord(item) { - let url = `${window._CONFIG['singUpQRCodeURL']}?id=${item.id}` + let url = `${window._CONFIG['singInQRCodHref']}?id=${item.id}` window.open(url, '_blank') }, /*