Merge branch 'feature/GFRS-597【电投页面优化】' into dev

This commit is contained in:
yuweiqi
2020-03-18 19:45:41 +08:00
2 changed files with 26 additions and 15 deletions

View File

@@ -1,15 +1,17 @@
<template> <template>
<div class="ml6 mr6 pt5 pb5"> <div class="ml6 mr6 pt5 pb5">
<ul class="index-bar"> <ul class="index-bar">
<li @click="changePage(Number(index) + 1)" v-for="(item, index) in pageTitle" :key="item.pageNo" :class="item.tabClass"> <li @click="changePage(Number(index) + 1)" v-for="(item, index) in pageTitle" :key="index" :class="item.tabClass">
<div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w20', 'h2']"></div>
<span>{{ item.pageNo }}.{{ item.pageItem }}</span> <span>{{ item.pageNo }}.{{ item.pageItem }}</span>
<van-icon name="arrow" size="18" /> <div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w20', 'h2']"></div>
<van-icon name="arrow" size="12" v-if="index != 7" />
</li> </li>
</ul> </ul>
</div> </div>
</template> </template>
<script> <script>
import { Field, Popup, Picker, Icon } from 'vant' import { Icon } from 'vant'
export default { export default {
name: 'IndexBar', name: 'IndexBar',
props: { props: {
@@ -29,13 +31,9 @@ export default {
valueKey: { valueKey: {
type: String, type: String,
default: 'text' default: 'text'
}, }
keyId: {}
}, },
components: { components: {
[Field.name]: Field,
[Popup.name]: Popup,
[Picker.name]: Picker,
[Icon.name]: Icon [Icon.name]: Icon
}, },
data() { data() {
@@ -121,6 +119,12 @@ export default {
font-size: 15px; font-size: 15px;
margin-top: 8px; margin-top: 8px;
} }
.index-bar li {
display: flex;
align-items: center;
}
.index-bar::-webkit-scrollbar { .index-bar::-webkit-scrollbar {
display: none; display: none;
} }
@@ -134,4 +138,7 @@ li {
.active { .active {
color: #e9332e; color: #e9332e;
} }
.activeline {
background: #e9332e;
}
</style> </style>

View File

@@ -1,11 +1,15 @@
<template> <template>
<div class="notifyingMessage-container"> <div class="notifyingMessage-container">
<div class="pb50"> <div class="pb50">
<index-bar></index-bar> <div class=" allFalse">
<div class="mt10 pt20 pb20 pr10 bg-white flex justify-content-s align-items-c allFalse"> <div style="background-color: rgb(245, 245, 245);padding-bottom:10px">
<span class="pl10">告知项目</span> <index-bar></index-bar>
<div @click="allFalse" class="pr10"> </div>
<van-button type="danger" size="small">一键全否</van-button> <div class="pt20 pb20 pr10 bg-white flex justify-content-s align-items-c">
<span class="pl10">告知项目</span>
<div @click="allFalse" class="pr10">
<van-button type="danger" size="small">一键全否</van-button>
</div>
</div> </div>
</div> </div>
<div class="pt80"> <div class="pt80">
@@ -66,7 +70,7 @@
<van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" /> <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
</div> </div>
</van-cell-group> </van-cell-group>
<div v-if="item.show"> <div v-if="item.impartAnswer == '0'">
<van-cell-group v-for="(it, ind) in item.questions" :key="ind"> <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
<van-field <van-field
v-model="it.answer" v-model="it.answer"
@@ -91,7 +95,7 @@
<van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" /> <van-field v-model="it.answer" placeholder="请输入" :label="it.questionContent" clearable v-validate="'required'" data-vv-name="答案" />
</div> </div>
</van-cell-group> </van-cell-group>
<div v-if="showFlag && isShow"> <div v-if="showFlag && impartAnswer == '0'">
<van-cell-group v-for="(it, ind) in item.questions" :key="ind"> <van-cell-group v-for="(it, ind) in item.questions" :key="ind">
<van-field <van-field
v-model="it.answer" v-model="it.answer"