Skip to content

C
center-register-show-h5
提交 c85f2763 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

update

上级 b4f76b05
隐藏空白字符变更
内嵌 并排
正在显示 包含 174 行增加 和 49 行删除
src/modules/home/components/Commonheader.vue
浏览文件 @ c85f2763
<template>
<div class="main_header">
<van-nav-bar fixed :title="title" left-arrow @click-left="onClickLeft">
<template #right>
<template #right v-if="center">
<div style="display:flex;" @click="onClickRight">
<div class="text" style="font-size: .24rem;color: #333333;margin-right:.05rem">个人中心</div>
<van-icon v-if="pathName === '/'" name="contact" size="18" />
......@@ -21,6 +21,10 @@ export default {
callBack: {
type: Boolean,
default: false
},
center: {
type: Boolean,
default: true
}
},
computed: {
......
src/modules/home/index.js
浏览文件 @ c85f2763
......@@ -28,6 +28,11 @@ const routes = [
{
path: '/PayDetail',
component: () => import('./views/PayDetail.vue')
},
// 订单支付
{
path: '/list',
component: () => import('./views/List.vue')
}
]
......
src/modules/home/views/Index.vue
浏览文件 @ c85f2763
......@@ -6,40 +6,23 @@
<!-- banner卡片 -->
<img
class="main_content_banner"
src="https://img1.baidu.com/it/u=1407750889,3441968730&fm=253&fmt=auto&app=120&f=JPEG?w=1200&h=799"
src="https://webapp-pub.ezijing.com/highway/h5/banner-0420.png"
alt=""
/>
<!-- 动态 -->
<div class="main_content_dt">
<div class="main_content_dt_tit">中国公路建设行业协会</div>
<ul class="main-content">
<li v-for="(item, index) in navList" :key="index">
<li v-for="(item, index) in navList" :key="index" @click="handleNav(item)">
<img :src="item.icon">
<div class="text">{{ item.text }}</div>
</li>
</ul>
<!-- <div class="main_content_dt_con">
<div class="dt_con_card dt_con_card1">
<img
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/highway/h5/dt_img.png"
alt=""
class="dt_con_card_img"
/>
<div class="dt_con_card_tit">培训动态</div>
</div>
<div class="dt_con_card dt_con_card2">
<img
src="https://webapp-pub.oss-cn-beijing.aliyuncs.com/highway/h5/dt_img1.png"
alt=""
class="dt_con_card_img"
/>
<div class="dt_con_card_tit">e学公路</div>
</div>
</div> -->
</div>
<div class="border-line"></div>
<!-- 会议 -->
<div class="main_content_activity">
<div class="main_content_activity_tit">通知通告</div>
<div class="main_content_activity_tit">其他培训交流</div>
<!-- 活动列表 -->
<div
class="main_content_activity_list"
......@@ -50,7 +33,7 @@
<div>
<div class="activity_list_top">
<div class="activity_list_top_tit">{{ item.name }}</div>
<div class="activity_list_top_date">{{ item.activity_time.split(' ')[0] }}</div>
<!-- <div class="activity_list_top_date">{{ item.activity_time.split(' ')[0] }}</div> -->
<van-icon name="arrow" size="14" />
</div>
<!-- <div class="activity_list_bottom">
......@@ -90,27 +73,57 @@ export default {
{
icon: 'https://webapp-pub.ezijing.com/highway/h5/nav-icon1.png',
text: '培训动态',
url: ''
url: 'https://pages.ezijing.com/prp/mobile2140014905177.html',
query: {
title: '培训动态',
type: 'b4'
}
},
{
icon: 'https://webapp-pub.ezijing.com/highway/h5/nav-icon2.png',
text: '公益讲堂',
url: ''
path: 'list',
query: {
title: '公益讲堂',
type: 'b2'
}
},
{
icon: 'https://webapp-pub.ezijing.com/highway/h5/nav-icon3.png',
text: '宣贯培训',
url: ''
path: 'list',
query: {
title: '宣贯培训',
type: 'b3'
}
},
{
icon: 'https://webapp-pub.ezijing.com/highway/h5/nav-icon4.png',
text: '施工工艺',
url: ''
text: '安全培训',
path: '',
query: {
title: '安全培训',
type: 'b4'
}
}
]
}
},
methods: {
handleNav(item) {
if (item.url) {
window.location.href = item.url
} else {
if (item.path) {
this.$router.push({
path: '/list',
query: item.query
})
} else {
Toast('暂未开通')
}
}
},
// 点击分页
handleChangePage(val) {
console.log(val)
......@@ -260,7 +273,7 @@ export default {
border-radius: 0.1rem;
}
.main_content_dt {
margin: 0.3rem 0 0.3rem 0;
margin: 0.3rem 0 0.4rem 0;
.main_content_dt_tit {
font-size: 0.3rem;
font-weight: 500;
......@@ -356,7 +369,8 @@ export default {
}
.main-content{
display: flex;
justify-content: space-around;
justify-content: space-between;
padding: 0 .2rem;
padding-top: .25rem;
li{
img{
......@@ -371,6 +385,11 @@ export default {
}
}
}
.border-line{
width: 6.2rem;
margin: 0 auto 0.35rem;
border-bottom: .01rem dashed rgba(196, 196, 196, 1);
}
::v-deep .van-icon-arrow {
margin-top: 0.05rem;
}
......
src/modules/home/views/List.vue 0 → 100644
浏览文件 @ c85f2763
<template>
<div>
<commonheader :title="title" :center="false" />
<div class="list-box">
<div
class="main_content_activity_list"
v-for="(item, index) in activityList"
:key="index"
>
<div>
<div class="activity_list_top">
<div class="activity_list_top_tit">{{ item.name }}</div>
<!-- <div class="activity_list_top_date">{{ item.activity_time.split(' ')[0] }}</div> -->
<van-icon name="arrow" size="14" />
</div>
<!-- <div class="activity_list_bottom">
<van-icon name="arrow" size="14" />
</div> -->
</div>
</div>
</div>
</div>
</template>
<script>
import Commonheader from '../components/Commonheader.vue'
export default {
components: { Commonheader },
data() {
return {
title: this.$route.query.title,
activityLists: {
b1: [
{ name: '11', url: '11' }
],
b2: [
{ name: '心里课程”有效亲子沟通“', url: '' }
],
b3: [
{ name: '关于举办第二期全国公路平安百年品质工程', url: '' },
{ name: '攻关行动系列成果培训的通知', url: '' }
],
b4: []
}
}
},
computed: {
activityList() {
return this.activityLists[this.$route.query.type || 'b3']
}
}
}
</script>
<style lang="scss" scoped>
.list-box{
padding: 1rem .3rem 0;
}
.main_content_activity_list {
box-sizing: border-box;
padding: .2rem 0.25rem 0.2rem 0.3rem;
width: 100%;
// height: 1.12rem;
display: flex;
// align-items: center;
justify-content: center;
flex-direction: column;
background-color: #fff;
border-radius: 0.2rem;
margin-top: 0.24rem;
div {
cursor: pointer;
}
.activity_list_top {
display: flex;
justify-content: space-between;
align-items: center;
.activity_list_top_tit {
width: 5.8rem;
font-size: 0.28rem;
font-weight: 400;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
white-space: nowrap;
}
.activity_list_top_date {
font-size: 0.22rem;
font-weight: 400;
color: #999999;
margin-left: 1rem;
}
}
.activity_list_bottom {
display: flex;
justify-content: flex-end;
align-items: center;
}
}
</style>
src/modules/home/views/OrderConfirm.vue
浏览文件 @ c85f2763
......@@ -179,7 +179,6 @@ export default {
// 实付价样式
getPayPrice() {
const splitPrice = this.payPrice.toString().split('.')
console.log(this.payPrice, '123')
// //2.重新赋值
return `<span style="font-size:0.34rem;">${splitPrice[0]}</span>.<span style="font-size:0.2rem;">${splitPrice[1]}</span>`
},
......@@ -192,7 +191,6 @@ export default {
},
checkItem() {
const x = this.data.payData.list.filter(item => ['0', '3'].includes(item.pay_record.pay_status))
console.log(x, 'x')
if (this.selctOrderData.length === x.length) {
this.isAll = true
} else {
......
src/modules/home/views/SignMainPage.vue
浏览文件 @ c85f2763
......@@ -110,17 +110,17 @@ export default {
} else {
initInfo()
}
// console.log(this.userMobile, 'phone')
// 初始化拿到数据做的第一步处理：取到需要展示出来的所有页面
console.log(data.activity, 'data.ac')
function initInfo(fields) {
const activityData = JSON.parse(JSON.stringify(Object.assign({}, data.activity)))
if (fields) {
// *** 继续报名数 || 第一次进报名，据初始化
const index = data.activity.details.findIndex(item => item.id === data[fields].need_fill_in_id)
sliceData = data.activity.details.slice(index, data.activity.details.length)
const index = activityData.details.findIndex(item => item.id === data[fields].need_fill_in_id)
sliceData = activityData.details.slice(index, activityData.details.length)
// list 人员信息
sliceData.map(item => {
item.activityInfo = Object.assign({}, data.activity)
const addData = JSON.parse(JSON.stringify(Object.assign({}, data.activity)))
item.activityInfo = addData
// 判断有没有返回人员 没返回吧自己的信息push进去
if (data[fields].list.length) {
// list有可能不会返回自己的信息，不返回push进去
......@@ -148,7 +148,8 @@ export default {
})
} else {
// 重新报名初始化数据
sliceData = Object.assign({}, data.activity.details)
console.log(activityData, '1')
sliceData = activityData.details
sliceData.map(item => {
item.list = []
item.activityInfo = Object.assign({}, data.activity)
......@@ -252,16 +253,11 @@ export default {
if (data) {
this.setpItem.payData = data
}
// const stringData = {
// index: this.stepIndex,
// stepList: this.stepList.map(item => {
// if (item.activityInfo) {
// item.activityInfo.details.map(fi => delete fi.activityInfo)
// }
// return item
// })
// }
// window.localStorage.stepData = JSON.stringify(stringData)
const stringData = {
index: this.stepIndex,
stepList: this.stepList
}
window.localStorage.stepData = JSON.stringify(stringData)
}
}
}
......
src/utils/formList.js
浏览文件 @ c85f2763
......@@ -259,7 +259,7 @@ const allFormList = [
enable_edit: true,
inputType: '',
trigger: 'onChange',
optionList: ['温馨大床房', '豪华标准间', '豪华套房'],
optionList: ['单住', '合住', '不住'],
showPicker: false,
msg: '',
pattern: ''
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论