diff --git a/src/assets/signUpImg/bg.png b/src/assets/signUpImg/bg.png new file mode 100644 index 0000000..ddcccae Binary files /dev/null and b/src/assets/signUpImg/bg.png differ diff --git a/src/assets/signUpImg/meetingInfo.png b/src/assets/signUpImg/meetingInfo.png new file mode 100644 index 0000000..ad317c2 Binary files /dev/null and b/src/assets/signUpImg/meetingInfo.png differ diff --git a/src/assets/signUpImg/signUpInfo.png b/src/assets/signUpImg/signUpInfo.png new file mode 100644 index 0000000..99950b1 Binary files /dev/null and b/src/assets/signUpImg/signUpInfo.png differ diff --git a/src/config/router.config.js b/src/config/router.config.js index 44fc784..0acbed0 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -1,4 +1,6 @@ import { UserLayout, TabLayout } from "@/components/layouts"; +import SignUpEntrance from "@views/signUp/SignUpEntrance"; +import SignUpPage from "@views/signUp/SignUpPage"; /** * 走菜单，走权限控制 @@ -51,5 +53,15 @@ export const constantRouterMap = [ component: () => import(/* webpackChunkName: "user" */ "@/views/user/alteration/Alteration") } ] - } + }, + { + path: "/signUpEntrance", + component: SignUpEntrance, + hidden: true, + }, + { + path: "/signUpPage", + component: SignUpPage, + hidden: true, + }, ]; diff --git a/src/permission.js b/src/permission.js index 572408a..1d3628c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -9,7 +9,7 @@ import { generateIndexRouter } from '@/utils/util' NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration'] // no redirect whitelist +const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration','/signUpEntrance','/signUpPage'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 01efef8..363a672 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -388,7 +388,9 @@ export default { // 签到二维码 signInQRCode: '', // 收款二维码 - payMentQRCode: '' + payMentQRCode: '', + // 会议费用 + meetingCostBool:false } }, created() { @@ -402,6 +404,33 @@ export default { this.currentMeetingInfo = Object.assign({}, res.result) // 转化会议类型 this.meetingType = this.generateMeetingType(this.currentMeetingInfo.meetingType) + // 计算会议费用 会议费用为0 添加参会人不显示邮寄信息与缴费信息 标协会议 + if(this.currentMeetingInfo.meetingType === '2' && this.currentMeetingInfo.meetingCostsVip){ + // 标协会员的费用 + let vipCost = this.currentMeetingInfo.meetingCostsVip + // 判断标协会员的费用是否是0 + let flagVip = vipCost === 0 || vipCost === '0.00' + let cost = this.currentMeetingInfo.meetingCosts + // 判断普通会员的费用是否是0 + let flag = cost === 0 || cost === '0.00' + if(flag && flagVip){ + // 说明会议费用为0 + this.meetingCostBool = true + }else { + this.meetingCostBool = false + } + // 其他会议值判断一个费用 + }else if(this.currentMeetingInfo.meetingCosts){ + // 判断其他会议 + let cost = this.currentMeetingInfo.meetingCosts + // 判断普通会员的费用是否是0 + let flag = cost === 0 || cost === '0.00' + if(flag){ + this.meetingCostBool = true + }else { + this.meetingCostBool = false + } + } } }) this.filters.meetingId = this.$route.query.id @@ -459,7 +488,8 @@ export default { path: '/incomePayments/meetManage/SignUpInfoEdit', query: { meetingType: this.currentMeetingInfo.meetingType, - meetingId: this.$route.query.id + meetingId: this.$route.query.id, + costBool:this.meetingCostBool } }) }, @@ -473,6 +503,7 @@ export default { id: record.id, meetingId: this.$route.query.id, meetingType: this.currentMeetingInfo.meetingType, + costBool:this.meetingCostBool } }) }, diff --git a/src/views/incomePayments/meetManage/OtherMeetingForm.vue b/src/views/incomePayments/meetManage/OtherMeetingForm.vue index 8502cce..b933fbf 100644 --- a/src/views/incomePayments/meetManage/OtherMeetingForm.vue +++ b/src/views/incomePayments/meetManage/OtherMeetingForm.vue @@ -20,64 +20,79 @@ - -
邮寄信息
- - - - - - - - - - - - - + + -
缴费信息
- - - - - 汇款 - 现场 - 打包 - - - - - - - - - - - - - - - + + @@ -117,6 +132,11 @@ export default { guestType: { type: Number, required: false + }, + // 会议费用是否为0 + meetingCostBool:{ + type:Boolean, + required:false, } }, data() { @@ -140,9 +160,9 @@ export default { sm: {span: 21} }, // 缴费方式为打包 - payModeBool:false, + payModeBool: false, // 回显的邮寄联系人 - selectPostPerson:null, + selectPostPerson: null, validatorRules: { postContactId: { rules: [{required: true, message: '请选择邮寄联系人'}], @@ -159,10 +179,10 @@ export default { } } }, - watch:{ + watch: { // 监听它是因为 当选择参会人并且选择打包 再去切换身份 底下不显示bug - identifyType(val){ - if(val !== 2){ + identifyType(val) { + if (val !== 2) { this.payModeBool = false console.log(val) return val @@ -175,8 +195,8 @@ export default { this.form.validateFields((err, values) => { if (!err) { this.$emit('formData', values) - }else { - this.$emit('formData', {stop:true}) + } else { + this.$emit('formData', {stop: true}) } }) }, @@ -194,7 +214,7 @@ export default { * */ disabledEndDate(endValue) { const startValueTemp = this.form.getFieldValue('arrivalTime') - const startValue = startValueTemp && moment(startValueTemp ,'YYYY-MM-DD') + const startValue = startValueTemp && moment(startValueTemp, 'YYYY-MM-DD') if (!endValue || !startValue) { return false } @@ -203,22 +223,22 @@ export default { /* * 缴费方式选择 * */ - changePayMode(e){ - if(e.target.value === 3){ + changePayMode(e) { + if (e.target.value === 3) { this.payModeBool = true - }else { + } else { this.payModeBool = false } }, /* * 编辑回显值 * */ - setFormVal(record){ - console.log('record============',record) + setFormVal(record) { + console.log('record============', record) // 回显邮寄联系人 this.selectPostPerson = { - id:record.postContactTemporaryId, - name:record.postContactName + id: record.postContactTemporaryId, + name: record.postContactName } this.$nextTick(() => { // 身份类型是嘉宾 内部企业只渲染 住店 抵达时间 离开时间 diff --git a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue index 58a6705..a5aa379 100644 --- a/src/views/incomePayments/meetManage/SignUpInfoEdit.vue +++ b/src/views/incomePayments/meetManage/SignUpInfoEdit.vue @@ -84,13 +84,13 @@ @@ -201,6 +201,8 @@ export default { selectPerson:null, // 会议类型 meetingType: '', + // 会议费用是否为0 + meetingCostBool:false, url:{ add:'/meeting/payMeetingSituation/add', edit:'/meeting/payMeetingSituation/edit' @@ -209,6 +211,12 @@ export default { }, created() { this.meetingType = this.$route.query.meetingType + // 参会情况页面判断的是否会议费用为0 true 为0 + if(this.$route.query.costBool === 'true'){ + this.meetingCostBool = true + }else if(this.$route.query.costBool === 'false'){ + this.meetingCostBool = false + } if(this.$route.query.id){ // 通过id获取参会人信息 getSingUpUserInfo({id:this.$route.query.id}).then(res => { diff --git a/src/views/signUp/SignUpEntrance.vue b/src/views/signUp/SignUpEntrance.vue new file mode 100644 index 0000000..5ea95d3 --- /dev/null +++ b/src/views/signUp/SignUpEntrance.vue @@ -0,0 +1,277 @@ + + + + + \ No newline at end of file diff --git a/src/views/signUp/SignUpPage.vue b/src/views/signUp/SignUpPage.vue new file mode 100644 index 0000000..95fe011 --- /dev/null +++ b/src/views/signUp/SignUpPage.vue @@ -0,0 +1,632 @@ + + + + + \ No newline at end of file