diff --git a/pages/committee/committee.js b/pages/committee/committee.js index f530953..df5fb62 100644 --- a/pages/committee/committee.js +++ b/pages/committee/committee.js @@ -17,7 +17,10 @@ Page({ }) let params = { pageNo: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, + // 创建时间倒叙排序 + column:'createTime', + order:'desc' } UserApi.committeeList(params).then(res=>{ if(res.success){ diff --git a/pages/companyList/companyList.js b/pages/companyList/companyList.js index 95e4446..c63e4ab 100644 --- a/pages/companyList/companyList.js +++ b/pages/companyList/companyList.js @@ -12,14 +12,17 @@ Page({ searchParams: { pageNo: 1, pageSize: 10, - companyName: '' + companyName: '', + // 创建时间倒叙排序 + column:'createTime', + order:'desc' }, // 数据 dataSource: [], // 是否国际研讨会过来的 page: "" }, - // 输入查询条件 + // 输入查询条件 bindInputCompanyName(e) { this.setData({ "searchParams.companyName": e.detail.value @@ -37,7 +40,7 @@ Page({ }) this.search() }, - // 创建新的企业 + // 创建新的企业 addCompany(e) { wx.navigateTo({ url: `../addCompany/addCompany?prepage=${e.currentTarget.dataset.prepage}`, diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index f1e4ffc..4395bb6 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -13,39 +13,42 @@ Page({ meetingStatus: '', // 会议状态 meetingType: '', // 工作组会议：1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5 meetingStartTime: '', // 开始时间 - meetingEndTime: '' // 结束时间 + meetingEndTime: '', // 结束时间 + // 创建时间倒叙排序 + column: 'createTime', + order: 'desc' }, // 会议筛选参数 meetingStatus: ['可报名', '未开始', '进行中', '已结束'], // 会议类型筛选参数 meetingType: ['工作组会议', '标协会议', '国际研讨会', '其他会议', '分标委会议'], // 会议列表数据 - meetingList:[], + meetingList: [], // 下拉框送搜索数据 - selectData:[], + selectData: [], // 控制弹窗显示的 - visible:false, + visible: false, // 控制月份选择器显示 - visibleDate:false, + visibleDate: false, // 是哪个筛选条件 - index:-1 + index: -1 }, // 会议状态筛选 - bindStatusChange(e){ + bindStatusChange(e) { this.data.searchParams.pageNo = 1 - if(e.detail.value == 0){ + if (e.detail.value == 0) { this.setData({ 'searchParams.meetingSignUpType': 1 }) - }else if(e.detail.value == 1){ + } else if (e.detail.value == 1) { this.setData({ 'searchParams.meetingStatus': 2 }) - }else if(e.detail.value == 2){ + } else if (e.detail.value == 2) { this.setData({ 'searchParams.meetingStatus': 3 }) - }else if(e.detail.value == 3){ + } else if (e.detail.value == 3) { this.setData({ 'searchParams.meetingStatus': 4 }) @@ -53,7 +56,7 @@ Page({ this.queryMeetingList() }, // 会议类型筛选 - bindTypeChange(e){ + bindTypeChange(e) { this.data.searchParams.pageNo = 1 let value = Number(e.detail.value) + 1 this.setData({ @@ -61,7 +64,7 @@ Page({ }) this.queryMeetingList() }, - bindDateChange(e){ + bindDateChange(e) { this.data.searchParams.pageNo = 1 this.setData({ 'searchParams.meetingStartTime': e.detail.value, @@ -70,29 +73,29 @@ Page({ this.queryMeetingList() }, // 会议详情 - meetingDetail(e){ - let meetingInfo =JSON.stringify(e.currentTarget.dataset.meetinginfo) + meetingDetail(e) { + let meetingInfo = JSON.stringify(e.currentTarget.dataset.meetinginfo) let meetingItem = e.currentTarget.dataset.meetinginfo // 如果是去报名页面需要在缓存中存储会议信息 当报名结束后 需要清除缓存中的当前会议信息 meetingSignUpType 1 可报名 2报名 - if(meetingItem.meetingSignUpType === 1){ + if (meetingItem.meetingSignUpType === 1) { wx.setStorage({ - key:"currentMeetingInfo", - data:e.currentTarget.dataset.meetinginfo, - success(){ + key: "currentMeetingInfo", + data: e.currentTarget.dataset.meetinginfo, + success() { // 国际研讨会去国际研讨会的报名页面 - if(meetingItem.meetingType !== 3){ + if (meetingItem.meetingType !== 3) { wx.navigateTo({ - url:`../signUpPage/signUpPage` + url: `../signUpPage/signUpPage` }) - }else if(meetingItem.meetingSignUpType === 2){ + } else if (meetingItem.meetingSignUpType === 2) { wx.navigateTo({ - url:`../signUpPageGuoji/signUpPageGuoji` + url: `../signUpPageGuoji/signUpPageGuoji` }) } } }) - }else if(meetingItem.meetingSignUpType === 2){ + } else if (meetingItem.meetingSignUpType === 2) { wx.navigateTo({ url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`, // (已报名) }) @@ -100,20 +103,20 @@ Page({ }, // 获取会议列表数据 - queryMeetingList(){ + queryMeetingList() { wx.showToast({ title: '加载中...', icon: 'loading' }) MeetingApi.meetingList(this.data.searchParams).then(res => { - if(res.success){ + if (res.success) { // 搜索时，把原数据清空，重新筛选 - if(this.data.searchParams.pageNo === 1) { + if (this.data.searchParams.pageNo === 1) { this.setData({ meetingList: [] }) } - if(res.result.records && res.result.records.length){ + if (res.result.records && res.result.records.length) { this.setData({ meetingList: [...this.data.meetingList, ...res.result.records] }) @@ -133,18 +136,18 @@ Page({ */ onLoad: function (options) { console.log(options); - if(!!options.workingGroupId){ + if (!!options.workingGroupId) { // 工作组的更多跳转 this.setData({ - 'searchParams.workingGroupId':options.workingGroupId, - 'searchParams.meetingType':'1', + 'searchParams.workingGroupId': options.workingGroupId, + 'searchParams.meetingType': '1', }) } - if(!!options.caseCommitteeId){ + if (!!options.caseCommitteeId) { // 分标委的更多跳转 this.setData({ - 'searchParams.caseCommitteeId':options.caseCommitteeId, - 'searchParams.meetingType':'5', + 'searchParams.caseCommitteeId': options.caseCommitteeId, + 'searchParams.meetingType': '5', }) } this.queryMeetingList() diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js index 177f9ee..53de302 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.js +++ b/pages/meetingDetailSigned/meetingDetailSigned.js @@ -5,7 +5,10 @@ import { import MeetingApi from '../../assets/js/http/meetingApi' import signUpApi from '../../assets/js/http/signUp' -import {baseUrl,URL_CONFIG} from '../../assets/js/http/api' +import { + baseUrl, + URL_CONFIG +} from '../../assets/js/http/api' Page({ /** @@ -22,13 +25,13 @@ Page({ // 会议资料文件数组 meetingDataList: [], // 缴费凭证id - imageIds:[], + imageIds: [], // 订单后四位 - ordeCode:'', - // 缴费凭证的回显 - payRecordImgSrc:'', + ordeCode: '', + // 缴费凭证的回显 + payRecordImgSrc: '', // 签到图片的回显 - signImgSrc:'' + signImgSrc: '' }, // 获取图片的id @@ -38,32 +41,38 @@ Page({ }) }, // 订单后四位 - setOrdeCode(e){ + setOrdeCode(e) { this.setData({ - ordeCode:e.detail.value + ordeCode: e.detail.value }) }, - // 上传汇款凭证 - editPayRecord(){ + // 上传汇款凭证 + editPayRecord() { const param = { - id:this.data.meetingInfo.situationId, - orderCode:this.data.ordeCode, - paymentRecord:this.data.imageIds + id: this.data.meetingInfo.situationId, + orderCode: this.data.ordeCode, + paymentRecord: this.data.imageIds + } + if(Array.isArray(this.data.imageIds)){ + param.paymentRecord = this.data.imageIds.join(',') } signUpApi.uploadPayRecord(param).then(res => { console.log(res); - if(res.success){ + if (res.success) { wx.showToast({ - title:res.message, + title: res.message, icon: "success", - duration: 800, + duration: 2000, + success(){ + wx.navigateBack({ + delta: 1, + }) + } }); - wx.navigateBack({ - delta: 1, - }) - }else{ + + } else { wx.showToast({ - title:res.message, + title: res.message, icon: "error", duration: 800, }); @@ -78,19 +87,21 @@ Page({ if (res.success) { this.setData({ singInPersonInfo: res.result, - ordeCode:res.result.orderCode + ordeCode: res.result.orderCode, + // 这是为了不点击图片上传的bug + imageIds: res.result.paymentRecord.split(',') }) // 已经审核的获取审核凭证的src - if(res.result.checkResult !== 0){ + if (res.result.checkResult !== 0) { this.setData({ - payRecordImgSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentRecord + payRecordImgSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentRecord, }) } console.log(this.data.payRecordImgSrc); // 已经签到的获取签到的图片的src - if(res.result.checkIn === 1){ + if (res.result.checkIn === 1) { this.setData({ - signImgSrc:baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile + signImgSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.checkFile }) } } @@ -136,6 +147,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + // 获取上一个页面的会议数据 const meetingInfo = JSON.parse(options.meetingInfo) console.log(meetingInfo); @@ -170,9 +182,7 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { - - }, + onReady: function () {}, /** * 生命周期函数--监听页面显示 diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml index d5f224a..5dc50b4 100644 --- a/pages/meetingDetailSigned/meetingDetailSigned.wxml +++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml @@ -120,9 +120,8 @@ 缴费凭证 - - - + + @@ -141,7 +140,7 @@ 缴费订单号后四位数：{{singInPersonInfo.orderCode}} - + 请在会议期间内上传缴费凭证和缴费订单号后四位 diff --git a/pages/mineContract/mineContract.js b/pages/mineContract/mineContract.js index b583e57..3307a7c 100644 --- a/pages/mineContract/mineContract.js +++ b/pages/mineContract/mineContract.js @@ -23,7 +23,10 @@ Page({ }) let params = { pageNo: this.data.pageNo, - pageSize: this.data.pageSize + pageSize: this.data.pageSize, + // 创建时间倒叙排序 + column:'createTime', + order:'desc' } UserApi.contractList(params).then(res=>{ if(res.success && res.result.records && res.result.records.length){ diff --git a/pages/personList/personList.js b/pages/personList/personList.js index 7d93ee7..f227918 100644 --- a/pages/personList/personList.js +++ b/pages/personList/personList.js @@ -11,7 +11,9 @@ Page({ companyId: '', pageNo: 1, pageSize: 10, - name: '' + name: '', + column:'createTime', + order:'desc' }, // 数据 dataSource: [], diff --git a/pages/project/project.js b/pages/project/project.js index 3df5e86..e51b811 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -14,7 +14,10 @@ Page({ needInvoice: '', // 是否需要发票 0 4 pack: '', // 是否打包 0 1 year: '', // 运行年份 - particularYear:'',// 资料网元的运行年份 + particularYear:'',// 资料网元的运行年份, + // 创建时间倒叙排序 + column:'createTime', + order:'desc' } }, // 发票改变