Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
xianyu-ufo-app-web
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
baoss
5 years ago
Commit
0b82c3d7c44082842ef8c6dcd9b18390d1a154b1
1 parent
3a4a719d
去除多余scroll
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
24 deletions
apps/pages/home/bindAccount/bindAccount.vue
apps/pages/home/mine/components/tabItem.vue
apps/pages/home/mine/mine.vue
apps/pages/home/bindAccount/bindAccount.vue
View file @
0b82c3d
<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, S
croll, S
tyle} 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;
}
...
...
apps/pages/home/mine/components/tabItem.vue
View file @
0b82c3d
...
...
@@ -105,7 +105,7 @@ export default {
}
.grey {
background-color: #F2F2F2;
//
margin: 0 -40px;
margin: 0 -40px;
padding: 0 40px;
}
...
...
apps/pages/home/mine/mine.vue
View file @
0b82c3d
<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,
...
...
Please
register
or
login
to post a comment