【bug】 报名选择企业 加载失败
This commit is contained in:
@@ -78,7 +78,7 @@
|
|||||||
<checkbox-group name='agree' >
|
<checkbox-group name='agree' >
|
||||||
<label>
|
<label>
|
||||||
<checkbox value="agree"/>
|
<checkbox value="agree"/>
|
||||||
我同意{{appletName}}使用我所提供的信息用于注册企业,查看<text style="color:#069f99" bindtap="openPanel" data-type="1">《用户服务协议》</text>及<text style="color:#069f99" bindtap="openPanel" data-type="2">《个人信息保护政策》</text>
|
我同意{{appletName}}使用我所提供的信息用于注册账户,查看<text style="color:#069f99" bindtap="openPanel" data-type="1">《用户服务协议》</text>及<text style="color:#069f99" bindtap="openPanel" data-type="2">《个人信息保护政策》</text>
|
||||||
</label>
|
</label>
|
||||||
</checkbox-group>
|
</checkbox-group>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ Page({
|
|||||||
*/
|
*/
|
||||||
data: {
|
data: {
|
||||||
statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
|
statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
|
||||||
|
isStandard:false,// 是否时标协会员那里跳转过来的
|
||||||
searchParams: {
|
searchParams: {
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
@@ -17,7 +18,6 @@ Page({
|
|||||||
meetingType: '', // 工作组会议:1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5
|
meetingType: '', // 工作组会议:1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5
|
||||||
meetingStartTime: '', // 开始时间
|
meetingStartTime: '', // 开始时间
|
||||||
meetingEndTime: '', // 结束时间
|
meetingEndTime: '', // 结束时间
|
||||||
isStandard:false,// 是否时标协会员那里跳转过来的
|
|
||||||
// 创建时间倒叙排序
|
// 创建时间倒叙排序
|
||||||
column: 'createTime',
|
column: 'createTime',
|
||||||
order: 'desc'
|
order: 'desc'
|
||||||
@@ -150,9 +150,10 @@ Page({
|
|||||||
},
|
},
|
||||||
bindDateChange(e) {
|
bindDateChange(e) {
|
||||||
this.data.searchParams.pageNo = 1
|
this.data.searchParams.pageNo = 1
|
||||||
|
// ' ' + '00:00:00' + ' ' + '23:59:59'
|
||||||
this.setData({
|
this.setData({
|
||||||
'searchParams.meetingStartTime': e.detail.value,
|
'searchParams.meetingStartTime': e.detail.value ,
|
||||||
'searchParams.meetingEndTime': e.detail.value
|
'searchParams.meetingEndTime': e.detail.value
|
||||||
})
|
})
|
||||||
this.queryMeetingList()
|
this.queryMeetingList()
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ import {
|
|||||||
previewFile,
|
previewFile,
|
||||||
getFileInfo
|
getFileInfo
|
||||||
} from '../../assets/js/preview'
|
} 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({
|
Page({
|
||||||
|
|
||||||
@@ -18,15 +21,15 @@ Page({
|
|||||||
// 会议类型
|
// 会议类型
|
||||||
meetingType: '',
|
meetingType: '',
|
||||||
// 标协会议类型 1标准宣贯 2学习培训
|
// 标协会议类型 1标准宣贯 2学习培训
|
||||||
tbMeetingType:'',
|
tbMeetingType: '',
|
||||||
// 会议通知文件资料数组
|
// 会议通知文件资料数组
|
||||||
meetingFilesList: [],
|
meetingFilesList: [],
|
||||||
// 缴费二维码的图片路径
|
// 缴费二维码的图片路径
|
||||||
payOrCode: '',
|
payOrCode: '',
|
||||||
// 标协会议酒店信息
|
// 标协会议酒店信息
|
||||||
hotelContactsList:[],
|
hotelContactsList: [],
|
||||||
// 当前会议是否超出时间
|
// 当前会议是否超出时间
|
||||||
isMoreBool:false
|
isMoreBool: false
|
||||||
},
|
},
|
||||||
compareCurrentTime(time) {
|
compareCurrentTime(time) {
|
||||||
let date = new Date()
|
let date = new Date()
|
||||||
@@ -48,8 +51,8 @@ Page({
|
|||||||
meetingDetailIngfo: res.result,
|
meetingDetailIngfo: res.result,
|
||||||
meetingType: that.generateMeetingType(res.result.meetingType),
|
meetingType: that.generateMeetingType(res.result.meetingType),
|
||||||
payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode,
|
payOrCode: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.paymentQrCode,
|
||||||
tbMeetingType:that.generateTbMeetingType(res.result.tbMeetingType),
|
tbMeetingType: that.generateTbMeetingType(res.result.tbMeetingType),
|
||||||
hotelContactsList:res.result.hotelContactsList
|
hotelContactsList: res.result.hotelContactsList
|
||||||
})
|
})
|
||||||
console.log(that.data.hotelContactsList);
|
console.log(that.data.hotelContactsList);
|
||||||
initFileList(res.result.meetingFiles).then(res => {
|
initFileList(res.result.meetingFiles).then(res => {
|
||||||
@@ -59,26 +62,26 @@ Page({
|
|||||||
})
|
})
|
||||||
// 判断当前会议是否超出时间
|
// 判断当前会议是否超出时间
|
||||||
let flag = that.compareCurrentTime(res.result.registerDeadline)
|
let flag = that.compareCurrentTime(res.result.registerDeadline)
|
||||||
if(flag){
|
if (flag) {
|
||||||
wx.showToast({
|
wx.showToast({
|
||||||
title: '当前会议超出报名时间,不可报名',
|
title: '当前会议超出报名时间,不可报名',
|
||||||
icon:'none',
|
icon: 'none',
|
||||||
duration:4000
|
duration: 4000
|
||||||
})
|
})
|
||||||
that.setData({
|
that.setData({
|
||||||
isMoreBool:false
|
isMoreBool: false
|
||||||
})
|
})
|
||||||
}else{
|
} else {
|
||||||
that.setData({
|
that.setData({
|
||||||
isMoreBool:true
|
isMoreBool: true
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
wx.showToast({
|
wx.showToast({
|
||||||
title: '加载失败',
|
title: '加载失败',
|
||||||
icon:'none'
|
icon: 'none'
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -86,25 +89,25 @@ Page({
|
|||||||
signUp() {
|
signUp() {
|
||||||
// 超出报名时间 提示
|
// 超出报名时间 提示
|
||||||
let flag = this.compareCurrentTime(this.data.meetingDetailIngfo.registerDeadline)
|
let flag = this.compareCurrentTime(this.data.meetingDetailIngfo.registerDeadline)
|
||||||
if(flag){
|
if (flag) {
|
||||||
wx.showToast({
|
wx.showToast({
|
||||||
title: '当前会议超出报名时间,不可报名',
|
title: '当前会议超出报名时间,不可报名',
|
||||||
icon:'none',
|
icon: 'none',
|
||||||
duration:2000
|
duration: 2000
|
||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const that = this
|
const that = this
|
||||||
// 企业列表与参会人列表调用的是无权限接口
|
// 企业列表与参会人列表调用的是无权限接口
|
||||||
wx.setStorage({
|
wx.setStorage({
|
||||||
key:'nolimit',
|
key: 'nolimit',
|
||||||
data:true
|
data: true
|
||||||
})
|
})
|
||||||
// 不同的会议通跳转不同的会议页面
|
// 不同的会议通跳转不同的会议页面
|
||||||
let meetingType = this.data.meetingDetailIngfo.meetingType
|
let meetingType = this.data.meetingDetailIngfo.meetingType
|
||||||
wx.setStorage({
|
wx.setStorage({
|
||||||
key:'currentMeetingInfo',
|
key: 'currentMeetingInfo',
|
||||||
data:that.data.meetingDetailIngfo
|
data: that.data.meetingDetailIngfo
|
||||||
})
|
})
|
||||||
if (meetingType !== '3') {
|
if (meetingType !== '3') {
|
||||||
wx.navigateTo({
|
wx.navigateTo({
|
||||||
@@ -131,13 +134,15 @@ Page({
|
|||||||
return "分标委会议"
|
return "分标委会议"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 标协会议类型
|
// 标协会议类型
|
||||||
generateTbMeetingType(type) {
|
generateTbMeetingType(type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case "1":
|
case "1":
|
||||||
return "标准宣贯"
|
return "标准宣贯"
|
||||||
case "2":
|
case "2":
|
||||||
return "学习培训"
|
return "学习培训"
|
||||||
|
case "3":
|
||||||
|
return "信息交流会"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 预览文件
|
// 预览文件
|
||||||
@@ -156,6 +161,8 @@ Page({
|
|||||||
let url = decodeURIComponent(options.q)
|
let url = decodeURIComponent(options.q)
|
||||||
let meetingId = url.split('=')[1]
|
let meetingId = url.split('=')[1]
|
||||||
this.queryMeetingDetail(meetingId)
|
this.queryMeetingDetail(meetingId)
|
||||||
|
|
||||||
|
// this.queryMeetingDetail("1479397531946348545")
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -206,4 +213,4 @@ Page({
|
|||||||
onShareAppMessage: function () {
|
onShareAppMessage: function () {
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -109,17 +109,17 @@
|
|||||||
<text class="sign-in-text">{{meetingDetailIngfo.remark === null ? '' : meetingDetailIngfo.remark}}</text>
|
<text class="sign-in-text">{{meetingDetailIngfo.remark === null ? '' : meetingDetailIngfo.remark}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view wx:if="{{hotelContactsList.length > 0}}">
|
<view wx:if="{{hotelContactsList.length > 0}}" class="hotel-info">
|
||||||
<text>酒店名称</text>
|
<text>酒店名称</text>
|
||||||
<text>{{meetingDetailIngfo.hotelName || ''}}</text>
|
<text>{{meetingDetailIngfo.hotelName || ''}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view wx:if="{{hotelContactsList.length > 0}}" wx:for="{{hotelContactsList}}">
|
<view wx:if="{{hotelContactsList.length > 0}}" wx:for="{{hotelContactsList}}" class="hotel-info" wx:key="item" >
|
||||||
<text>酒店联系人</text>
|
<text>酒店联系人</text>
|
||||||
<text>{{item.hotelContacts}} {{item.hotelContactsPhone ? '-' : ''}} {{item.hotelContactsPhone}}</text>
|
<text>{{item.hotelContacts}} {{item.hotelContactsPhone ? '-' : ''}} {{item.hotelContactsPhone}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view wx:if="{{hotelContactsList.length > 0}}">
|
<view wx:if="{{hotelContactsList.length > 0}}" class="hotel-info">
|
||||||
<text>酒店地址</text>
|
<text >酒店地址</text>
|
||||||
<text class="hotel-text">{{meetingDetailIngfo.hotelAddress || ''}}</text>
|
<text class="hotel-text">{{meetingDetailIngfo.hotelAddress || ''}}</text>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -187,4 +187,13 @@ margin-top: 15px;
|
|||||||
}
|
}
|
||||||
.hotel .hotel-text {
|
.hotel .hotel-text {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hotel-info {
|
||||||
|
height: auto!important;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
.hotel-info text:nth-child(1) {
|
||||||
|
padding-right: 8px;
|
||||||
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
@@ -337,7 +337,7 @@ Page({
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
wx.navigateTo({
|
wx.navigateTo({
|
||||||
url: `../companyList/companyList`,
|
url: `../companyList/companyList?nolimit=nolimt`,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view>
|
<view>
|
||||||
<radio-group name='payMode' bindchange="paymentMethodRadioChange">
|
<radio-group name='payMode' bindchange="paymentMethodRadioChange">
|
||||||
<label class="radio radio-item" wx:for="{{paymentMethodList}}" wx:key="item">
|
<label class="radio radio-item" wx:for="{{paymentMethodList}}" wx:key="item" style="font-size:13px">
|
||||||
<radio class="radio-scale" value="{{item.value}}" color="#069F99"/>{{item.name}}
|
<radio class="radio-scale" value="{{item.value}}" color="#069F99"/>{{item.name}}
|
||||||
</label>
|
</label>
|
||||||
</radio-group>
|
</radio-group>
|
||||||
|
|||||||
@@ -249,7 +249,7 @@ Page({
|
|||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
wx.navigateTo({
|
wx.navigateTo({
|
||||||
url: `../companyList/companyList?page=${e.currentTarget.dataset.page}`,
|
url: `../companyList/companyList?page=${e.currentTarget.dataset.page}&nolimit=nolimit`,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-4
@@ -20,7 +20,7 @@
|
|||||||
"checkInvalidKey": true,
|
"checkInvalidKey": true,
|
||||||
"checkSiteMap": true,
|
"checkSiteMap": true,
|
||||||
"uploadWithSourceMap": true,
|
"uploadWithSourceMap": true,
|
||||||
"compileHotReLoad": true,
|
"compileHotReLoad": false,
|
||||||
"lazyloadPlaceholderEnable": false,
|
"lazyloadPlaceholderEnable": false,
|
||||||
"useMultiFrameRuntime": true,
|
"useMultiFrameRuntime": true,
|
||||||
"useApiHook": true,
|
"useApiHook": true,
|
||||||
@@ -36,9 +36,7 @@
|
|||||||
"packNpmManually": false,
|
"packNpmManually": false,
|
||||||
"packNpmRelationList": [],
|
"packNpmRelationList": [],
|
||||||
"minifyWXSS": true,
|
"minifyWXSS": true,
|
||||||
"disableUseStrict": false,
|
"showES6CompileOption": false
|
||||||
"showES6CompileOption": false,
|
|
||||||
"useCompilerPlugins": false
|
|
||||||
},
|
},
|
||||||
"compileType": "miniprogram",
|
"compileType": "miniprogram",
|
||||||
"libVersion": "2.19.0",
|
"libVersion": "2.19.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user