From a40847b62b072cbf79f22f95e2a5e0e46a2ccd5d Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Mon, 10 Jan 2022 16:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BC=81=E4=B8=9A=20=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/addPerson/addPerson.wxml | 2 +- pages/meeting/meeting.js | 7 +-- pages/signUpEntrance/signUpEntrance.js | 55 +++++++++++++----------- pages/signUpEntrance/signUpEntrance.wxml | 8 ++-- pages/signUpEntrance/signUpEntrance.wxss | 9 ++++ pages/signUpPage/signUpPage.js | 2 +- pages/signUpPage/signUpPage.wxml | 2 +- pages/signUpPageGuoji/signUpPageGuoji.js | 2 +- project.config.json | 6 +-- 9 files changed, 54 insertions(+), 39 deletions(-) diff --git a/pages/addPerson/addPerson.wxml b/pages/addPerson/addPerson.wxml index c22e3c7..754334b 100644 --- a/pages/addPerson/addPerson.wxml +++ b/pages/addPerson/addPerson.wxml @@ -78,7 +78,7 @@ diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index 6f5bdd2..d881e0e 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -9,6 +9,7 @@ Page({ */ data: { statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], + isStandard:false,// 是否时标协会员那里跳转过来的 searchParams: { pageNo: 1, pageSize: 10, @@ -17,7 +18,6 @@ Page({ meetingType: '', // 工作组会议：1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5 meetingStartTime: '', // 开始时间 meetingEndTime: '', // 结束时间 - isStandard:false,// 是否时标协会员那里跳转过来的 // 创建时间倒叙排序 column: 'createTime', order: 'desc' @@ -150,9 +150,10 @@ Page({ }, bindDateChange(e) { this.data.searchParams.pageNo = 1 + // ' ' + '00:00:00' + ' ' + '23:59:59' this.setData({ - 'searchParams.meetingStartTime': e.detail.value, - 'searchParams.meetingEndTime': e.detail.value + 'searchParams.meetingStartTime': e.detail.value , + 'searchParams.meetingEndTime': e.detail.value }) this.queryMeetingList() }, diff --git a/pages/signUpEntrance/signUpEntrance.js b/pages/signUpEntrance/signUpEntrance.js index 9ce8135..0cd5f85 100644 --- a/pages/signUpEntrance/signUpEntrance.js +++ b/pages/signUpEntrance/signUpEntrance.js @@ -5,7 +5,10 @@ import { previewFile, getFileInfo } from '../../assets/js/preview' -import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js' +import { + baseUrl, + URL_CONFIG +} from '../../assets/js/project.config.js' Page({ @@ -18,15 +21,15 @@ Page({ // 会议类型 meetingType: '', // 标协会议类型 1标准宣贯 2学习培训 - tbMeetingType:'', + tbMeetingType: '', // 会议通知文件资料数组 meetingFilesList: [], // 缴费二维码的图片路径 payOrCode: '', // 标协会议酒店信息 - hotelContactsList:[], + hotelContactsList: [], // 当前会议是否超出时间 - isMoreBool:false + isMoreBool: false }, compareCurrentTime(time) { let date = new Date() @@ -48,8 +51,8 @@ Page({ meetingDetailIngfo: res.result, meetingType: that.generateMeetingType(res.result.meetingType), payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode, - tbMeetingType:that.generateTbMeetingType(res.result.tbMeetingType), - hotelContactsList:res.result.hotelContactsList + tbMeetingType: that.generateTbMeetingType(res.result.tbMeetingType), + hotelContactsList: res.result.hotelContactsList }) console.log(that.data.hotelContactsList); initFileList(res.result.meetingFiles).then(res => { @@ -59,26 +62,26 @@ Page({ }) // 判断当前会议是否超出时间 let flag = that.compareCurrentTime(res.result.registerDeadline) - if(flag){ + if (flag) { wx.showToast({ title: '当前会议超出报名时间，不可报名', - icon:'none', - duration:4000 + icon: 'none', + duration: 4000 }) that.setData({ - isMoreBool:false + isMoreBool: false }) - }else{ + } else { that.setData({ - isMoreBool:true + isMoreBool: true }) } - + } }).catch(err => { wx.showToast({ title: '加载失败', - icon:'none' + icon: 'none' }) }) }, @@ -86,25 +89,25 @@ Page({ signUp() { // 超出报名时间 提示 let flag = this.compareCurrentTime(this.data.meetingDetailIngfo.registerDeadline) - if(flag){ + if (flag) { wx.showToast({ title: '当前会议超出报名时间，不可报名', - icon:'none', - duration:2000 + icon: 'none', + duration: 2000 }) return } const that = this // 企业列表与参会人列表调用的是无权限接口 wx.setStorage({ - key:'nolimit', - data:true + key: 'nolimit', + data: true }) // 不同的会议通跳转不同的会议页面 let meetingType = this.data.meetingDetailIngfo.meetingType wx.setStorage({ - key:'currentMeetingInfo', - data:that.data.meetingDetailIngfo + key: 'currentMeetingInfo', + data: that.data.meetingDetailIngfo }) if (meetingType !== '3') { wx.navigateTo({ @@ -131,13 +134,15 @@ Page({ return "分标委会议" } }, - // 标协会议类型 - generateTbMeetingType(type) { + // 标协会议类型 + generateTbMeetingType(type) { switch (type) { case "1": return "标准宣贯" case "2": return "学习培训" + case "3": + return "信息交流会" } }, // 预览文件 @@ -156,6 +161,8 @@ Page({ let url = decodeURIComponent(options.q) let meetingId = url.split('=')[1] this.queryMeetingDetail(meetingId) + + // this.queryMeetingDetail("1479397531946348545") }, /** @@ -206,4 +213,4 @@ Page({ onShareAppMessage: function () { } -}) +}) \ No newline at end of file diff --git a/pages/signUpEntrance/signUpEntrance.wxml b/pages/signUpEntrance/signUpEntrance.wxml index 7162a81..4dbbd79 100644 --- a/pages/signUpEntrance/signUpEntrance.wxml +++ b/pages/signUpEntrance/signUpEntrance.wxml @@ -109,17 +109,17 @@ {{meetingDetailIngfo.remark === null ? '' : meetingDetailIngfo.remark}} - + 酒店名称 {{meetingDetailIngfo.hotelName || ''}} - + 酒店联系人 {{item.hotelContacts}} {{item.hotelContactsPhone ? '-' : ''}} {{item.hotelContactsPhone}} - - 酒店地址 + + 酒店地址 {{meetingDetailIngfo.hotelAddress || ''}} diff --git a/pages/signUpEntrance/signUpEntrance.wxss b/pages/signUpEntrance/signUpEntrance.wxss index e9aea5e..00cf3d1 100644 --- a/pages/signUpEntrance/signUpEntrance.wxss +++ b/pages/signUpEntrance/signUpEntrance.wxss @@ -187,4 +187,13 @@ margin-top: 15px; } .hotel .hotel-text { text-align: right; +} + +.hotel-info { + height: auto!important; + display: flex; +} +.hotel-info text:nth-child(1) { + padding-right: 8px; + flex-shrink: 0; } \ No newline at end of file diff --git a/pages/signUpPage/signUpPage.js b/pages/signUpPage/signUpPage.js index 71d1e0a..c784c15 100644 --- a/pages/signUpPage/signUpPage.js +++ b/pages/signUpPage/signUpPage.js @@ -337,7 +337,7 @@ Page({ }) } else { wx.navigateTo({ - url: `../companyList/companyList`, + url: `../companyList/companyList?nolimit=nolimt`, }) } }, diff --git a/pages/signUpPage/signUpPage.wxml b/pages/signUpPage/signUpPage.wxml index 3c0c733..3424f77 100644 --- a/pages/signUpPage/signUpPage.wxml +++ b/pages/signUpPage/signUpPage.wxml @@ -37,7 +37,7 @@ - diff --git a/pages/signUpPageGuoji/signUpPageGuoji.js b/pages/signUpPageGuoji/signUpPageGuoji.js index 968fef4..1e66b49 100644 --- a/pages/signUpPageGuoji/signUpPageGuoji.js +++ b/pages/signUpPageGuoji/signUpPageGuoji.js @@ -249,7 +249,7 @@ Page({ }) } else { wx.navigateTo({ - url: `../companyList/companyList?page=${e.currentTarget.dataset.page}`, + url: `../companyList/companyList?page=${e.currentTarget.dataset.page}&nolimit=nolimit`, }) } }, diff --git a/project.config.json b/project.config.json index 7ee1891..aeb4f09 100644 --- a/project.config.json +++ b/project.config.json @@ -20,7 +20,7 @@ "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, - "compileHotReLoad": true, + "compileHotReLoad": false, "lazyloadPlaceholderEnable": false, "useMultiFrameRuntime": true, "useApiHook": true, @@ -36,9 +36,7 @@ "packNpmManually": false, "packNpmRelationList": [], "minifyWXSS": true, - "disableUseStrict": false, - "showES6CompileOption": false, - "useCompilerPlugins": false + "showES6CompileOption": false }, "compileType": "miniprogram", "libVersion": "2.19.0",