提交 cb266d0f authored 作者: matian's avatar matian

updates

上级 4f89b536
<template> <template>
<div class="main"> <div class="main">
<commonheader @back="handlePrev" :callBack="true" /> <commonheader @back="handlePrev" :callBack="true" :title="title" />
<!-- 展示页面 --> <!-- 展示页面 -->
<div class="show_content"> <div class="show_content">
<div class="show_content_img" v-html="data.desc"></div> <div class="show_content_img" v-html="data.desc"></div>
...@@ -12,12 +12,16 @@ ...@@ -12,12 +12,16 @@
<script> <script>
import Commonheader from '../components/Commonheader.vue' import Commonheader from '../components/Commonheader.vue'
export default { export default {
data() {
return {
title: '报名'
}
},
components: { Commonheader }, components: { Commonheader },
props: { props: {
data: { type: Object } data: { type: Object }
}, },
mounted() { mounted() {},
},
methods: { methods: {
handlePrev() { handlePrev() {
this.$emit('prev') this.$emit('prev')
......
<template> <template>
<div class="main"> <div class="main">
<commonheader :title="title" />
<div class="main_content"> <div class="main_content">
<div class="main_content_banner" v-html="data.desc"></div> <div class="main_content_banner" v-html="data.desc"></div>
<div class="main_content_form"> <div class="main_content_form">
<van-form> <van-form class="main_content_form_con">
<div v-for="(listIt, formIndex) in data.user_fields" :key="formIndex" class="main_content_form_list"> <div v-for="(listIt, formIndex) in data.user_fields" :key="formIndex" class="main_content_form_list">
<img <img
src="https://webapp-pub.ezijing.com/highway/h5/form_minus.png" src="https://webapp-pub.ezijing.com/highway/h5/form_minus.png"
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
</div> </div>
<div class="main_content_footer"> <div class="main_content_footer">
<template v-if="data.can_skip_pay === 1"> <template v-if="data.can_skip_pay === 1">
<van-checkbox v-model="checkedPay" shape="square" class="main_content_skipPay"> <van-checkbox icon-size="13px" v-model="checkedPay" shape="square" class="main_content_skipPay">
{{ data.skip_pay_title }}</van-checkbox {{ data.skip_pay_title }}</van-checkbox
> >
</template> </template>
...@@ -103,8 +104,11 @@ ...@@ -103,8 +104,11 @@
</template> </template>
<script> <script>
import Commonheader from '../components/Commonheader.vue'
import { saveStepInfo } from '../api' import { saveStepInfo } from '../api'
export default { export default {
components: { Commonheader },
props: { props: {
stepList: { type: Array }, stepList: { type: Array },
data: { type: Object }, data: { type: Object },
...@@ -114,6 +118,7 @@ export default { ...@@ -114,6 +118,7 @@ export default {
}, },
data() { data() {
return { return {
title: '报名',
checkedPay: false, // 勾选是否跳过按钮 checkedPay: false, // 勾选是否跳过按钮
index: 0, index: 0,
cIndex: 0, cIndex: 0,
...@@ -156,6 +161,7 @@ export default { ...@@ -156,6 +161,7 @@ export default {
} else { } else {
this.$emit('next', res.data) this.$emit('next', res.data)
} }
this.checkedPay = false
} }
}) })
}, },
...@@ -208,7 +214,6 @@ export default { ...@@ -208,7 +214,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.main { .main {
background-color: #f7f7f7; background-color: #f7f7f7;
height: 100vh;
.main_content { .main_content {
padding: 0.21rem 0.3rem 4.13rem 0.3rem; padding: 0.21rem 0.3rem 4.13rem 0.3rem;
.main_content_banner { .main_content_banner {
...@@ -276,17 +281,23 @@ export default { ...@@ -276,17 +281,23 @@ export default {
} }
} }
} }
::v-deep .van-checkbox__icon .van-icon { ::v-deep {
width: 0.25rem; .van-checkbox__icon {
height: 0.26rem; border-radius: 3px;
text-align: center; overflow: hidden;
margin-top: 0.06rem; }
}
::v-deep .van-checkbox__icon .van-checkbox__icon {
font-size: 0.16rem;
}
::v-deep .van-checkbox__icon .van-checkbox__label {
color: #999999;
margin-top: -0.9rem;
} }
// ::v-deep .van-checkbox__icon .van-icon {
// width: 0.25rem;
// height: 0.26rem;
// text-align: center;
// margin-top: 0.06rem;
// }
// ::v-deep .van-checkbox__icon .van-checkbox__icon {
// font-size: 0.16rem;
// }
// ::v-deep .van-checkbox__icon .van-checkbox__label {
// color: #999999;
// margin-top: -0.9rem;
// }
</style> </style>
<template> <template>
<div class="main"> <div class="main">
<!-- <commonheader :title="title" /> --> <commonheader :title="title" />
<div class="main_content"> <div class="main_content">
<div class="main_content_desc">1.打开支付宝扫码二维码支付,或长按保存二维码打开支付宝支付。</div> <div class="main_content_desc">1.打开支付宝扫码二维码支付,或长按保存二维码打开支付宝支付。</div>
<div class="main_content_qdCode"> <div class="main_content_qdCode">
...@@ -23,18 +23,10 @@ ...@@ -23,18 +23,10 @@
复制链接在浏览器打开去支付 复制链接在浏览器打开去支付
</div> </div>
<div class="main_btn"> <div class="main_btn">
<van-button <van-button class="main_btn_home" round @click="$router.push('/')" v-if="isLastStep && status == 1"
class="main_btn_home"
round
@click="$router.push('/')"
v-if="isLastStep && status == 1"
>首页</van-button >首页</van-button
> >
<van-button <van-button round class="main_btn_home" @click="$router.go(0)" v-if="!isLastStep && status == 1"
round
class="main_btn_home"
@click="$router.go(0)"
v-if="!isLastStep && status == 1"
>继续报名</van-button >继续报名</van-button
> >
<van-button round class="main_btn_order" @click="$router.push('/MyOrder')">我的订单</van-button> <van-button round class="main_btn_order" @click="$router.push('/MyOrder')">我的订单</van-button>
...@@ -51,7 +43,7 @@ import Clipboard from 'clipboard' ...@@ -51,7 +43,7 @@ import Clipboard from 'clipboard'
import { Toast } from 'vant' import { Toast } from 'vant'
import { getPayStatus } from '../api' import { getPayStatus } from '../api'
// import commonheader from '../components/Commonheader.vue' import commonheader from '../components/Commonheader.vue'
export default { export default {
props: { props: {
data: { data: {
...@@ -62,7 +54,8 @@ export default { ...@@ -62,7 +54,8 @@ export default {
} }
}, },
components: { components: {
QrcodeVue QrcodeVue,
commonheader
}, },
data() { data() {
return { return {
...@@ -165,7 +158,7 @@ export default { ...@@ -165,7 +158,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
height: 100%;
.main_content_desc { .main_content_desc {
// width: 5.56rem; // width: 5.56rem;
font-size: 0.3rem; font-size: 0.3rem;
...@@ -192,14 +185,21 @@ export default { ...@@ -192,14 +185,21 @@ export default {
} }
} }
.main_btn { .main_btn {
margin-top: 1.12rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
.main_btn_home { .main_btn_home {
background: #b80140; background: #b80140;
color: #fff; color: #fff;
font-size: 0.3rem;
font-weight: 400;
} }
.main_btn_order { .main_btn_order {
margin-left: 0.2rem; margin-left: 0.2rem;
background: #f5f5f5;
font-size: 0.3rem;
font-weight: 400;
color: #333333;
} }
} }
#value { #value {
......
...@@ -162,7 +162,6 @@ export default { ...@@ -162,7 +162,6 @@ export default {
} }
return a return a
}, []) }, [])
console.log(this.stepList)
this.stepList.map((item, index) => { this.stepList.map((item, index) => {
item.num = index + 1 item.num = index + 1
return item return item
...@@ -180,6 +179,7 @@ export default { ...@@ -180,6 +179,7 @@ export default {
this.stepIndex++ this.stepIndex++
if (data) { if (data) {
this.setpItem.payData = data this.setpItem.payData = data
console.log(this.setpItem)
} }
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论