Authored by baoss

去除多余scroll

<template>
<LayoutApp :show-back="true" title="绑定支付宝">
<div class="body" ref="body">
<Scroll class="scroll-content">
<div class="account-form">
<p class="form-title">账号</p>
<div class="form-input-block">
... ... @@ -15,7 +14,6 @@
<div class="account-footer">
<CubeButton class="submit-btn" :disabled="canSubmit" @click="submitBind">提交</CubeButton>
</div>
</Scroll>
</div>
<myDialog :isShow="dialogShow" :data="{name,account}" @cancel-click="cancel" @confirm-click="confirm"></myDialog>
</LayoutApp>
... ... @@ -24,7 +22,7 @@
<script>
import { createNamespacedHelpers } from 'vuex';
import {Input, Button, Scroll, Style} from 'cube-ui';
import {Input, Button, Style} from 'cube-ui';
import myDialog from './components/bindModel';
const {mapState, mapActions} = createNamespacedHelpers('home/bindAccount');
export default {
... ... @@ -72,7 +70,6 @@ export default {
},
components: {
Style,
Scroll,
CubeInput: Input,
CubeButton: Button,
myDialog
... ... @@ -88,9 +85,6 @@ export default {
background-color: white;
padding: 0 40px;
}
/deep/ .cube-scroll-content {
height: 100%;
}
.account-form {
margin-top: 40px;
}
... ...
... ... @@ -105,7 +105,7 @@ export default {
}
.grey {
background-color: #F2F2F2;
// margin: 0 -40px;
margin: 0 -40px;
padding: 0 40px;
}
... ...
<template>
<LayoutApp :show-back="true" title="我的" :hideHeader="hideHeader">
<div class="body" ref="body">
<Scroll>
<div v-for="(value, key) in getMineList" :key="key">
<tab-item v-if="key === 'board'" :data="value" noLine icon="cubeic-notification" small grey>
<noticeScroll></noticeScroll>
</tab-item>
<template v-else-if="key === 'resource1' || key === 'resource2'">
<div v-if="value.data.template_name ==='single_image'" class="marg">
<div v-if="value.data.template_name ==='single_image'">
<singleImage :data="value.data.data[0]"></singleImage>
</div>
</template>
<div v-else-if="key === 'order'" class="bg-bottom marg">
<div v-else-if="key === 'order'" class="bg-bottom">
<order></order>
</div>
<div v-else-if="key === 'sale'" class="bg-top marg">
<div v-else-if="key === 'sale'" class="bg-top">
<tab-item :data="value" noLine titleBold titleSmall></tab-item>
</div>
<bind class="marg" v-else-if="key === 'bindAccount'" :data="value"></bind>
<tab-item class="marg" v-else :data="value"></tab-item>
<bind v-else-if="key === 'bindAccount'" :data="value"></bind>
<tab-item v-else :data="value"></tab-item>
</div>
</Scroll>
</div>
</LayoutApp>
</template>
... ... @@ -31,7 +29,6 @@ import order from './components/order';
import scroll from './components/scroll';
import singleImage from './components/singleImage';
import bind from './components/bind';
import {Style, Scroll} from 'cube-ui';
import { createNamespacedHelpers } from 'vuex';
const { mapGetters, mapActions } = createNamespacedHelpers('home/mine');
... ... @@ -73,9 +70,6 @@ export default {
noticeScroll: scroll,
singleImage,
bind,
Style,
Scroll
}
};
</script>
... ... @@ -83,12 +77,9 @@ export default {
<style lang="scss" scoped>
.body {
height: 100%;
// overflow-y: auto;
overflow-y: auto;
background-color: white;
// padding: 0 40px;
}
.marg {
margin: 0 40px;
padding: 0 40px;
}
.bg-top,
... ...