Showing
2 changed files
with
20 additions
and
12 deletions
1 | <template> | 1 | <template> |
2 | <LayoutApp :show-back="true" title="我的" :hideHeader="hideHeader"> | 2 | <LayoutApp :show-back="true" title="我的" :hideHeader="hideHeader"> |
3 | <div class="body" ref="body"> | 3 | <div class="body" ref="body"> |
4 | + <Scroll> | ||
4 | <div v-for="(value, key) in getMineList" :key="key"> | 5 | <div v-for="(value, key) in getMineList" :key="key"> |
5 | <tab-item v-if="key === 'board'" :data="value" noLine icon="cubeic-notification" small grey> | 6 | <tab-item v-if="key === 'board'" :data="value" noLine icon="cubeic-notification" small grey> |
6 | - <scroll></scroll> | 7 | + <niticelScroll></niticelScroll> |
7 | </tab-item> | 8 | </tab-item> |
8 | <template v-else-if="key === 'resource1' || key === 'resource2'"> | 9 | <template v-else-if="key === 'resource1' || key === 'resource2'"> |
9 | - <div v-if="value.data.template_name ==='single_image'"> | 10 | + <div v-if="value.data.template_name ==='single_image'" class="marg"> |
10 | <singleImage :data="value.data.data[0]"></singleImage> | 11 | <singleImage :data="value.data.data[0]"></singleImage> |
11 | </div> | 12 | </div> |
12 | </template> | 13 | </template> |
13 | - <div v-else-if="key === 'order'" class="bg-bottom"> | 14 | + <div v-else-if="key === 'order'" class="bg-bottom marg"> |
14 | <order></order> | 15 | <order></order> |
15 | </div> | 16 | </div> |
16 | - <div v-else-if="key === 'sale'" class="bg-top"> | 17 | + <div v-else-if="key === 'sale'" class="bg-top marg"> |
17 | <tab-item :data="value" noLine titleBold titleSmall></tab-item> | 18 | <tab-item :data="value" noLine titleBold titleSmall></tab-item> |
18 | </div> | 19 | </div> |
19 | - <bind v-else-if="key === 'bindAccount'" :data="value"></bind> | ||
20 | - <tab-item v-else :data="value"></tab-item> | 20 | + <bind class="marg" v-else-if="key === 'bindAccount'" :data="value"></bind> |
21 | + <tab-item class="marg" v-else :data="value"></tab-item> | ||
21 | </div> | 22 | </div> |
22 | - | 23 | + </Scroll> |
23 | </div> | 24 | </div> |
24 | </LayoutApp> | 25 | </LayoutApp> |
25 | </template> | 26 | </template> |
@@ -30,6 +31,7 @@ import order from './components/order'; | @@ -30,6 +31,7 @@ import order from './components/order'; | ||
30 | import scroll from './components/scroll'; | 31 | import scroll from './components/scroll'; |
31 | import singleImage from './components/singleImage'; | 32 | import singleImage from './components/singleImage'; |
32 | import bind from './components/bind'; | 33 | import bind from './components/bind'; |
34 | +import {Style, Scroll} from 'cube-ui'; | ||
33 | import { createNamespacedHelpers } from 'vuex'; | 35 | import { createNamespacedHelpers } from 'vuex'; |
34 | 36 | ||
35 | const { mapGetters, mapActions } = createNamespacedHelpers('home/mine'); | 37 | const { mapGetters, mapActions } = createNamespacedHelpers('home/mine'); |
@@ -68,9 +70,12 @@ export default { | @@ -68,9 +70,12 @@ export default { | ||
68 | components: { | 70 | components: { |
69 | tabItem, | 71 | tabItem, |
70 | order, | 72 | order, |
71 | - scroll, | 73 | + niticelScroll: scroll, |
72 | singleImage, | 74 | singleImage, |
73 | - bind | 75 | + bind, |
76 | + Style, | ||
77 | + Scroll | ||
78 | + | ||
74 | } | 79 | } |
75 | }; | 80 | }; |
76 | </script> | 81 | </script> |
@@ -78,9 +83,12 @@ export default { | @@ -78,9 +83,12 @@ export default { | ||
78 | <style lang="scss" scoped> | 83 | <style lang="scss" scoped> |
79 | .body { | 84 | .body { |
80 | height: 100%; | 85 | height: 100%; |
81 | - overflow-y: auto; | 86 | + // overflow-y: auto; |
82 | background-color: white; | 87 | background-color: white; |
83 | - padding: 0 40px; | 88 | + // padding: 0 40px; |
89 | +} | ||
90 | +.marg { | ||
91 | + margin: 0 40px; | ||
84 | } | 92 | } |
85 | 93 | ||
86 | .bg-top, | 94 | .bg-top, |
-
Please register or login to post a comment