diff --git a/pages/home/home.js b/pages/home/home.js
index 6adb83e..7cd70d3 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -120,7 +120,7 @@ Page({
})
}
const meetingId = JSON.parse(e.currentTarget.dataset.message.busId).id
- if (templateCode == 'QY_1_HYTZ_WORK_GROUP_CREATE') { // 去报名页
+ if (templateCode == 'QY_1_HYTZ_WORK_GROUP_CREATE' || templateCode == "QY_13_HYTZ_FBW_CREATE") { // 去报名页
// 需要调用会议详情的接口 判断该会议是否还在报名时间内 并跳转不同的页面或者操作
MeetingApi.meetingDetail({
id: meetingId
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.js b/pages/meetingDetailSigned/meetingDetailSigned.js
index 3def127..bc95994 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.js
+++ b/pages/meetingDetailSigned/meetingDetailSigned.js
@@ -1,4 +1,7 @@
// pages/meeting/meeting.js
+import {
+ appName
+} from '../../assets/js/project.config'
import {
previewFile,
sliceFileTypeByFileName
@@ -7,7 +10,10 @@ import {
import MeetingApi from '../../assets/js/http/meetingApi'
import signUpApi from '../../assets/js/http/signUp'
import UserApi from '../../assets/js/http/userApi'
-import {baseUrl, URL_CONFIG} from '../../assets/js/project.config.js'
+import {
+ baseUrl,
+ URL_CONFIG
+} from '../../assets/js/project.config.js'
Page({
/**
@@ -23,6 +29,10 @@ Page({
meetingFilesList: [],
// 会议资料文件数组
meetingDataList: [],
+ // 演讲ppt
+ speechPptList: [],
+ // 照片
+ photoSrc: '',
// 缴费凭证id
imageIds: [],
// 订单后四位
@@ -31,7 +41,8 @@ Page({
payRecordImgSrc: '',
// 签到图片的回显
signImgSrc: '',
- userId: ''
+ userId: '',
+ form: {},
},
// 获取图片的id
@@ -49,24 +60,24 @@ Page({
// 上传汇款凭证
editPayRecord() {
- if(this.data.imageIds.length === 0){
+ if (this.data.imageIds.length === 0) {
wx.showToast({
title: '请上传缴费凭证',
- icon:'none'
+ icon: 'none'
})
return
}
- if(this.data.singInPersonInfo.payMode === 2 && (this.data.ordeCode === '' || this.data.ordeCode === undefined || this.data.ordeCode === null) ){
+ if (this.data.singInPersonInfo.payMode === 2 && (this.data.ordeCode === '' || this.data.ordeCode === undefined || this.data.ordeCode === null)) {
wx.showToast({
title: '请输入缴费订单号后四位数',
- icon:'none'
+ icon: 'none'
})
return
- }else if(this.data.singInPersonInfo.payMode === 2 && this.data.ordeCode && this.data.ordeCode.length < 4){
+ } else if (this.data.singInPersonInfo.payMode === 2 && this.data.ordeCode && this.data.ordeCode.length < 4) {
// 线上缴费才去校验
wx.showToast({
title: '请输入四位缴费订单号后四位数',
- icon:'none'
+ icon: 'none'
})
return
}
@@ -101,6 +112,13 @@ Page({
}
})
},
+ // 查看物流
+ lookProgress(e) {
+ let num = e.currentTarget.dataset.progress.postNo
+ wx.navigateTo({
+ url: `plugin://kdPlugin/index?num=${num}&appName=${appName}`,
+ })
+ },
//参会人信息
queryPeronInfo(id) {
MeetingApi.queryPersongInfoById({
@@ -111,6 +129,20 @@ Page({
singInPersonInfo: res.result,
ordeCode: res.result.orderCode,
})
+ // 演讲ppt、
+ if (res.result.speechPpt) {
+ this.initFileList(res.result.speechPpt).then(res => {
+ this.setData({
+ speechPptList: res
+ })
+ })
+ }
+ // 照片
+ if (res.result.photo) {
+ this.setData({
+ photoSrc: baseUrl + URL_CONFIG + 'sys/common/download/' + res.result.photo,
+ })
+ }
if (!!res.result.paymentRecord) {
this.setData({
// 这是为了不点击图片上传的bug
@@ -167,12 +199,13 @@ Page({
},
// 会议文件的预览
previewFileMeetingData(e) {
+ const that = this
// 只有审核通过的才可以去下载
- if(this.data.singInPersonInfo.checkResult !== 1){
+ if (this.data.singInPersonInfo.checkResult !== 1) {
wx.showToast({
title: '您的信息尚未审核通过，请等待审核通过',
- icon:'none',
- duration:3000
+ icon: 'none',
+ duration: 3000
})
return
}
@@ -188,7 +221,7 @@ Page({
//这里是点击了确定以后
let params = {
fileId: fileObj.id,
- userId: this.data.userId
+ userId: that.data.userId
}
UserApi.sendEmail(params).then(res => {
if (res.success) {
@@ -203,13 +236,13 @@ Page({
})
}
})
-
+
} else {
//这里是点击了取消以后
}
}
})
-
+
} else {
previewFile(fileObj.fileId, fileObj.name)
}
@@ -263,6 +296,19 @@ Page({
})
}
})
+ UserApi.projectDetail({
+ id: meetingInfo.situationId
+ }).then(res => {
+ this.setData({
+ form: res.result
+ })
+ }).catch(err => {
+ wx.showToast({
+ title: '加载失败',
+ icon: 'none',
+ duration: 2000
+ })
+ })
//
let {
meetingFiles,
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxml b/pages/meetingDetailSigned/meetingDetailSigned.wxml
index 7d3adaf..b9140fb 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxml
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxml
@@ -33,17 +33,17 @@
{{meetingInfo.particularYear}}
-
+
会议费用（VIP）
{{meetingInfo.meetingCostsVip}}
-
+
所属分标委
{{meetingInfo.caseCommitteeName}}
-
+
所属工作组
{{meetingInfo.workingGroupName}}
@@ -75,11 +75,11 @@
查看
- 暂无
+ 暂无
-
+
报名信息
@@ -91,6 +91,17 @@
参会人
{{singInPersonInfo.companyContactName}}
+
+
+ 身份
+ {{singInPersonInfo.identity_dictText}}
+
+
+
+ 手机号
+ {{singInPersonInfo.phone}}
+
+
是否住酒店
{{singInPersonInfo.checkInHotel_dictText}}
@@ -103,39 +114,335 @@
离开时间
{{singInPersonInfo.departureTime === null ? '' : singInPersonInfo.departureTime}}
-
+
+
邮寄联系人
{{singInPersonInfo.postContactName === null ? '' :singInPersonInfo.postContactName}}
-
+
+
缴费方式
{{singInPersonInfo.payMode_dictText === null ? '':singInPersonInfo.payMode_dictText }}
-
+
是否需要发票
{{singInPersonInfo.needInvoice_dictText === null ? '': singInPersonInfo.needInvoice_dictText}}
-
+
邮寄地址
{{singInPersonInfo.postContactAddress === null ? '' :
singInPersonInfo.postContactAddress}}
-
+
邮编
{{singInPersonInfo.postCode === null ? '' :singInPersonInfo.postCode}}
+
+
+
+ 报名信息
+
+
+ 参会单位
+ {{singInPersonInfo.companyName}}
+
+
+ 参会人
+ {{singInPersonInfo.companyContactName}}
+
+
+ 身份
+ {{singInPersonInfo.identity_dictText}}
+
+
+
+ 手机号
+ {{singInPersonInfo.phone}}
+
+
+
+
+ 演讲题目
+ {{singInPersonInfo.speechTopic}}
+
+
+
+ 演讲PPT
+
+
+
+ {{item.name}}
+
+ 查看
+
+
+
+
+ 照片
+
+
+
+
+ 个人简介
+ {{singInPersonInfo.profile}}
+
+
+
+ 是否用餐
+ {{singInPersonInfo.haveMeals_dictText}}
+
+
+
+ 是否回民
+ {{singInPersonInfo.huiPeople_dictText}}
+
+
+
+ 是否住酒店
+ {{singInPersonInfo.checkInHotel_dictText}}
+
+
+
+ 入住酒店时间
+ {{singInPersonInfo.inHotelTime}}
+
+
+
+ 离店时间
+ {{singInPersonInfo.outHotelTime}}
+
+
+
+ 房型
+ {{singInPersonInfo.roomLayout}}
+
+
+
+ 是否需要接站
+ {{singInPersonInfo.pickUp_dictText}}
+
+
+
+ 抵达时间
+ {{singInPersonInfo.arrivalTime}}
+
+
+
+ 到达站
+ {{singInPersonInfo.destination}}
+
+
+
+ 到达班次
+ {{singInPersonInfo.arrivalShift}}
+
+
+
+ 是否需要送站
+ {{singInPersonInfo.deliveryStation_dictText}}
+
+
+
+ 离开时间
+ {{singInPersonInfo.departureTime}}
+
+
+
+ 离开站
+ {{singInPersonInfo.departureStation}}
+
+
+
+ 离开班次
+ {{singInPersonInfo.departureShift}}
+
+
+
+ 同行人
+ {{singInPersonInfo.peer}}
+
+
+
+ 备注
+ {{singInPersonInfo.remark}}
+
+
+
+
+
+
+ 演讲题目
+ {{singInPersonInfo.speechTopic}}
+
+
+
+ 演讲PPT
+
+
+
+ {{item.name}}
+
+ 查看
+
+
+
+
+ 照片
+
+
+
+
+ 个人简介
+ {{singInPersonInfo.profile}}
+
+
+
+ 是否用餐
+ {{singInPersonInfo.haveMeals_dictText}}
+
+
+
+ 是否回民
+ {{singInPersonInfo.huiPeople_dictText}}
+
+
+
+ 是否需要接站
+ {{singInPersonInfo.pickUp_dictText}}
+
+
+
+ 抵达时间
+ {{singInPersonInfo.arrivalTime}}
+
+
+
+ 到达站
+ {{singInPersonInfo.destination}}
+
+
+
+ 到达班次
+ {{singInPersonInfo.arrivalShift}}
+
+
+
+ 是否需要送站
+ {{singInPersonInfo.deliveryStation_dictText}}
+
+
+
+ 离开时间
+ {{singInPersonInfo.departureTime}}
+
+
+
+ 离开站
+ {{singInPersonInfo.departureStation}}
+
+
+
+ 离开班次
+ {{singInPersonInfo.departureShift}}
+
+
+
+ 同行人
+ {{singInPersonInfo.peer}}
+
+
+
+ 备注
+ {{singInPersonInfo.remark}}
+
+
+
+
+
+ 是否用餐
+ {{singInPersonInfo.haveMeals_dictText}}
+
+
+
+ 是否回民
+ {{singInPersonInfo.huiPeople_dictText}}
+
+
+
+ 是否需要接站
+ {{singInPersonInfo.pickUp_dictText}}
+
+
+
+ 抵达时间
+ {{singInPersonInfo.arrivalTime}}
+
+
+
+ 到达站
+ {{singInPersonInfo.destination}}
+
+
+
+ 到达班次
+ {{singInPersonInfo.arrivalShift}}
+
+
+
+ 是否需要送站
+ {{singInPersonInfo.deliveryStation_dictText}}
+
+
+
+ 离开时间
+ {{singInPersonInfo.departureTime}}
+
+
+
+ 离开站
+ {{singInPersonInfo.departureStation}}
+
+
+
+ 离开班次
+ {{singInPersonInfo.departureShift}}
+
+
+
+ 同行人
+ {{singInPersonInfo.peer}}
+
+
+
+
+
+
+ 抵达时间
+ {{singInPersonInfo.arrivalTime}}
+
+
+
+ 离开时间
+ {{singInPersonInfo.departureTime}}
+
+
+
+
+
+
缴费凭证
-
-
+
+
+
-
+
@@ -147,7 +454,7 @@
-
+
缴费订单号后四位数：{{singInPersonInfo.orderCode}}
@@ -155,9 +462,11 @@
-
+
缴费凭证状态：
- {{singInPersonInfo.checkResult_dictText}}
+ {{singInPersonInfo.checkResult_dictText}}
{{singInPersonInfo.checkResult_dictText}}
{{singInPersonInfo.checkResult_dictText}}({{singInPersonInfo.checkRemark}})
@@ -182,6 +491,60 @@
+
+
+
+ 到账信息
+
+
+ {{item.paymentDate}}到账{{item.amountReceived}}元
+
+ 暂无到账记录！
+
+
+
+
+ 开票邮寄信息
+
+
+
+
+
+ {{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}}
+
+
+ 项目名称：
+ {{item.projectName}}
+
+
+ 票
+
+ 开票人：{{item.realName}}
+ 开票时间：{{item.billDate}}
+
+
+ 开票号：{{item.billNo}}
+
+
+
+ 邮
+
+ 邮寄人：{{item.mailName ? item.mailName : '无'}}
+ 邮寄时间：{{item.sendDate ? item.sendDate : '无'}}
+
+
+ 快递号：{{item.postNo ? item.postNo : '无'}}
+
+
+ 金额：{{item.invoiceAmount}}元
+ 查看物流
+
+
+ 暂无邮寄记录！
+
+
+
+
@@ -195,7 +558,8 @@
-
- 确定
+
+ 确定
-
+
\ No newline at end of file
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 0ce7cf8..ab894a3 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -214,3 +214,101 @@ margin-top: 15px;
.base {
background-color: #fff;
}
+.way-box{
+ display: block !important;
+ padding: 0 !important;
+ height: auto !important;
+}
+
+.basic-info .way{
+ padding: 0 15px;
+ display: flex;
+ justify-content: flex-start !important;
+}
+.basic-info .way image{
+ width: 23px;
+ height: 23px;
+ margin-right: 10px;
+}
+.way-info{
+ display: flex;
+}
+.way-info .way-left{
+ padding: 0;
+ display: flex;
+ justify-content: flex-start !important;
+ width: 70%;
+}
+.way-info .way-center{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+ width: 100%;
+ overflow: hidden;
+}
+.way-info .way-center text:nth-child(1){
+ color: #333;
+ display: block;
+ width: 100%;
+ font-size: 14px;
+ flex-shrink: 0;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+.way-info .way-center text:nth-child(2){
+ color: #999;
+ font-size: 11px;
+ flex-shrink: 0;
+}
+.way-info .green {
+ width: 20px;
+ height: 20px;
+ background: #069F99;
+ color: #fff;
+ font-size: 11px;
+ text-align: center;
+ line-height: 20px;
+ border-radius: 5px;
+}
+.way-info .blue {
+ width: 20px;
+ height: 20px;
+ background: #0A72F7;
+ color: #fff;
+ font-size: 11px;
+ text-align: center;
+ line-height: 20px;
+ border-radius: 5px;
+}
+.way-info .way-right{
+ width: 30%;
+ word-break: break-word;
+ padding: 0;
+ color: #666;
+ font-size: 12px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
+}
+.basic-info .look-progress{
+ padding: 0 15px;
+}
+.basic-info .look-progress text:nth-child(1){
+ color: #FF5E60;
+ font-size: 14px;
+}
+.basic-info .look-progress text:nth-child(2){
+ display: block;
+ width: 70px;
+ height: 26px;
+ color: #069F99;
+ font-size: 11px;
+ border-radius: 13px;
+ border: 0.5px solid #069F99;
+ text-align: center;
+ line-height: 26px;
+}
diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml
index 4d6546a..33940b5 100644
--- a/pages/projectDetail/projectDetail.wxml
+++ b/pages/projectDetail/projectDetail.wxml
@@ -117,7 +117,7 @@
项目名称：
- {{item.projectName}}阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇阿凡达富士达啊范德萨发大水啊士大夫犯得上电风扇
+ {{item.projectName}}
票